Changes - SailfishOS Open Build Service

@@ -2,9 +2,10 @@ <service name="tar_git"> <param name="url">https://github.com/sailfishos-patches/patchmanager.git</param> <param name="branch">master</param> - <param name="revision">3.1.0-pre2</param> + <param name="revision">3.1.0</param> <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param> </service> + </services>

@@ -0,0 +1,34 @@ +BSD 3-Clause License + +Copyright (c) 2013, Lucien XU <sfietkonstantin@free.fr> +Copyright (c) 2016, Andrey Kozhevnikov <coderusinbox@gmail.com> +Copyright (c) 2021, Patchmanger for SailfishOS contributors: + - olf "Olf0" <https://github.com/Olf0> + - Peter G. "nephros" <sailfish@nephros.org> + - Vlad G. "b100dian" <https://github.com/b100dian> +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3. Neither the name of the copyright holders nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

@@ -88,17 +88,17 @@ ## Web catalog for patches -Patchmanager supports installing patches from its web catalog. -Patch developers can upload patches to https://coderus.openrepos.net/pm2 to make them visible inside Patchmanager Web Catalog list. -When uploading a patch to web catalog, the patch developer should not provide a *patch.json* file with metadata, but should fill the necessary fields on the webpage before uploading, instead. +Patchmanager supports installing patches from its Web Catalog. +Patch developers can upload patches to https://coderus.openrepos.net/pm2 to enlist them on Patchmanager's Web Catalog. +When uploading a patch to the Web Catalog, the patch developer should not provide a *patch.json* file with metadata, but shall fill the necessary fields on the webpage before uploading, instead. ## Patches distribution at OpenRepos.net Patches can be too complex for Patchmanager's Web Catalog. In this case the developer can package the patch as an RPM and upload it at https://openrepos.net -For RPM patches, the patch content shall be installed in a directory `/usr/share/patchmanager/patches/<patch-name>/`; additional files (see above) for this patch shall also be placed there. +For RPM patches, the patch content shall be installed in a directory `/usr/share/patchmanager/patches/<patch-name>/`; [additional files (see above)](#additional-files) for this patch shall also be placed there. -Additionaly, when a patch developer decides to package a patch as an RPM, the compatibility of patch (to SailfishoS versions, instrastructure it uses etc.) shall be properly defined by RPM spec file dependencies ("Requires:", "Conflits:" etc.). +Additionaly, when a patch developer decides to package a patch as an RPM, the compatibility of a patch (to Sailfish OS release versions, infrastructure it uses etc.) shall be properly defined by RPM spec file dependencies ("Requires:", "Conflicts:" etc.). -Sample RPM patch project: https://github.com/CODeRUS/sailfishos-disable-glass-avatar +Example RPM patch project: https://github.com/CODeRUS/sailfishos-disable-glass-avatar

@@ -3,7 +3,7 @@ OTHER_FILES += rpm/patchmanager.spec -TRANSLATIONS += translations/settings-$${TARGET}-*.ts +TRANSLATIONS += $$files(translations/settings-$${TARGET}-*.ts) TS_FILE = $${_PRO_FILE_PWD_}/translations/settings-$${TARGET}.ts HAVE_TRANSLATIONS = 0

@@ -18,7 +18,7 @@ ' </interface>\n' function show() { - console.warn("Show called!") + console.warn("Function show is called!") } } initialPage: Component { @@ -26,7 +26,7 @@ onStatusChanged: { if (status == PageStatus.Active && !appWindow.remorseItem) { remorse.execute(button, qsTranslate("", "Applying patches"), function() { - console.log("Accepted patch applying!") + console.log("Accepted applying patches.") dbusPm.call("loadRequest", [true]) }, 10000) appWindow.remorseItem = remorse @@ -50,7 +50,7 @@ anchors.right: parent.right anchors.margins: Theme.horizontalPageMargin wrapMode: Text.WrapAtWordBoundaryOrAnywhere - text: qsTranslate("", "Patchmanager will automatically apply patches in 10 seconds.") + text: qsTranslate("", "Patchmanager will automatically apply all patches in 10 seconds.") } Item { @@ -70,7 +70,7 @@ RemorseItem { id: remorse onCanceled: { - console.log("Cancelled patches applying!") + console.log("Cancelled applying patches.") dbusPm.call("loadRequest", [false]) Qt.quit() } @@ -133,8 +133,8 @@ function autoApplyingFinished(success) { console.log(success) button.enabled = true - progress.label = success ? qsTranslate("", "Appled successfully!") - : qsTranslate("", "Failed applying patches!") + progress.label = success ? qsTranslate("", "Applied patches successfully.") + : qsTranslate("", "Failed to apply patches!") } } }

@@ -1,12 +1,12 @@ #!/bin/sh -if [ -e $1 ]; then - echo "Must provide package name" +if [ -e "$1" ]; then + echo "Error: A package name must be provided!" exit -1 fi -rpm -q $1 > /dev/null 2>&1 -if [ ${?} -ne 0 ]; then - echo "Invalid package name" +rpm -q "$1" > /dev/null 2>&1 +if [ $? != 0 ]; then + echo "Error: Invalid package name!" exit -1 fi @@ -55,31 +55,31 @@ rm -f $BACKUP_FAILED_TMP_FILE rm -f $ORIGINAL_FAILED_FILE rm -f $BACKUP_FAILED_FILE -rm -f $LOG_ORIGINAL_FILE -rm -f $LOG_BACKUP_FILE +rm -f "$LOG_ORIGINAL_FILE" +rm -f "$LOG_BACKUP_FILE" mkdir -p /var/lib/patchmanager cd / # Verify original files in package -rpm -q --queryformat '[%{FILEMD5S} %{FILENAMES}\n]' $1 | grep \\.qml > $TMP_FILE +rpm -q --queryformat '[%{FILEMD5S} %{FILENAMES}\n]' "$1" | grep \\.qml > $TMP_FILE sha256sum -c $TMP_FILE 2> /dev/null | grep -v OK > $ORIGINAL_FAILED_TMP_FILE while read i; do - file=`echo ${i} |awk -F: '{print $1}'` - echo $file >> $ORIGINAL_FAILED_FILE + file="$(echo "$i" | awk -F: '{print $1}')" + echo "$file" >> $ORIGINAL_FAILED_FILE done < $ORIGINAL_FAILED_TMP_FILE # Verify backup files in package -rpm -q --queryformat "[%{FILEMD5S} $BACKUP_PREFIX%{FILENAMES}\n]" $1 | grep \\.qml > $TMP_FILE +rpm -q --queryformat "[%{FILEMD5S} $BACKUP_PREFIX%{FILENAMES}\n]" "$1" | grep \\.qml > $TMP_FILE sha256sum -c $TMP_FILE 2> /dev/null | grep -v OK > $BACKUP_FAILED_TMP_FILE while read i; do - file=`echo ${i} |awk -F: '{print $1}'` - echo $file >> $BACKUP_FAILED_FILE + file="$(echo "$i" | awk -F: '{print $1}')" + echo "$file" >> $BACKUP_FAILED_FILE done < $BACKUP_FAILED_TMP_FILE # If the backup is up-to-date, it's ok if [ ! -f $BACKUP_FAILED_FILE ]; then - echo "Backup available" + echo "Backup available." do_check_success fi @@ -87,28 +87,28 @@ # ok, we create the backup files if [ ! -f $ORIGINAL_FAILED_FILE ]; then - rpm -ql $1 | grep \\.qml > $TMP_FILE + rpm -ql "$1" | grep \\.qml > $TMP_FILE while read i; do backup_file="$BACKUP_PREFIX/$i" - rm -f $backup_file - backup_dir=$(dirname $backup_file) - mkdir -p $backup_dir - cp $i $backup_file + rm -f "$backup_file" + backup_dir="$(dirname "$backup_file")" + mkdir -p "$backup_dir" + cp "$i" "$backup_file" done < $TMP_FILE - echo "Backup done" + echo "Backup done." do_check_success fi while read i; do - file=`echo ${i} |awk -F: '{print $1}'` - echo $file >> $LOG_ORIGINAL_FILE + file="$(echo "$i" | awk -F: '{print $1}')" + echo "$file" >> $LOG_ORIGINAL_FILE done < $ORIGINAL_FAILED_TMP_FILE while read i; do - file=`echo ${i} |awk -F: '{print $1}'` - echo $file >> $LOG_BACKUP_FILE + file="$(echo "$i" | awk -F: '{print $1}')" + echo "$file" >> $LOG_BACKUP_FILE done < $BACKUP_FAILED_TMP_FILE -echo "Warning ! Both backup and installed files are corrupted !" -do_check_failure \ No newline at end of file +echo "Warning: Both backup and installed files are corrupted!" +do_check_failure

@@ -62,7 +62,7 @@ <method name="checkEaster"> <arg name="easter" type="s" direction="out" /> </method> - <method name="getSsuVersion"> + <method name="getOsVersion"> <arg name="version" type="s" direction="out" /> </method> <method name="getPatchmanagerVersion">

@@ -82,7 +82,9 @@ } static const QString PATCHES_DIR = QStringLiteral("/usr/share/patchmanager/patches"); -static const QString PATCHES_ADDITIONAL_DIR = QStringLiteral("/tmp/patchmanager3/patches"); +static const QString PATCHES_WORK_DIR_PREFIX = QStringLiteral("/tmp/patchmanager3"); +static const QString PATCHES_WORK_DIR = QStringLiteral("%1/%2").arg(PATCHES_WORK_DIR_PREFIX, "work"); +static const QString PATCHES_ADDITIONAL_DIR = QStringLiteral("%1/%2").arg(PATCHES_WORK_DIR_PREFIX, "patches"); static const QString PATCH_FILE = QStringLiteral("patch.json"); static const QString NAME_KEY = QStringLiteral("name"); @@ -105,6 +107,13 @@ static const QString PM_APPLY = QStringLiteral("/usr/libexec/pm_apply"); static const QString PM_UNAPPLY = QStringLiteral("/usr/libexec/pm_unapply"); +// external binaries +static const QString BIN_UNZIP = QStringLiteral("/usr/bin/unzip"); +static const QString BIN_TAR = QStringLiteral("/bin/tar"); +static const QString BIN_PKCON = QStringLiteral("/usr/bin/pkcon"); +static const QString BIN_SYSTEMCTL_U = QStringLiteral("/bin/systemctl-user"); +static const QString BIN_RPM = QStringLiteral("/bin/rpm"); + static const QString BROWSER_CODE = QStringLiteral("browser"); static const QString CAMERA_CODE = QStringLiteral("camera"); static const QString CALENDAR_CODE = QStringLiteral("calendar"); @@ -197,7 +206,7 @@ json[COMPATIBLE_KEY] = QStringList(); json[ISCOMPATIBLE_KEY] = true; } else { - json[ISCOMPATIBLE_KEY] = json[COMPATIBLE_KEY].toStringList().contains(m_ssuRelease); + json[ISCOMPATIBLE_KEY] = json[COMPATIBLE_KEY].toStringList().contains(m_osRelease); } json[CONFLICTS_KEY] = QStringList(); patch = json; @@ -283,23 +292,9 @@ void PatchManagerObject::getVersion() { qDebug() << Q_FUNC_INFO; - QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("org.nemo.ssu"), - QStringLiteral("/org/nemo/ssu"), - QStringLiteral("org.nemo.ssu"), - QStringLiteral("release")); - msg.setArguments({ QVariant::fromValue(false) }); - QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(QDBusConnection::systemBus().asyncCall(msg), this); - connect(watcher, &QDBusPendingCallWatcher::finished, [this](QDBusPendingCallWatcher *watcher) { - watcher->deleteLater(); - if (!watcher->isError()) { - m_ssuRelease = QDBusPendingReply<QString>(*watcher); - qDebug() << "Received ssu version:" << m_ssuRelease; - lateInitialize(); - } else { - qWarning() << "Ssu version request error!" << watcher->error(); - QCoreApplication::exit(2); - } - }); + m_osRelease = QSettings("/etc/os-release", QSettings::IniFormat).value("VERSION_ID").toString(); + qDebug() << "Received OS version:" << m_osRelease; + lateInitialize(); } void PatchManagerObject::lateInitialize() @@ -795,7 +790,7 @@ if (!m_sbus.send(m)) { qWarning() << Q_FUNC_INFO << "Error sending message"; qWarning() << Q_FUNC_INFO << "Invoking systemctl:" << - QProcess::execute(QStringLiteral("/bin/systemctl-user"), { QStringLiteral("--no-block"), QStringLiteral("restart"), serviceName }); + QProcess::execute(BIN_SYSTEMCTL_U, { QStringLiteral("--no-block"), QStringLiteral("restart"), serviceName }); } } @@ -842,7 +837,7 @@ qDebug() << Q_FUNC_INFO << "Processing file:" << file; QProcess rpmProc; - rpmProc.start(QStringLiteral("/bin/rpm"), { QStringLiteral("-qf"), QStringLiteral("--qf"), QStringLiteral("%{NAME}"), file }); + rpmProc.start(BIN_RPM, { QStringLiteral("-qf"), QStringLiteral("--qf"), QStringLiteral("%{NAME}"), file }); if (!rpmProc.waitForFinished(5000) || rpmProc.exitCode() != 0) { continue; } @@ -863,14 +858,14 @@ qDebug() << Q_FUNC_INFO << "Refreshing repositories..."; QProcess refreshProc; - refreshProc.start(QStringLiteral("/usr/bin/pkcon"), { QStringLiteral("refresh") }); + refreshProc.start(BIN_PKCON, { QStringLiteral("refresh") }); refreshProc.waitForFinished(-1); for (const QString &package : packages) { qDebug() << Q_FUNC_INFO << "Reinstalling:" << package; QProcess pkconProc; - pkconProc.start(QStringLiteral("/usr/bin/pkcon"), { QStringLiteral("install"), QStringLiteral("-y"), package }); + pkconProc.start(BIN_PKCON, { QStringLiteral("install"), QStringLiteral("-y"), package }); pkconProc.waitForFinished(-1); if (pkconProc.exitCode() == 0) { @@ -1352,9 +1347,9 @@ return QCoreApplication::applicationVersion(); } -QString PatchManagerObject::getSsuVersion() const +QString PatchManagerObject::getOsVersion() const { - return m_ssuRelease; + return m_osRelease; } //void PatchManagerObject::checkPatches() @@ -1602,7 +1597,9 @@ path = toPatch.mid(toPatch.indexOf('/', 1)); } } - filesConflicts[path].append(patchFolder); + if (!filesConflicts[path].contains(patchFolder)) { + filesConflicts[path].append(patchFolder); + } QStringList patchFiles = m_patchFiles[patchFolder]; if (!patchFiles.contains(path)) { @@ -1897,10 +1894,15 @@ const QString &url = params.value(QStringLiteral("url")).toString(); const QString &patch = params.value(QStringLiteral("patch")).toString(); const QString &json = params.value(QStringLiteral("json")).toString(); - const QString &archive = QStringLiteral("/tmp/%1").arg(url.section(QChar('/'), -1)); + const QString &archive = QStringLiteral("%1/%2").arg(PATCHES_WORK_DIR, url.section(QChar('/'), -1)); const QString &version = params.value(QStringLiteral("version")).toString(); qDebug() << Q_FUNC_INFO << "Saving archive to" << archive; + QDir workDir(PATCHES_WORK_DIR); + if (!workDir.mkpath(PATCHES_WORK_DIR)) { + qDebug() << Q_FUNC_INFO << QStringLiteral("Error: could not create ") << workDir; + return; + }; QFile *archiveFile = new QFile(archive, this); if (!archiveFile->open(QFile::WriteOnly)) { return; @@ -1948,9 +1950,18 @@ QProcess proc; int ret = 0; if (archive.endsWith(QStringLiteral(".zip"))) { - ret = proc.execute(QStringLiteral("/usr/bin/unzip"), {archive, QStringLiteral("-d"), patchPath}); + ret = proc.execute(BIN_UNZIP, {QStringLiteral("-o"), archive, QStringLiteral("-d"), patchPath }); } else { - ret = proc.execute(QStringLiteral("/bin/tar"), {QStringLiteral("xzf"), archive, QStringLiteral("-C"), patchPath}); + QString uncompressOpt; + if (archive.endsWith(QStringLiteral("gz"))) { uncompressOpt = QStringLiteral("-z"); } + else if (archive.endsWith(QStringLiteral("bz2"))) { uncompressOpt = QStringLiteral("-j"); } + // careful: GNU tar has J for everything xz/lz*, and a for automatic, BusyBox has J for .xz and a for .lzma + else if (archive.endsWith(QStringLiteral("xz"))) { uncompressOpt = QStringLiteral("-J"); } + else { + qWarning() << Q_FUNC_INFO << QStringLiteral("Archive format unsupported"); + uncompressOpt = QStringLiteral(""); + } + ret = proc.execute(BIN_TAR, {QStringLiteral("x"), uncompressOpt, QStringLiteral("-f"), archive, QStringLiteral("-C"), patchPath}); } if (ret == 0) { if (m_updates.contains(patch)) { @@ -1965,6 +1976,13 @@ } } } else { + QString retMsg = QStringLiteral("process exited with code (%1)").arg(ret); + if ( ret == -2 ) { + retMsg = QStringLiteral("Process could not start (%1)").arg(ret); + } else if ( ret == -1 ) { + retMsg = QStringLiteral("Process crashed (%1)").arg(ret); + } + qDebug() << Q_FUNC_INFO << QStringLiteral("Error: extraction failed:") << proc.error() << retMsg; patchDir.removeRecursively(); } @@ -2009,7 +2027,7 @@ } else { qDebug() << Q_FUNC_INFO << "Removing patch package" << rpmPatch; - const int ret = QProcess::execute(QStringLiteral("/usr/bin/pkcon"), {QStringLiteral("remove"), QStringLiteral("-y"), getRpmName(rpmPatch)}); + const int ret = QProcess::execute(BIN_PKCON, {QStringLiteral("remove"), QStringLiteral("-y"), getRpmName(rpmPatch)}); removeSuccess = ret == 0; } @@ -2250,7 +2268,7 @@ QUrl url(QStringLiteral(CATALOG_URL "/" PROJECTS_PATH)); QUrlQuery query; - query.addQueryItem("version", m_ssuRelease); + query.addQueryItem("version", m_osRelease); url.setQuery(query); QNetworkRequest request(url); QNetworkReply *reply = m_nam->get(request); @@ -2326,7 +2344,7 @@ for (const QVariant &fileVar : files) { const QVariantMap file = fileVar.toMap(); const QStringList compatible = file.value("compatible").toStringList(); - if (!compatible.contains(m_ssuRelease)) { + if (!compatible.contains(m_osRelease)) { continue; } const QString version = file.value("version").toString();

@@ -132,7 +132,7 @@ void lipstickChanged(const QString &state); QString getPatchmanagerVersion() const; - QString getSsuVersion() const; + QString getOsVersion() const; protected: bool eventFilter(QObject *watched, QEvent *event); @@ -235,7 +235,8 @@ QVariantMap m_updates; - QString m_ssuRelease; + QString m_osRelease; + PatchManagerAdaptor *m_adaptor = nullptr; QNetworkAccessManager *m_nam = nullptr;

@@ -81,27 +81,66 @@ text: qsTranslate("", "Patchmanager allows system modification via patches. It provides a system daemon that is in charge of performing those patches, as well as a GUI, to control those operations and installation/removal of patches.") } - BackgroundItem { + Separator { width: parent.width - onClicked: Qt.openUrlExternally(PAYPAL_DONATE) - Label { - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: Theme.horizontalPageMargin - anchors.verticalCenter: parent.verticalCenter - text: qsTranslate("", "Donate") - } + color: Theme.primaryColor + horizontalAlignment: Qt.AlignHCenter } - BackgroundItem { - width: parent.width - onClicked: pageStack.push(Qt.resolvedUrl("DevelopersPage.qml")) - Label { - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: Theme.horizontalPageMargin - anchors.verticalCenter: parent.verticalCenter - text: qsTranslate("", "Developers") + Column { + width: parent.width - Theme.paddingSmall + spacing: Theme.paddingLarge + + Text { + anchors.horizontalCenter: parent.horizontalCenter + text: qsTranslate("", "Licensed under the terms of the <a href=\"%1\"> BSD 3-Clause License</a>").arg("https://opensource.org/licenses/BSD-3-Clause") + textFormat: Text.StyledText + horizontalAlignment: Text.AlignHCenter + font.pixelSize: Theme.fontSizeSmall + color: Theme.secondaryColor + linkColor: Theme.highlightColor + onLinkActivated: Qt.openUrlExternally("https://opensource.org/licenses/BSD-3-Clause") + } + Text { + anchors.horizontalCenter: parent.horizontalCenter + text: qsTranslate("", "Sources and Issue Tracker <a href=\"%1\">on GitHub</a>").arg(SOURCE_REPO) + textFormat: Text.StyledText + horizontalAlignment: Text.AlignHCenter + font.pixelSize: Theme.fontSizeSmall + color: Theme.secondaryColor + linkColor: Theme.highlightColor + onLinkActivated: Qt.openUrlExternally(SOURCE_REPO) } + + Separator { + width: parent.width + color: Theme.primaryColor + horizontalAlignment: Qt.AlignHCenter + } + + Text { + anchors.horizontalCenter: parent.horizontalCenter + text: qsTranslate("", "Credits and Thanks <a href=\"%1\">Developers</a>").arg("about:_blank") + textFormat: Text.StyledText + horizontalAlignment: Text.AlignHCenter + font.pixelSize: Theme.fontSizeSmall + color: Theme.secondaryColor + linkColor: Theme.highlightColor + onLinkActivated: pageStack.push(Qt.resolvedUrl("DevelopersPage.qml")) + } + + Separator { + width: parent.width + color: Theme.primaryColor + horizontalAlignment: Qt.AlignHCenter + } + + Button { + preferredWidth: Theme.buttonWidthMedium + anchors.horizontalCenter: parent.horizontalCenter + onClicked: Qt.openUrlExternally(PAYPAL_DONATE) + text: qsTranslate("", "Donate") + } + } property int rotAngle: 0

@@ -43,7 +43,8 @@ name: "webOS Internals" nickname: "" description: "Team behind AUSMT" - twitter: "https://twitter.com/webosinternals" + socialmedia: "https://twitter.com/webosinternals" + socialmedianame: "Twitter" website: "http://www.webos-internals.org/wiki/Main_Page" } ListElement { @@ -51,8 +52,9 @@ category: "Patchmanager" name: "Lucien Xu" nickname: "Sfiet_Konstantin" - description: "Main developer" - twitter: "https://twitter.com/SfietKonstantin" + description: "Original developer" + socialmedia: "https://twitter.com/SfietKonstantin" + socialmedianame: "Twitter" website: "https://github.com/SfietKonstantin" } ListElement { @@ -61,16 +63,48 @@ name: "Andrey Kozhevnikov" nickname: "coderus" description: "Community developer" - twitter: "https://twitter.com/icoderus" + socialmedia: "https://twitter.com/icoderus" + socialmedianame: "Twitter" website: "https://github.com/coderus" } ListElement { + icon: "/usr/share/patchmanager/data/nephros.png" + category: "Patchmanager" + name: "Peter G." + nickname: "nephros" + description: "Maintainer, UI Tweaker" + socialmedia: "https://mastodon.sdf.org/@renalcalculus" + socialmedianame: "Mastodon" + website: "https://forum.sailfishos.org/u/nephros/summary" + } + ListElement { + icon: "/usr/share/patchmanager/data/b100dian.png" + category: "Patchmanager" + name: "Vlad G." + nickname: "b100dian" + description: "Maintainer" + socialmedia: "https://mastodon.social/@b100dian" + socialmedianame: "Mastodon" + website: "https://forum.sailfishos.org/u/vlagged/summary" + } + ListElement { + icon: "/usr/share/patchmanager/data/olf.png" + category: "Patchmanager" + name: "olf" + nickname: "Olf0" + description: "Maintainer" + socialmedia: "https://mastodon.social/@olf" + socialmedianame: "Mastodon" + website: "https://talk.maemo.org/member.php?u=72347" + } + ListElement { icon: "/usr/share/patchmanager/data/morpog.jpeg" category: "Thanks to" name: "Stephan Beyerle" nickname: "Morpog" description: "Icons master" - twitter: "https://twitter.com/Morpog" + socialmedia: "https://twitter.com/Morpog" + socialmedianame: "Twitter" website: "" } ListElement { @@ -79,7 +113,8 @@ name: "" nickname: "Ancelad" description: "Icons master" - twitter: "https://twitter.com/iAncelad" + socialmedia: "https://twitter.com/iAncelad" + socialmedianame: "Twitter" website: "" } ListElement { @@ -88,9 +123,24 @@ name: "Jakob Dietrich" nickname: "Jakibaki" description: "Prepatch developer" - twitter: "" + socialmedia: "" + socialmedianame: "" website: "https://github.com/jakibaki" } + /* + * TEMPLATE for new entry + * + ListElement { + icon: "" # local image file, remember to add to src/share/share.pro + category: "Patchmanager" # under which section to show the name + name: "Anonymous" # long name, required + nickname: "anon" # short name, required + description: "Anonymous developer" + socialmedia: "" # URL to social media profile + socialmedianame: "" # name of the social media site, e.g. "Twitter" + website: "" # web site URL + } + */ } @@ -147,9 +197,9 @@ onClicked: Qt.openUrlExternally(model.website) } MenuItem { - visible: model.twitter != "" - text: qsTranslate("", "%1's Twitter account").arg(model.name || model.nickname) - onClicked: Qt.openUrlExternally(model.twitter) + visible: model.socialmedia != "" + text: qsTranslate("", "%1's %2 account").arg(model.name || model.nickname).arg(model.socialmedianame || "Social Media") + onClicked: Qt.openUrlExternally(model.socialmedia) } } }

@@ -1,174 +0,0 @@ -/* - * Copyright (C) 2013 Lucien XU <sfietkonstantin@free.fr> - * Copyright (C) 2016 Andrey Kozhevnikov <coderusinbox@gmail.com> - * - * You may use this file under the terms of the BSD license as follows: - * - * "Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * The names of its contributors may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." - */ - -import QtQuick 2.0 -import Sailfish.Silica 1.0 -import org.SfietKonstantin.patchmanager 2.0 - -Page { - id: container - property var modelData - property QtObject delegate - signal doPatch - - SilicaFlickable { - id: view - anchors.fill: parent - contentHeight: content.height - - PullDownMenu { - busy: container.delegate.applying - MenuItem { - text: container.delegate.applying - ? qsTranslate("", "Patch being applied") - : (modelData.patched - ? qsTranslate("", "Unapply patch") - : qsTranslate("", "Apply patch")) - enabled: !container.delegate.applying && PatchManager.loaded - onClicked: { - container.delegate.doPatch() - } - } - MenuLabel { - visible: !PatchManager.loaded - text: qsTranslate("", "Load engine before applying patches") - } - } - - Column { - id: content - width: view.width - spacing: Theme.paddingMedium - - PageHeader { - title: qsTranslate("", "Patch information") - } - - Label { - visible: !modelData.available - color: Theme.primaryColor - anchors.left: parent.left; anchors.leftMargin: Theme.horizontalPageMargin - anchors.right: parent.right; anchors.rightMargin: Theme.horizontalPageMargin - wrapMode: Text.WordWrap - font.pixelSize: Theme.fontSizeLarge - text: qsTranslate("", "This patch is no available anymore. You won't be able to reinstall it.") - } - - SectionHeader { - text: qsTranslate("", "Name") - } - - Label { - color: Theme.highlightColor - anchors.left: parent.left; anchors.leftMargin: Theme.horizontalPageMargin - anchors.right: parent.right; anchors.rightMargin: Theme.horizontalPageMargin - wrapMode: Text.WordWrap - font.pixelSize: Theme.fontSizeLarge - text: modelData.name - } - - SectionHeader { - text: qsTranslate("", "Version") - } - - Label { - color: Theme.highlightColor - anchors.left: parent.left; anchors.leftMargin: Theme.horizontalPageMargin - anchors.right: parent.right; anchors.rightMargin: Theme.horizontalPageMargin - wrapMode: Text.WordWrap - font.pixelSize: Theme.fontSizeLarge - text: modelData.rpm ? modelData.rpm : modelData.version - } - - SectionHeader { - visible: !!modelData.infos && modelData.infos.maintainer - text: qsTranslate("", "Maintainer") - } - - Label { - color: Theme.highlightColor - anchors.left: parent.left; anchors.leftMargin: Theme.horizontalPageMargin - anchors.right: parent.right; anchors.rightMargin: Theme.horizontalPageMargin - wrapMode: Text.WordWrap - visible: !!modelData.infos && modelData.infos.maintainer - text: modelData.infos.maintainer - } - - SectionHeader { - visible: modelData.conflicts.length > 0 - text: qsTranslate("", "Possible conflicts") - } - - Label { - color: Theme.highlightColor - anchors.left: parent.left; anchors.leftMargin: Theme.horizontalPageMargin - anchors.right: parent.right; anchors.rightMargin: Theme.horizontalPageMargin - wrapMode: Text.WordWrap - visible: modelData.conflicts.length > 0 - text: modelData.conflicts.map(function(i) { return PatchManager.patchName(i) }).join("\n") - } - - SectionHeader { - text: qsTranslate("", "Description") - } - - Label { - color: Theme.highlightColor - anchors.left: parent.left; anchors.leftMargin: Theme.horizontalPageMargin - anchors.right: parent.right; anchors.rightMargin: Theme.horizontalPageMargin - wrapMode: Text.WordWrap - text: modelData.description - } - - SectionHeader { - text: qsTranslate("", "Patch log") - visible: PatchManager.developerMode - } - - Label { - color: Theme.highlightColor - anchors.left: parent.left; anchors.leftMargin: Theme.horizontalPageMargin - anchors.right: parent.right; anchors.rightMargin: Theme.horizontalPageMargin - wrapMode: Text.WrapAnywhere - text: modelData.log || qsTranslate("", "No log yet") - font.family: "Courier" - font.pixelSize: Theme.fontSizeTiny - visible: PatchManager.developerMode - - MouseArea { - anchors.fill: parent - onClicked: Clipboard.text = modelData.log - } - } - } - } -}

@@ -1,176 +0,0 @@ -/* - * Copyright (C) 2013 Lucien XU <sfietkonstantin@free.fr> - * Copyright (C) 2016 Andrey Kozhevnikov <coderusinbox@gmail.com> - * - * You may use this file under the terms of the BSD license as follows: - * - * "Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * The names of its contributors may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." - */ - -import QtQuick 2.0 -import Sailfish.Silica 1.0 -import org.SfietKonstantin.patchmanager 2.0 - -Page { - id: container - property var modelData - property var delegate - signal doPatch - - SilicaFlickable { - id: view - anchors.fill: parent - contentHeight: content.height - - PullDownMenu { - busy: container.delegate.applying - MenuItem { - text: container.delegate.applying - ? qsTranslate("", "Patch being applied") - : (modelData.patched - ? qsTranslate("", "Unapply patch") - : qsTranslate("", "Apply patch")) - enabled: !container.delegate.applying && PatchManager.loaded - onClicked: { - container.delegate.doPatch() - } - } - MenuLabel { - visible: !PatchManager.loaded - text: qsTranslate("", "Load engine before applying patches") - } - } - - Column { - id: content - width: view.width - spacing: Theme.paddingMedium - - PageHeader { - title: modelData.display_name - } - - Label { - visible: !modelData.available - color: Theme.primaryColor - anchors.left: parent.left; anchors.leftMargin: Theme.horizontalPageMargin - anchors.right: parent.right; anchors.rightMargin: Theme.horizontalPageMargin - wrapMode: Text.WordWrap - font.pixelSize: Theme.fontSizeLarge - text: qsTranslate("", "This patch is no available anymore. You won't be able to reinstall it.") - } - - SectionHeader { - text: qsTranslate("", "Author") - } - - Label { - color: Theme.highlightColor - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: Theme.horizontalPageMargin - wrapMode: Text.WordWrap - text: modelData.author - } - - SectionHeader { - visible: modelData.conflicts.length > 0 - text: qsTranslate("", "Possible conflicts") - } - - Label { - color: Theme.highlightColor - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: Theme.horizontalPageMargin - wrapMode: Text.WrapAtWordBoundaryOrAnywhere - text: modelData.conflicts.map(function(i) { return PatchManager.patchName(i) }).join("\n") - visible: modelData.conflicts.length > 0 - } - - SectionHeader { - text: qsTranslate("", "Version") - } - - Label { - color: Theme.highlightColor - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: Theme.horizontalPageMargin - wrapMode: Text.WordWrap - text: modelData.rpm ? modelData.rpm : modelData.version - } - - SectionHeader { - text: qsTranslate("", "Compatible") - } - - Label { - color: Theme.highlightColor - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: Theme.horizontalPageMargin - wrapMode: Text.WrapAtWordBoundaryOrAnywhere - text: modelData.compatible.join(', ') - } - - SectionHeader { - text: qsTranslate("", "Description") - } - - Label { - color: Theme.highlightColor - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: Theme.horizontalPageMargin - wrapMode: Text.WordWrap - text: modelData.description - } - - SectionHeader { - text: qsTranslate("", "Patch log") - visible: PatchManager.developerMode - } - - Label { - color: Theme.highlightColor - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: Theme.horizontalPageMargin - wrapMode: Text.WrapAnywhere - text: modelData.log || qsTranslate("", "No log yet") - font.family: "Courier" - font.pixelSize: Theme.fontSizeTiny - visible: PatchManager.developerMode - - MouseArea { - anchors.fill: parent - onClicked: Clipboard.text = modelData.log - } - } - } - } -}

@@ -396,7 +396,7 @@ } function openPatchInfo() { - pageStack.push(Qt.resolvedUrl(patchObject.details.isNewPatch ? "NewPatchPage.qml" : "LegacyPatchPage.qml"), + pageStack.push(Qt.resolvedUrl("UnifiedPatchPage.qml"), {modelData: patchObject.details, delegate: background}) } @@ -480,10 +480,11 @@ } } MenuLabel { - visible: patchObject.details.conflicts.length > 0 - text: qsTranslate("", "Have possible conflicts") + visible: !patchObject.details.patched && patchObject.details.conflicts.length > 0 + text: qsTr("May conflict with %n other patch(es), see %2", "", patchObject.details.conflicts.length).arg(patchinfoitem.text) } MenuItem { + id: patchinfoitem text: qsTranslate("", "Patch info") onClicked: background.openPatchInfo() }

@@ -0,0 +1,220 @@ +/* + * Copyright (C) 2013 Lucien XU <sfietkonstantin@free.fr> + * Copyright (C) 2016 Andrey Kozhevnikov <coderusinbox@gmail.com> + * + * You may use this file under the terms of the BSD license as follows: + * + * "Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * The names of its contributors may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." + */ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Nemo.Notifications 1.0 +import org.SfietKonstantin.patchmanager 2.0 + +Page { + id: container + property var modelData + property var delegate + property bool legacyPatch: !modelData.isNewPatch + signal doPatch + + Notification { + id: popup + appName: modelData.display_name + summary: qsTranslate("", "Log copied to Clipboard!") + previewSummary: summary + icon: "image://theme/icon-s-clipboard" + category: "transfer.complete" + expireTimeout: 2000 + isTransient: true + } + + SilicaFlickable { + id: view + anchors.fill: parent + contentHeight: content.height + + PullDownMenu { + busy: container.delegate.applying + MenuItem { + text: container.delegate.applying + ? qsTranslate("", "Patch being applied") + : (modelData.patched + ? qsTranslate("", "Unapply patch") + : qsTranslate("", "Apply patch")) + enabled: !container.delegate.applying && PatchManager.loaded + onClicked: { + container.delegate.doPatch() + } + } + MenuItem { + text: qsTranslate("", "Uninstall patch") + enabled: !modelData.patched + onClicked: { + Remorse.popupAction(container, qsTranslate("", "Patch %1 uninstalled.").arg(modelData.display_name), + function() { container.delegate.doUninstall(); pageStack.pop(); } + ) + } + } + MenuLabel { + visible: !PatchManager.loaded + text: qsTranslate("", "Load engine before applying patches") + } + } + + Column { + id: content + width: view.width + spacing: Theme.paddingMedium + anchors.bottomMargin: Theme.itemSizeSmall + + PageHeader { + title: legacyPatch ? modelData.display_name : modelData.display_name + } + + Label { + visible: !modelData.available + anchors.left: parent.left + anchors.right: parent.right + anchors.margins: Theme.horizontalPageMargin + color: Theme.primaryColor + wrapMode: Text.WordWrap + font.pixelSize: Theme.fontSizeLarge + text: qsTranslate("", "This patch is not available anymore. You will not be able to reinstall it.") + } + + Column { + width: parent.width - Theme.itemSizeMedium * 2 + anchors.horizontalCenter: parent.horizontalCenter + spacing: Theme.paddingSmall + + DetailItem { + label: legacyPatch ? qsTranslate("", "Maintainer") : qsTranslate("", "Author") + value: legacyPatch ? modelData.infos.maintainer : modelData.author + } + DetailItem { + label: qsTranslate("", "Version") + value: modelData.rpm ? modelData.rpm : (modelData.version != "0.0.0") ? modelData.version : qsTranslate("", "not available") + _valueItem.wrapMode: Text.WordWrap + } + DetailItem { + label: qsTranslate("", "Compatible") + value: modelData.compatible.length > 0 ? modelData.compatible.join(', ') : qsTranslate("", "not available") + _valueItem.wrapMode: Text.WrapAtWordBoundaryOrAnywhere + } + } + Separator { + width: parent.width + color: Theme.primaryColor + horizontalAlignment: Qt.AlignHCenter + } + SectionHeader { + visible: modelData.conflicts.length > 0 + text: qsTranslate("", "May conflict with:") + } + Repeater { + visible: modelData.conflicts.length > 0 + model: modelData.conflicts + delegate: TextSwitch { + anchors.left: parent.left + anchors.right: parent.right + anchors.margins: Theme.horizontalPageMargin + automaticCheck : false + checked: PatchManager.isApplied(modelData) + _label.color: checked ? Theme.primaryColor : Theme.secondaryColor + height: Math.max(Theme.itemSizeMedium, implicitHeight) + text: PatchManager.patchName(modelData) + } + } + + Label { + visible: PatchManager.developerMode && legacyPatch + color: Theme.primaryColor + anchors.left: parent.left + anchors.right: parent.right + anchors.margins: Theme.horizontalPageMargin + wrapMode: Text.WordWrap + horizontalAlignment: Text.AlignJustify + font.pixelSize: Theme.fontSizeSmall + textFormat: Text.StyledText + property string link: SOURCE_REPO + "/blob/master/README.md#for-developers" + text: qsTranslate("", "This patch uses the legacy format for its patch.json file. If you are the maintainer, do consider updating to the new format. If you are using Web Catalog you should not include a patch.json file at all in your upload. See the developer section in the <a href=\"%1\">README</a> for more information.").arg(link) + linkColor: Theme.highlightColor + onLinkActivated: Qt.openUrlExternally(link) + } + + SectionHeader { + text: qsTranslate("", "Description") + } + + Label { + color: Theme.secondaryHighlightColor + anchors.left: parent.left + anchors.right: parent.right + anchors.margins: Theme.horizontalPageMargin + horizontalAlignment: Text.AlignJustify + wrapMode: Text.WordWrap + text: modelData.description + } + + SectionHeader { + text: qsTranslate("", "Patch log") + visible: PatchManager.developerMode + } + + Label { + anchors.right: parent.right + anchors.rightMargin: Theme.horizontalPageMargin + anchors.leftMargin: Theme.horizontalPageMargin + color: Theme.secondaryHighlightColor + text: qsTranslate("", "Press and hold to copy to Clipboard") + font.pixelSize: Theme.fontSizeTiny + visible: modelData.log && log.visible + } + + TextArea {

@@ -41,6 +41,7 @@ property var versions property string search property bool searchVisible + property bool sortByDate: true onStatusChanged: { if (status == PageStatus.Active) { @@ -84,13 +85,21 @@ searchVisible = !searchVisible } } + MenuItem { + text: sortByDate ? qsTranslate("", "Sort by Category") : qsTranslate("", "Sort by Date") + onClicked: { + sortByDate = !sortByDate + } + } + } header: Component { Column { width: view.width PageHeader { - title: container.author ? qsTranslate("", "%1 patches").arg(container.author) : qsTranslate("", "Web catalog") + title: container.author ? qsTranslate("", "%1 patches").arg(container.author) : qsTranslate("", "Web catalog") + description: container.sortByDate ? qsTranslate("", "(by date updated)") : qsTranslate("", "(by category)") } SearchField { @@ -130,15 +139,22 @@ } model: WebPatchesModel { id: patchModel - queryParams: container.author ? { 'author': container.author } - : container.search ? { 'display_name__contains': container.search } - : {} + sorted: !container.sortByDate + queryParams: { + var p = {}; + if (container.author) p = { 'author': container.author }; + if (container.search) p = { 'display_name__contains': container.search }; + return p; + } } section.criteria: ViewSection.FullString section.delegate: SectionHeader { - text: qsTranslate("Sections", section) + text: container.sortByDate ? "" : qsTranslate("Sections", section) + font.capitalization: Font.Capitalize + height: text.length > 0 ? implicitHeight : 0 + visible: text.length > 0 } - section.property: "category" + section.property: container.sortByDate ? "undefined" : "category" currentIndex: -1 spacing: Theme.paddingSmall @@ -167,7 +183,7 @@ width: parent.width Label { id: nameLabel - width: parent.width - authorLabel.width - Theme.paddingMedium + width: parent.width - secondaryLabel.width - Theme.paddingMedium text: model.display_name color: background.down ? Theme.highlightColor : Theme.primaryColor font.bold: isInstalled @@ -175,11 +191,11 @@ } Label { - id: authorLabel + id: secondaryLabel anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter font.pixelSize: Theme.fontSizeExtraSmall - text: model.author + text: container.sortByDate ? model.category : model.author color: Theme.secondaryHighlightColor } }

@@ -326,7 +326,7 @@ width: parent.width contentHeight: filesContent.height property bool isInstalled: !!container.versions && container.versions[modelData.project] == modelData.version - property bool isCompatible: modelData.compatible.indexOf(PatchManager.ssuVersion) >= 0 + property bool isCompatible: modelData.compatible.indexOf(PatchManager.osVersion) >= 0 onClicked: { if (!PatchManager.developerMode && !isCompatible) {

@@ -162,22 +162,7 @@ }); - QDBusPendingCallWatcher *watchGetSsuVersion = new QDBusPendingCallWatcher(m_interface->getSsuVersion(), this); - connect(watchGetSsuVersion, &QDBusPendingCallWatcher::finished, [this](QDBusPendingCallWatcher *watcher){ - watcher->deleteLater(); - QDBusPendingReply<QString> reply = *watcher; - if (reply.isError()) { - qWarning() << Q_FUNC_INFO << reply.error().type() << reply.error().name() << reply.error().message(); - return; - } - - qDebug() << Q_FUNC_INFO << reply.value(); - - const QString ssuVersion = reply.value(); - m_ssuVersion = ssuVersion; - emit ssuVersionChanged(m_ssuVersion); - - }); + m_osVersion = QSettings("/etc/os-release", QSettings::IniFormat).value("VERSION_ID").toString(); } PatchManager *PatchManager::GetInstance(QObject *parent) @@ -247,11 +232,6 @@ return m_patchmanagerVersion; } -QString PatchManager::ssuVersion() const -{ - return m_ssuVersion; -} - bool PatchManager::toggleServices() const { return m_toggleServices; @@ -379,6 +359,11 @@ return m_installedModel->patchName(patch); } +bool PatchManager::isApplied(const QString &name) const +{ + return m_installedModel->isApplied(name); +} + //QDBusPendingCallWatcher *PatchManager::putSettings(const QString &name, const QVariant &value) //{ // return new QDBusPendingCallWatcher(m_interface->putSettings(name, value), this);

@@ -73,7 +73,7 @@ Q_PROPERTY(bool failure READ failure NOTIFY failureChanged) Q_PROPERTY(bool loaded READ loaded NOTIFY loadedChanged) Q_PROPERTY(QString patchmanagerVersion READ patchmanagerVersion NOTIFY patchmanagerVersionChanged) - Q_PROPERTY(QString ssuVersion READ ssuVersion NOTIFY ssuVersionChanged) + Q_PROPERTY(QString osVersion MEMBER m_osVersion CONSTANT) public: explicit PatchManager(QObject *parent = nullptr); @@ -88,7 +88,6 @@ QVariantMap getUpdates() const; QStringList getUpdatesNames() const; QString patchmanagerVersion() const; - QString ssuVersion() const; bool toggleServices() const; bool failure() const; @@ -122,6 +121,7 @@ void restartServices(); QString patchName(const QString &patch) const; + bool isApplied(const QString &name) const; bool installTranslator(const QString & patch); bool removeTranslator(const QString & patch); @@ -161,7 +161,6 @@ void failureChanged(bool failed); void loadedChanged(bool loaded); void patchmanagerVersionChanged(const QString &patchmanagerVersion); - void ssuVersionChanged(const QString &ssuVersion); private: void successCall(QJSValue callback, const QVariant &value); @@ -180,7 +179,7 @@ bool m_loaded = false; QString m_patchmanagerVersion; - QString m_ssuVersion; + QString m_osVersion; }; #endif // PATCHMANAGER_H

@@ -239,6 +239,17 @@ return m_patchMap[patch]->details()->value(QStringLiteral("display_name")).toString(); } +bool PatchManagerModel::isApplied(const QString &name) const +{ + // FIXME: there certainly is a more efficient way, e.g. std::find_if? + for (PatchObject *o : m_modelData) { + if (o->details()->value(QStringLiteral("name")).toString() == name ) { + return o->details()->value(QStringLiteral("patched")).toBool(); + } + } + return false; +} + void PatchManagerModel::itemRemoved(PatchObject *object) { qDebug() << Q_FUNC_INFO << object;

@@ -56,6 +56,7 @@ Q_INVOKABLE void saveLayout(); QString patchName(const QString &patch) const; + bool isApplied(const QString &name) const; private slots: void itemRemoved(PatchObject *object);

@@ -41,6 +41,8 @@ // TODO: ask for paypal.me static QString PAYPAL_DONATE = QStringLiteral("https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=R6AJV4U2G33XG"); +static QString SOURCE_REPO = QStringLiteral("https://github.com/sailfishos-patches/patchmanager"); + static QObject *patchmanager_singleton(QQmlEngine *engine, QJSEngine *scriptEngine) { Q_UNUSED(scriptEngine) @@ -61,6 +63,7 @@ { Q_ASSERT(strcmp(uri, "org.SfietKonstantin.patchmanager") == 0); engine->rootContext()->setContextProperty(QStringLiteral("PAYPAL_DONATE"), PAYPAL_DONATE); + engine->rootContext()->setContextProperty(QStringLiteral("SOURCE_REPO"), SOURCE_REPO); } void registerTypes(const char *uri)

@@ -26,11 +26,10 @@ AboutPage.qml \ DevelopersPage.qml \ RestartServicesDialog.qml \ - LegacyPatchPage.qml \ + UnifiedPatchPage.qml \ WebCatalogPage.qml \ WebPatchPage.qml \ ItemErrorComponent.qml \ - NewPatchPage.qml \ ScreenshotsPage.qml \ SettingsPage.qml

@@ -4,5 +4,4 @@ AboutPage 2.0 AboutPage.qml DevelopersPage 2.0 DevelopersPage.qml LipstickWarningDialog 2.0 LipstickWarningDialog.qml -LegacyPatchPage 2.0 LegacyPatchPage.qml RestartServicesDialog 2.0 RestartServicesDialog.qml

@@ -191,7 +191,7 @@ </message> <message> <location filename="PatchManagerPage.qml" line="484"/> - <source>Have possible conflicts</source> + <source>May conflict with %n other patch(es), see %2</source> <translation type="unfinished"></translation> </message> <message>

@@ -36,6 +36,8 @@ #include <QDBusPendingReply> #include <QDebug> +#include <algorithm> + WebPatchesModel::WebPatchesModel(QObject * parent) : QAbstractListModel(parent) { @@ -53,6 +55,7 @@ } _completed = false; + _sorted = false; _nam = new QNetworkAccessManager(this); } @@ -76,12 +79,31 @@ } } } +void WebPatchesModel::setSorted(const bool & sorted) { + if (sorted != _sorted) { + _sorted = sorted; + emit WebPatchesModel::sortedChanged(); + if (_completed) { + componentComplete(); + } + } +} void WebPatchesModel::classBegin() { } +QString translateCategory(const QByteArray &category) +{ + return QCoreApplication::translate("Sections", category.data()); +} + +bool compareStrings(const QString &a, const QString &b) +{ + return a.compare(b, Qt::CaseInsensitive) < 0; +} + void WebPatchesModel::componentComplete() { if (_modelData.size() > 0) { @@ -94,9 +116,38 @@ connect(watcher, &QDBusPendingCallWatcher::finished, [this](QDBusPendingCallWatcher *watcher){ QDBusPendingReply<QVariantList> reply = *watcher; if (!reply.isError()) { - const QVariantList catalog = PatchManager::unwind(reply.value()).toList(); + QVariantList catalog = PatchManager::unwind(reply.value()).toList(); qDebug() << Q_FUNC_INFO << catalog.count(); + if (_sorted) { + const QLatin1String category("category"); + const QLatin1String name("display_name"); + const QByteArray other("other"); + std::sort(catalog.begin(), catalog.end(), [&category, &name, &other](const QVariant &a, const QVariant &b) { + const auto amap = a.toMap(); + const auto bmap = b.toMap(); + + const auto acat = amap[category].toByteArray(); + const auto bcat = bmap[category].toByteArray(); + + if (acat == bcat) { + // If categories are equal then sort by name + return compareStrings(amap[name].toString(), bmap[name].toString()); + } + + // Move others to the end + if (acat == other) { + return false; + } + if (bcat == other) { + return true; + } + + // Sort by localized category name + return compareStrings(translateCategory(acat), translateCategory(bcat)); + }); + } + beginInsertRows(QModelIndex(), 0, catalog.count() - 1); _modelData = catalog; endInsertRows();

@@ -49,6 +49,9 @@ Q_PROPERTY(QVariantMap queryParams READ queryParams WRITE setQueryParams NOTIFY queryParamsChanged) QVariantMap queryParams() const; void setQueryParams(const QVariantMap & queryParams); + Q_PROPERTY(bool sorted READ sorted WRITE setSorted NOTIFY sortedChanged) + bool sorted() const { return _sorted; }; + void setSorted(const bool & sorted); explicit WebPatchesModel(QObject * parent = 0); virtual ~WebPatchesModel(); @@ -63,6 +66,7 @@ private: QVariantMap _queryParams; bool _completed; + bool _sorted; QNetworkAccessManager * _nam; @@ -72,6 +76,7 @@ signals: void queryParamsChanged(const QVariantMap & queryParams); + void sortedChanged(); };

@@ -7,6 +7,9 @@ jakibaki.jpeg \ sfiet_konstantin.jpg \ coderus.jpg \ + nephros.png \ + b100dian.png \ + olf.png \ webosinternals.png data.files = $${OTHER_FILES}

@@ -125,7 +125,7 @@ log "----------------------------------" log -log $(basename "$PATCH_DIR") +log "$(basename "$PATCH_DIR")" if [ -f "$PATCH_PATH" ]; then log " contains text patch"

@@ -16,7 +16,7 @@ PM_PATCH_BACKUP_DIR="$PM_PATCH_BACKUP_ROOT_DIR/$1" # Constants -PATCH_NAME=unified_diff.patch +PATCH_NAME="unified_diff.patch" PATCH_PATH="$PATCH_DIR/$PATCH_NAME" PATCH_BACKUP="$PM_PATCH_BACKUP_DIR/$PATCH_NAME" @@ -109,7 +109,7 @@ log "----------------------------------" log -log $(basename "$PATCH_DIR") +log "$(basename "$PATCH_DIR")" if [ -f "$PATCH_FILE" ]; then log " contains text patch"

@@ -10,30 +10,38 @@ <translation>Über Patchmanager</translation> </message> <message> + <location filename="../src/bin/dialog/dialog.qml" line="45"/> <source>Apply patches</source> - <translation type="vanished">Patches anwenden</translation> + <translation>Patches anwenden</translation> </message> <message> + <location filename="../src/bin/dialog/dialog.qml" line="53"/> <source>Patchmanager will automatically apply patches in 10 seconds.</source> - <translation type="vanished">Patchmanager wendet Patches automatisch in 10 Sekunden an.</translation> + <translation>Patchmanager wendet Patches automatisch in 10 Sekunden an.</translation> </message> <message> + <location filename="../src/bin/dialog/dialog.qml" line="66"/> <source>Exit</source> - <translation type="vanished">Beenden</translation> + <translation>Beenden</translation> </message> <message> + <location filename="../src/bin/dialog/dialog.qml" line="28"/> <source>Applying patches</source> - <translation type="vanished">Anwenden von Patches</translation> + <translation>Anwenden von Patches</translation> </message> <message> + <location filename="../src/bin/dialog/dialog.qml" line="136"/> <source>Appled successfully!</source> - <translation type="vanished">Erfolgreich angewendet!</translation> + <translation>Erfolgreich angewendet!</translation> </message> <message> + <location filename="../src/bin/dialog/dialog.qml" line="137"/> <source>Failed applying patches!</source> - <translation type="vanished">Fehler beim Anwenden von Patches!</translation> + <translation>Fehler beim Anwenden von Patches!</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> + <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> <source>Patchmanager</source> <translation>Patchmanager</translation> @@ -49,13 +57,27 @@ <translation>Patchmanager ermöglicht es durch Patches Veränderungen am System vorzunehmen. Patchmanager besteht zum einen aus einem Daemon, welcher für die Verarbeitung der Patches zuständig ist und zum anderen aus der GUI, mit welcher sich die Patches installieren oder entfernen lassen.</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the <a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker <a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks <a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation>Spenden</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>Entwickler</translation> @@ -173,7 +195,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>Web catalog</source> <translation>Web-Katalog</translation> </message> @@ -209,8 +231,12 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="484"/> + <source>May have conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Have possible conflicts</source> - <translation>Eventuelle Konflikte</translation> + <translation type="vanished">Eventuelle Konflikte</translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="487"/> @@ -234,7 +260,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="510"/> - <location filename="../src/qml/WebCatalogPage.qml" line="232"/> + <location filename="../src/qml/WebCatalogPage.qml" line="248"/> <source>No patches available</source> <translation>Keine Patches verfügbar</translation> </message> @@ -255,27 +281,47 @@ <translation>Screenshots</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Hide search field</source> <translation>Suchfeld verstecken</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Show search field</source> <translation>Suchfeld anzeigen</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>%1 patches</source> <translation>%1 Patches</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="99"/> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by date updated)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by category)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="108"/> <source>Tap to enter search query</source> <translation>Antippen zum Suchen</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="219"/> + <location filename="../src/qml/WebCatalogPage.qml" line="235"/> <source>Update available: %1</source> <translation>Aktualisierung verfügbar: %1</translation> </message> @@ -340,44 +386,54 @@ <translation>Kompatibel zu: %1 </translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="224"/> <source>Patch installed</source> - <translation type="vanished">Patch installiert</translation> + <translation>Patch installiert</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="225"/> <source>Patch %1 installed</source> - <translation type="vanished">Patch %1 installiert</translation> + <translation>Patch %1 installiert</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="228"/> <source>Patch removed</source> - <translation type="vanished">Patch entfernt</translation> + <translation>Patch entfernt</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="229"/> <source>Patch %1 removed</source> - <translation type="vanished">Patch %1 entfernt</translation> + <translation>Patch %1 entfernt</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="232"/> <source>Failed to install patch</source> - <translation type="vanished">Patch konnte nicht installiert werden</translation> + <translation>Patch konnte nicht installiert werden</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="233"/> <source>Patch %1 installation failed</source> - <translation type="vanished">Patch %1 konnte nicht installiert werden</translation> + <translation>Patch %1 konnte nicht installiert werden</translation> </message> <message>

@@ -10,30 +10,38 @@ <translation>About</translation> </message> <message> + <location filename="../src/bin/dialog/dialog.qml" line="45"/> <source>Apply patches</source> - <translation type="vanished">Apply patches</translation> + <translation>Apply patches</translation> </message> <message> + <location filename="../src/bin/dialog/dialog.qml" line="53"/> <source>Patchmanager will automatically apply patches in 10 seconds.</source> - <translation type="vanished">Patchmanager will automatically apply patches in 10 seconds.</translation> + <translation>Patchmanager will automatically apply patches in 10 seconds.</translation> </message> <message> + <location filename="../src/bin/dialog/dialog.qml" line="66"/> <source>Exit</source> - <translation type="vanished">Exit</translation> + <translation>Exit</translation> </message> <message> + <location filename="../src/bin/dialog/dialog.qml" line="28"/> <source>Applying patches</source> - <translation type="vanished">Applying patches</translation> + <translation>Applying patches</translation> </message> <message> + <location filename="../src/bin/dialog/dialog.qml" line="136"/> <source>Appled successfully!</source> - <translation type="vanished">Appled successfully!</translation> + <translation>Appled successfully!</translation> </message> <message> + <location filename="../src/bin/dialog/dialog.qml" line="137"/> <source>Failed applying patches!</source> - <translation type="vanished">Failed applying patches!</translation> + <translation>Failed applying patches!</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> + <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> <source>Patchmanager</source> <translation>Patchmanager</translation> @@ -49,13 +57,27 @@ <translation>Patchmanager allows system modification via patches. It provides a system daemon that is in charge of performing those patches, as well as a GUI, to control those operations and installation/removal of patches.</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the <a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker <a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks <a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation>Donate</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>Developers</translation> @@ -173,7 +195,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>Web catalog</source> <translation>Web catalog</translation> </message> @@ -209,8 +231,12 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="484"/> + <source>May have conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Have possible conflicts</source> - <translation>Have possible conflicts</translation> + <translation type="vanished">Have possible conflicts</translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="487"/> @@ -234,7 +260,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="510"/> - <location filename="../src/qml/WebCatalogPage.qml" line="232"/> + <location filename="../src/qml/WebCatalogPage.qml" line="248"/> <source>No patches available</source> <translation>No patches available</translation> </message> @@ -255,27 +281,47 @@ <translation>Screenshots</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Hide search field</source> <translation>Hide search field</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Show search field</source> <translation>Show search field</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>%1 patches</source> <translation>%1 patches</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="99"/> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by date updated)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by category)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="108"/> <source>Tap to enter search query</source> <translation>Tap to enter search query</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="219"/> + <location filename="../src/qml/WebCatalogPage.qml" line="235"/> <source>Update available: %1</source> <translation>Update available: %1</translation> </message> @@ -340,44 +386,54 @@ <translation>Compatible: %1</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="224"/> <source>Patch installed</source> - <translation type="vanished">Patch installed</translation> + <translation>Patch installed</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="225"/> <source>Patch %1 installed</source> - <translation type="vanished">Patch %1 installed</translation> + <translation>Patch %1 installed</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="228"/> <source>Patch removed</source> - <translation type="vanished">Patch removed</translation> + <translation>Patch removed</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="229"/> <source>Patch %1 removed</source> - <translation type="vanished">Patch %1 removed</translation> + <translation>Patch %1 removed</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="232"/> <source>Failed to install patch</source> - <translation type="vanished">Failed to install patch</translation> + <translation>Failed to install patch</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="233"/> <source>Patch %1 installation failed</source> - <translation type="vanished">Patch %1 installation failed</translation> + <translation>Patch %1 installation failed</translation> </message> <message>

@@ -1,6 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="es" version="2.1"> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="es"> <context> - <name/> + <name></name> <message> <location filename="../src/qml/AboutPage.qml" line="49"/> <location filename="../src/qml/PatchManagerPage.qml" line="142"/> @@ -38,9 +40,9 @@ <translation>¡Error al aplicar parches!</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/> <source>Patchmanager</source> <translation>Gestor de parches</translation> </message> @@ -55,13 +57,27 @@ <translation>El gestor de parches permite la modificación del sistema a través de parches. Proporciona un sistema que se encarga de ejecutar esos parches en segundo plano, así como una GUI para controlar estas operaciones e instalar/eliminar parches.</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the <a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker <a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks <a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation>Donar</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>Desarrolladores</translation> @@ -98,7 +114,7 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="63"/> <location filename="../src/qml/NewPatchPage.qml" line="63"/> <source>Load engine before applying patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="73"/> @@ -179,7 +195,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>Web catalog</source> <translation>Catálogo Web</translation> </message> @@ -215,8 +231,12 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="484"/> + <source>May have conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Have possible conflicts</source> - <translation>Hay posibles conflictos</translation> + <translation type="vanished">Hay posibles conflictos</translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="487"/> @@ -240,7 +260,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="510"/> - <location filename="../src/qml/WebCatalogPage.qml" line="232"/> + <location filename="../src/qml/WebCatalogPage.qml" line="248"/> <source>No patches available</source> <translation>No hay parches disponibles</translation> </message> @@ -261,27 +281,47 @@ <translation>Capturas</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Hide search field</source> <translation>Ocultar campo de búsqueda</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Show search field</source> <translation>Mostrar campo de búsqueda</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>%1 patches</source> <translation>%1 parches</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="99"/> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by date updated)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by category)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="108"/> <source>Tap to enter search query</source> <translation>Toca para escribir consulta</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="219"/> + <location filename="../src/qml/WebCatalogPage.qml" line="235"/> <source>Update available: %1</source> <translation>Actualización disponible: %1</translation> </message> @@ -346,70 +386,84 @@ <translation>Compatible: %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="218"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="224"/> <source>Patch installed</source> <translation>Parche instalado</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="219"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="225"/> <source>Patch %1 installed</source> <translation>Parche %1 instalado</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="222"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="228"/> <source>Patch removed</source> <translation>Parche eliminado</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="223"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="229"/> <source>Patch %1 removed</source> <translation>Parche %1 eliminado</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="226"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="232"/> <source>Failed to install patch</source> <translation>Error al instalar parche</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="227"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="233"/> <source>Patch %1 installation failed</source> <translation>Falló la instalación del parche %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="230"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="236"/> <source>Failed to remove patch</source> <translation>Error al eliminar parche</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="231"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="237"/> <source>Patch %1 removal failed</source> <translation>Falló la eliminación del parche %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="234"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="240"/>

@@ -1,6 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="fi" version="2.1"> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="fi"> <context> - <name/> + <name></name> <message> <location filename="../src/qml/AboutPage.qml" line="49"/> <location filename="../src/qml/PatchManagerPage.qml" line="142"/> @@ -38,9 +40,9 @@ <translation>Muutostiedostojen käyttöönotto epäonnistui!</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/> <source>Patchmanager</source> <translation>Muutostiedostojen hallinta</translation> </message> @@ -55,13 +57,27 @@ <translation>Muutostiedostojen hallinta (Patchmanager) sallii muutoksia järjestelmään muutostiedostoilla (patch). Se tarjoaa järjestelmän taustaprosessin joka vastaa kyseisten muutostiedostojen suorittamisesta, samoin kuin graafinen käyttöliittymä (GUI), hallitakseen niiden toimintoja ja muutostiedostojen asennuksia/poistoja.</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the <a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker <a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks <a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation>Lahjoita</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>Kehittäjät</translation> @@ -98,7 +114,7 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="63"/> <location filename="../src/qml/NewPatchPage.qml" line="63"/> <source>Load engine before applying patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="73"/> @@ -179,7 +195,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>Web catalog</source> <translation>Luettelo muutostiedostoista verkossa</translation> </message> @@ -215,8 +231,12 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="484"/> + <source>May have conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Have possible conflicts</source> - <translation>Mahdollisia ristiriitoja</translation> + <translation type="vanished">Mahdollisia ristiriitoja</translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="487"/> @@ -240,7 +260,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="510"/> - <location filename="../src/qml/WebCatalogPage.qml" line="232"/> + <location filename="../src/qml/WebCatalogPage.qml" line="248"/> <source>No patches available</source> <translation>Muutostiedostoja ei ole saatavilla</translation> </message> @@ -261,27 +281,47 @@ <translation>Näyttökuvat</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Hide search field</source> <translation>Piilota hakukenttä</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Show search field</source> <translation>Näytä hakukenttä</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>%1 patches</source> <translation>%1 muutostiedostoa</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="99"/> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by date updated)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by category)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="108"/> <source>Tap to enter search query</source> <translation>Mitä haet?</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="219"/> + <location filename="../src/qml/WebCatalogPage.qml" line="235"/> <source>Update available: %1</source> <translation>Päivitys saatavilla: %1</translation> </message> @@ -346,70 +386,84 @@ <translation>Yhteensopiva: %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="218"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="224"/> <source>Patch installed</source> <translation>Muutostiedosto asennettu</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="219"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="225"/> <source>Patch %1 installed</source> <translation>Muutostiedosto %1 asennettu</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="222"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="228"/> <source>Patch removed</source> <translation>Muutostiedosto poistettu</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="223"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="229"/> <source>Patch %1 removed</source> <translation>Muutostiedosto %1 poistettu</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="226"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="232"/> <source>Failed to install patch</source> <translation>Muutostiedoston asennus epäonnistui</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="227"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="233"/> <source>Patch %1 installation failed</source> <translation>Muutostiedoston %1 asennus epäonnistui</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="230"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="236"/> <source>Failed to remove patch</source> <translation>Muutostiedoston poistaminen epäonnistui</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="231"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="237"/> <source>Patch %1 removal failed</source> <translation>Muutostiedoston %1 poisto epäonnistui</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="234"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="240"/>

@@ -1,6 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="fi_FI" version="2.1"> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="fi_FI"> <context> - <name/> + <name></name> <message> <location filename="../src/qml/AboutPage.qml" line="49"/> <location filename="../src/qml/PatchManagerPage.qml" line="142"/> @@ -38,9 +40,9 @@ <translation>Käyttöönotto epäonnistui!</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/> <source>Patchmanager</source> <translation>Muutostiedostojen hallinta</translation> </message> @@ -52,16 +54,30 @@ <message> <location filename="../src/qml/AboutPage.qml" line="81"/> <source>Patchmanager allows system modification via patches. It provides a system daemon that is in charge of performing those patches, as well as a GUI, to control those operations and installation/removal of patches.</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the <a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker <a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks <a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation>Lahjoita</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>Kehittäjät</translation> @@ -98,7 +114,7 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="63"/> <location filename="../src/qml/NewPatchPage.qml" line="63"/> <source>Load engine before applying patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="73"/> @@ -110,7 +126,7 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="83"/> <location filename="../src/qml/NewPatchPage.qml" line="83"/> <source>This patch is no available anymore. You won't be able to reinstall it.</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="87"/> @@ -138,278 +154,308 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="153"/> <location filename="../src/qml/NewPatchPage.qml" line="154"/> <source>Patch log</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="162"/> <location filename="../src/qml/NewPatchPage.qml" line="164"/> <source>No log yet</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/NewPatchPage.qml" line="87"/> <source>Author</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="100"/> <location filename="../src/qml/NewPatchPage.qml" line="115"/> <source>Version</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/NewPatchPage.qml" line="128"/> <source>Compatible</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="147"/> <source>Unapply all patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="153"/> <source>Load engine</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> <source>Updates available</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>Web catalog</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="165"/> <source>Restart preloaded services</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="171"/> <source>Resolve failure</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="178"/> <source>Installed patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="357"/> <source>This patch is not compatible with SailfishOS version!</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="365"/> <source>Uninstalling patch %1</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="470"/> <source>Compatible with:</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="484"/> - <source>Have possible conflicts</source> - <translation type="unfinished"/> + <source>May have conflicts</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="487"/> <source>Patch info</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="491"/> <source>Unapply</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="491"/> <source>Apply</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="496"/> <source>Uninstall</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message>

@@ -1,6 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr_FR" version="2.1"> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="fr_FR"> <context> - <name/> + <name></name> <message> <location filename="../src/qml/AboutPage.qml" line="49"/> <location filename="../src/qml/PatchManagerPage.qml" line="142"/> @@ -38,9 +40,9 @@ <translation>Échec de l'application des patches !</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/> <source>Patchmanager</source> <translation>Patchmanager</translation> </message> @@ -55,13 +57,27 @@ <translation>Patchmanager permet des modifications du système via des patchs. Il fournit un daemon système en charge d'appliquer ces patchs mais également un GUI pour contrôler ces opérations d'installation/suppression de patchs.</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the <a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker <a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks <a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation>Donation</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>Développeurs</translation> @@ -98,7 +114,7 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="63"/> <location filename="../src/qml/NewPatchPage.qml" line="63"/> <source>Load engine before applying patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="73"/> @@ -179,7 +195,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>Web catalog</source> <translation>Catalogue web</translation> </message> @@ -215,8 +231,12 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="484"/> + <source>May have conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Have possible conflicts</source> - <translation>A de possibles conflits</translation> + <translation type="vanished">A de possibles conflits</translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="487"/> @@ -240,7 +260,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="510"/> - <location filename="../src/qml/WebCatalogPage.qml" line="232"/> + <location filename="../src/qml/WebCatalogPage.qml" line="248"/> <source>No patches available</source> <translation>Pas de patch disponible</translation> </message> @@ -261,27 +281,47 @@ <translation>Captures d'écran</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Hide search field</source> <translation>Masquer la recherche</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Show search field</source> <translation>Afficher la recherche</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>%1 patches</source> <translation>%1 patchs</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="99"/> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by date updated)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by category)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="108"/> <source>Tap to enter search query</source> <translation>Appuyer pour lancer la recherche</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="219"/> + <location filename="../src/qml/WebCatalogPage.qml" line="235"/> <source>Update available: %1</source> <translation>Mises à jour disponibles : %1</translation> </message> @@ -346,70 +386,84 @@ <translation>Compatible: %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="218"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="224"/> <source>Patch installed</source> <translation>Patch installé</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="219"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="225"/> <source>Patch %1 installed</source> <translation>Patch %1 installé</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="222"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="228"/> <source>Patch removed</source> <translation>Patch supprimé</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="223"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="229"/> <source>Patch %1 removed</source> <translation>Patch %1 supprimé</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="226"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="232"/> <source>Failed to install patch</source> <translation>Échec lors de d'installation du patch</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="227"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="233"/> <source>Patch %1 installation failed</source> <translation>L'installation du patch %1 a échouée</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="230"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="236"/> <source>Failed to remove patch</source> <translation>Échec de suppression du patch</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="231"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="237"/> <source>Patch %1 removal failed</source> <translation>Échec de suppression du patch %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="234"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="240"/>

@@ -1,21 +1,23 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="hu" version="2.1"> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="hu"> <context> - <name/> + <name></name> <message> <location filename="../src/qml/AboutPage.qml" line="49"/> <location filename="../src/qml/PatchManagerPage.qml" line="142"/> <source>About</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/bin/dialog/dialog.qml" line="45"/> <source>Apply patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/bin/dialog/dialog.qml" line="53"/> <source>Patchmanager will automatically apply patches in 10 seconds.</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/bin/dialog/dialog.qml" line="66"/> @@ -25,22 +27,22 @@ <message> <location filename="../src/bin/dialog/dialog.qml" line="28"/> <source>Applying patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/bin/dialog/dialog.qml" line="136"/> <source>Appled successfully!</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/bin/dialog/dialog.qml" line="137"/> <source>Failed applying patches!</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/> <source>Patchmanager</source> <translation>Patchmanager</translation> </message> @@ -52,16 +54,30 @@ <message> <location filename="../src/qml/AboutPage.qml" line="81"/> <source>Patchmanager allows system modification via patches. It provides a system daemon that is in charge of performing those patches, as well as a GUI, to control those operations and installation/removal of patches.</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the <a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker <a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks <a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>Fejlesztők</translation> @@ -69,7 +85,7 @@ <message> <location filename="../src/qml/DevelopersPage.qml" line="146"/> <source>%1's webpage</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/DevelopersPage.qml" line="151"/> @@ -80,25 +96,25 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="52"/> <location filename="../src/qml/NewPatchPage.qml" line="52"/> <source>Patch being applied</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="54"/> <location filename="../src/qml/NewPatchPage.qml" line="54"/> <source>Unapply patch</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="55"/> <location filename="../src/qml/NewPatchPage.qml" line="55"/> <source>Apply patch</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="63"/> <location filename="../src/qml/NewPatchPage.qml" line="63"/> <source>Load engine before applying patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="73"/> @@ -110,7 +126,7 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="83"/> <location filename="../src/qml/NewPatchPage.qml" line="83"/> <source>This patch is no available anymore. You won't be able to reinstall it.</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="87"/> @@ -120,31 +136,31 @@ <message> <location filename="../src/qml/LegacyPatchPage.qml" line="114"/> <source>Maintainer</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="128"/> <location filename="../src/qml/NewPatchPage.qml" line="101"/> <source>Possible conflicts</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="141"/> <location filename="../src/qml/NewPatchPage.qml" line="141"/> <source>Description</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="153"/> <location filename="../src/qml/NewPatchPage.qml" line="154"/> <source>Patch log</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="162"/> <location filename="../src/qml/NewPatchPage.qml" line="164"/> <source>No log yet</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/NewPatchPage.qml" line="87"/> @@ -160,155 +176,175 @@ <message> <location filename="../src/qml/NewPatchPage.qml" line="128"/> <source>Compatible</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="147"/> <source>Unapply all patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="153"/> <source>Load engine</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> <source>Updates available</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation>

@@ -1,6 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl" version="2.1"> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="nl"> <context> - <name/> + <name></name> <message> <location filename="../src/qml/AboutPage.qml" line="49"/> <location filename="../src/qml/PatchManagerPage.qml" line="142"/> @@ -38,9 +40,9 @@ <translation>Kleven van pleisters mislukt!</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/> <source>Patchmanager</source> <translation>Patchmanager</translation> </message> @@ -55,13 +57,27 @@ <translation>Patchmanager biedt je de mogelijkheid je systeem aan te passen met pleisters. Het biedt een systeemdaemon verantwoordelijk voor het uitvoeren van de pleisters, evenals een grafische interface om de bewerkingen en installatie/verwijderen van de pleisters te beheren.</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the <a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker <a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks <a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation>Doneren</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>Ontwikkelaars</translation> @@ -98,7 +114,7 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="63"/> <location filename="../src/qml/NewPatchPage.qml" line="63"/> <source>Load engine before applying patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="73"/> @@ -179,7 +195,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>Web catalog</source> <translation>Webcatalogus</translation> </message> @@ -215,8 +231,12 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="484"/> + <source>May have conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Have possible conflicts</source> - <translation>Hebben mogelijke conflicten</translation> + <translation type="vanished">Hebben mogelijke conflicten</translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="487"/> @@ -240,7 +260,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="510"/> - <location filename="../src/qml/WebCatalogPage.qml" line="232"/> + <location filename="../src/qml/WebCatalogPage.qml" line="248"/> <source>No patches available</source> <translation>Geen pleisters beschikbaar</translation> </message> @@ -261,27 +281,47 @@ <translation>Schermafdrukken</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Hide search field</source> <translation>Zoekveld verbergen</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Show search field</source> <translation>Zoekveld tonen</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>%1 patches</source> <translation>%1 pleisters</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="99"/> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by date updated)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by category)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="108"/> <source>Tap to enter search query</source> <translation>Tik om een zoekopdracht in te voeren</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="219"/> + <location filename="../src/qml/WebCatalogPage.qml" line="235"/> <source>Update available: %1</source> <translation>Update beschikbaar: %1</translation> </message> @@ -346,70 +386,84 @@ <translation>Compatibel: %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="218"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="224"/> <source>Patch installed</source> <translation>Pleister geïnstalleerd</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="219"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="225"/> <source>Patch %1 installed</source> <translation>Pleister %1 geïnstalleerd</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="222"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="228"/> <source>Patch removed</source> <translation>Pleister verwijderd</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="223"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="229"/> <source>Patch %1 removed</source> <translation>Pleister %1 verwijderd</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="226"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="232"/> <source>Failed to install patch</source> <translation>Installeren van pleister mislukt</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="227"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="233"/> <source>Patch %1 installation failed</source> <translation>Installeren van pleister %1 mislukt</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="230"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="236"/> <source>Failed to remove patch</source> <translation>Verwijderen van pleister mislukt</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="231"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="237"/> <source>Patch %1 removal failed</source> <translation>Verwijderen van pleister %1 mislukt</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="234"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="240"/>

@@ -1,6 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl_BE" version="2.1"> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="nl_BE"> <context> - <name/> + <name></name> <message> <location filename="../src/qml/AboutPage.qml" line="49"/> <location filename="../src/qml/PatchManagerPage.qml" line="142"/> @@ -38,9 +40,9 @@ <translation>Plakken mislukt!</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/> <source>Patchmanager</source> <translation>Patchmanager</translation> </message> @@ -55,13 +57,27 @@ <translation>Patchmanager biedt u de mogelijkheid uw systeem aan te passen met plakkers. Het biedt ne systeemdaemon verantwoordelijk voor het uitvoeren van de plakkers, evenals ne grafischen interface voor de bewerkingen en installatie/verwijderen van de plakkers te beheren.</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the <a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker <a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks <a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation>Doneren</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>Ontwikkelaars</translation> @@ -98,7 +114,7 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="63"/> <location filename="../src/qml/NewPatchPage.qml" line="63"/> <source>Load engine before applying patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="73"/> @@ -179,7 +195,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>Web catalog</source> <translation>Webcataloog</translation> </message> @@ -215,8 +231,12 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="484"/> + <source>May have conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Have possible conflicts</source> - <translation>Hebben mogelijke conflicten</translation> + <translation type="vanished">Hebben mogelijke conflicten</translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="487"/> @@ -240,7 +260,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="510"/> - <location filename="../src/qml/WebCatalogPage.qml" line="232"/> + <location filename="../src/qml/WebCatalogPage.qml" line="248"/> <source>No patches available</source> <translation>Geen plakkers beschikbaar</translation> </message> @@ -261,27 +281,47 @@ <translation>Schermafdrukken</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Hide search field</source> <translation>Zoekveld verbergen</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Show search field</source> <translation>Zoekveld weergeven</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>%1 patches</source> <translation>%1 plakkers</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="99"/> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by date updated)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by category)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="108"/> <source>Tap to enter search query</source> <translation>Tikt voor een zoekopdracht in te voeren</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="219"/> + <location filename="../src/qml/WebCatalogPage.qml" line="235"/> <source>Update available: %1</source> <translation>Update beschikbaar: %1</translation> </message> @@ -346,70 +386,84 @@ <translation>Compatibel: %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="218"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="224"/> <source>Patch installed</source> <translation>Plakker geïnstalleerd</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="219"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="225"/> <source>Patch %1 installed</source> <translation>Plakker %1 geïnstalleerd</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="222"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="228"/> <source>Patch removed</source> <translation>Plakker verwijderd</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="223"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="229"/> <source>Patch %1 removed</source> <translation>Plakker %1 verwijderd</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="226"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="232"/> <source>Failed to install patch</source> <translation>Installeren van plakker mislukt</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="227"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="233"/> <source>Patch %1 installation failed</source> <translation>Installeren van plakker %1 mislukt</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="230"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="236"/> <source>Failed to remove patch</source> <translation>Verwijderen van plakker mislukt</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="231"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="237"/> <source>Patch %1 removal failed</source> <translation>Verwijderen van plakker %1 mislukt</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="234"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="240"/>

@@ -1,6 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl" version="2.1"> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="pl"> <context> - <name/> + <name></name> <message> <location filename="../src/qml/AboutPage.qml" line="49"/> <location filename="../src/qml/PatchManagerPage.qml" line="142"/> @@ -38,9 +40,9 @@ <translation>Błąd podczas włącznia łatek!</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/> <source>Patchmanager</source> <translation>Patchmanager</translation> </message> @@ -55,13 +57,27 @@ <translation>Patchmanager pozwala na modyfikacje systemu za pomocą łatek. Dostarcza on systemowego daemona, który wykonyje modyfikacje, jak i dostarcza GUI, aby móc zarządzać operacjami instalacji/usuwania łatek.</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the <a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker <a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks <a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation>Wspomóż</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>Deweloperzy</translation> @@ -98,7 +114,7 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="63"/> <location filename="../src/qml/NewPatchPage.qml" line="63"/> <source>Load engine before applying patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="73"/> @@ -179,7 +195,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>Web catalog</source> <translation>Katalog internetowy</translation> </message> @@ -215,8 +231,12 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="484"/> + <source>May have conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Have possible conflicts</source> - <translation>Ma potencjalne konflikty</translation> + <translation type="vanished">Ma potencjalne konflikty</translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="487"/> @@ -240,7 +260,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="510"/> - <location filename="../src/qml/WebCatalogPage.qml" line="232"/> + <location filename="../src/qml/WebCatalogPage.qml" line="248"/> <source>No patches available</source> <translation>Brak łatek</translation> </message> @@ -261,27 +281,47 @@ <translation>Zrzuty ekranu</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Hide search field</source> <translation>Ukryj pole wyszukiwania</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Show search field</source> <translation>Pokaż pole wyszukiwania</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>%1 patches</source> <translation>%1 łatki</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="99"/> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by date updated)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by category)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="108"/> <source>Tap to enter search query</source> <translation>Dotknij aby wprowadzić zapytanie</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="219"/> + <location filename="../src/qml/WebCatalogPage.qml" line="235"/> <source>Update available: %1</source> <translation>Aktualizacja dostępna: %1</translation> </message> @@ -346,70 +386,84 @@ <translation>Kompatybilny: %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="218"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="224"/> <source>Patch installed</source> <translation>Łatka zainstalowana</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="219"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="225"/> <source>Patch %1 installed</source> <translation>Łatka %1 zainstalowana</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="222"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="228"/> <source>Patch removed</source> <translation>Łatka usunięta</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="223"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="229"/> <source>Patch %1 removed</source> <translation>Łatka %1 usunięta</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="226"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="232"/> <source>Failed to install patch</source> <translation>Błąd instalacji łatki</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="227"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="233"/> <source>Patch %1 installation failed</source> <translation>Błąd instalacji łatki %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="230"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="236"/> <source>Failed to remove patch</source> <translation>Nieudane usunięcie łatki</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="231"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="237"/> <source>Patch %1 removal failed</source> <translation>Nieudane usunięcie łatki %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="234"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="240"/>

@@ -1,6 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_BR" version="2.1"> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="pt_BR"> <context> - <name/> + <name></name> <message> <location filename="../src/qml/AboutPage.qml" line="49"/> <location filename="../src/qml/PatchManagerPage.qml" line="142"/> @@ -38,9 +40,9 @@ <translation>Falha ao aplicar patches!</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/> <source>Patchmanager</source> <translation>Patchmanager</translation> </message> @@ -55,13 +57,27 @@ <translation>O Patchmanager permite a modificação do sistema via patches. Ele fornece um daemon de sistema encarregado de executar esses patches, bem como uma GUI, para controlar essas operações e instalação / remoção de patches.</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the <a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker <a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks <a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation>Doação</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>Desenvolvedores</translation> @@ -98,7 +114,7 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="63"/> <location filename="../src/qml/NewPatchPage.qml" line="63"/> <source>Load engine before applying patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="73"/> @@ -179,7 +195,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>Web catalog</source> <translation>Catálogo da web</translation> </message> @@ -215,8 +231,12 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="484"/> + <source>May have conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Have possible conflicts</source> - <translation>Tem possíveis conflitos</translation> + <translation type="vanished">Tem possíveis conflitos</translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="487"/> @@ -240,7 +260,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="510"/> - <location filename="../src/qml/WebCatalogPage.qml" line="232"/> + <location filename="../src/qml/WebCatalogPage.qml" line="248"/> <source>No patches available</source> <translation>Nenhum patch disponível</translation> </message> @@ -261,27 +281,47 @@ <translation>Screenshots</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Hide search field</source> <translation>Ocultar campo de pesquisa</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Show search field</source> <translation>Mostrar campo de pesquisa</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>%1 patches</source> <translation>%1 patches</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="99"/> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by date updated)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by category)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="108"/> <source>Tap to enter search query</source> <translation>Toque para inserir a consulta de pesquisa</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="219"/> + <location filename="../src/qml/WebCatalogPage.qml" line="235"/> <source>Update available: %1</source> <translation>Atualização disponível: %1</translation> </message> @@ -346,70 +386,84 @@ <translation>Compatível: %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="218"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="224"/> <source>Patch installed</source> <translation>Patch instalado</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="219"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="225"/> <source>Patch %1 installed</source> <translation>Patch %1 instalado</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="222"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="228"/> <source>Patch removed</source> <translation>Patch removido </translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="223"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="229"/> <source>Patch %1 removed</source> <translation>Patch %1 removido</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="226"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="232"/> <source>Failed to install patch</source> <translation>Falha ao instalar o patch</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="227"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="233"/> <source>Patch %1 installation failed</source> <translation>Falha na instalação do patch %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="230"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="236"/> <source>Failed to remove patch</source> <translation>Falha ao remover o patch</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="231"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="237"/> <source>Patch %1 removal failed</source> <translation>Falha na remoção do patch %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="234"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="240"/>

@@ -1,6 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="ru" version="2.1"> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="ru"> <context> - <name/> + <name></name> <message> <location filename="../src/qml/AboutPage.qml" line="49"/> <location filename="../src/qml/PatchManagerPage.qml" line="142"/> @@ -38,9 +40,9 @@ <translation>Ошибка применения патчей!</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/> <source>Patchmanager</source> <translation>Патчменеджер</translation> </message> @@ -55,13 +57,27 @@ <translation>Патчменеджер позволяет применять патчи к сисемным файлам. Предоставляет демон занимающийся подменой оригинальных файлов на измененные и страницу настроек для управления патчами в системе.</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the <a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker <a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks <a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation>Пожертвовать</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>Разработчики</translation> @@ -179,7 +195,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>Web catalog</source> <translation>Онлайн каталог</translation> </message> @@ -215,8 +231,12 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="484"/> + <source>May have conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Have possible conflicts</source> - <translation>Есть возможные конфликты</translation> + <translation type="vanished">Есть возможные конфликты</translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="487"/> @@ -240,7 +260,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="510"/> - <location filename="../src/qml/WebCatalogPage.qml" line="232"/> + <location filename="../src/qml/WebCatalogPage.qml" line="248"/> <source>No patches available</source> <translation>Патчи отсутствуют</translation> </message> @@ -261,27 +281,47 @@ <translation>Скриншоты</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Hide search field</source> <translation>Скрыть поле ввода</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Show search field</source> <translation>Показать поле ввода</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>%1 patches</source> <translation>Патчи %1</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="99"/> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by date updated)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by category)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="108"/> <source>Tap to enter search query</source> <translation>Коснитесь для поиска</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="219"/> + <location filename="../src/qml/WebCatalogPage.qml" line="235"/> <source>Update available: %1</source> <translation>Доступно обновление: %1</translation> </message> @@ -346,70 +386,84 @@ <translation>Совместимость: %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="218"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="224"/> <source>Patch installed</source> <translation>Патч установлен</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="219"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="225"/> <source>Patch %1 installed</source> <translation>Патч %1 установлен</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="222"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="228"/> <source>Patch removed</source> <translation>Патч удален</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="223"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="229"/> <source>Patch %1 removed</source> <translation>Патч %1 удален</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="226"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="232"/> <source>Failed to install patch</source> <translation>Ошибка при применении патча</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="227"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="233"/> <source>Patch %1 installation failed</source> <translation>Ошибка при применении %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="230"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="236"/> <source>Failed to remove patch</source> <translation>Ошибка при удалении патча</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="231"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="237"/> <source>Patch %1 removal failed</source> <translation>Ошибка при удалении %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="234"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="240"/> <source>Update available</source> <translation>Обновление доступно</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="235"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="241"/> <source>Patch %1 have update candidate</source> <translation>Есть обновления для %1</translation> </message>

@@ -1,6 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="sl" version="2.1"> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="sl"> <context> - <name/> + <name></name> <message> <location filename="../src/qml/AboutPage.qml" line="49"/> <location filename="../src/qml/PatchManagerPage.qml" line="142"/> @@ -38,9 +40,9 @@ <translation>Nespešno uveljavljanje popravkov!</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/> <source>Patchmanager</source> <translation>Patchmanager</translation> </message> @@ -57,13 +59,27 @@ Patchmanager omogoča spreminjanje sistema s popravki. Program je zagnan v ozadju in nadzoruje nameščanje, upravljanje in odstranjevanje popravkov s pomočjo grafičnega vmesnika. </translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the <a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker <a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks <a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation>Prispevaj</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>Razvojniki</translation> @@ -100,7 +116,7 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="63"/> <location filename="../src/qml/NewPatchPage.qml" line="63"/> <source>Load engine before applying patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="73"/> @@ -181,7 +197,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>Web catalog</source> <translation>Spletni katalog</translation> </message> @@ -217,8 +233,12 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="484"/> + <source>May have conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Have possible conflicts</source> - <translation>Možni spori</translation> + <translation type="vanished">Možni spori</translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="487"/> @@ -242,7 +262,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="510"/> - <location filename="../src/qml/WebCatalogPage.qml" line="232"/> + <location filename="../src/qml/WebCatalogPage.qml" line="248"/> <source>No patches available</source> <translation>Ni popravkov</translation> </message> @@ -263,27 +283,47 @@ <translation>Posnetki zaslona</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Hide search field</source> <translation>Skrij polje za iskanje</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Show search field</source> <translation>Prikaži polje za iskanje</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>%1 patches</source> <translation>%1 popravkov</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="99"/> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by date updated)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by category)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="108"/> <source>Tap to enter search query</source> <translation>Pritisnite za vnos iskalnega niza</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="219"/> + <location filename="../src/qml/WebCatalogPage.qml" line="235"/> <source>Update available: %1</source> <translation>Na voljo je posodobitev: %1</translation> </message> @@ -348,70 +388,84 @@ <translation>Združljivost: %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="218"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="224"/> <source>Patch installed</source> <translation>Popravek je nameščen</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="219"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="225"/> <source>Patch %1 installed</source> <translation>%1 je nameščen</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="222"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="228"/> <source>Patch removed</source> <translation>Popravek je odstranjen</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="223"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="229"/> <source>Patch %1 removed</source> <translation>%1 je odstranjen</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="226"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="232"/> <source>Failed to install patch</source> <translation>Nespešno nameščanje popravka</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="227"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="233"/> <source>Patch %1 installation failed</source> <translation>Namestitev %1 ni uspela</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="230"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="236"/> <source>Failed to remove patch</source> <translation>Nespešno odstranjevanje popravka</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="231"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="237"/> <source>Patch %1 removal failed</source> <translation>Odstranjevanje %1 ni uspelo.</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="234"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="240"/>

@@ -1,6 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="sl_SI" version="2.1"> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="sl_SI"> <context> - <name/> + <name></name> <message> <location filename="../src/qml/AboutPage.qml" line="49"/> <location filename="../src/qml/PatchManagerPage.qml" line="142"/> @@ -38,9 +40,9 @@ <translation>Nespešno uveljavljanje popravkov!</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/> <source>Patchmanager</source> <translation>Patchmanager</translation> </message> @@ -57,13 +59,27 @@ Patchmanager omogoča spreminjanje sistema s popravki. Program je zagnan v ozadju in nadzoruje nameščanje, upravljanje in odstranjevanje popravkov s pomočjo grafičnega vmesnika. </translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the <a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker <a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks <a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation>Prispevaj</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>Razvojniki</translation> @@ -100,7 +116,7 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="63"/> <location filename="../src/qml/NewPatchPage.qml" line="63"/> <source>Load engine before applying patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="73"/> @@ -181,7 +197,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>Web catalog</source> <translation>Spletni katalog</translation> </message> @@ -217,8 +233,12 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="484"/> + <source>May have conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Have possible conflicts</source> - <translation>Možni spori</translation> + <translation type="vanished">Možni spori</translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="487"/> @@ -242,7 +262,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="510"/> - <location filename="../src/qml/WebCatalogPage.qml" line="232"/> + <location filename="../src/qml/WebCatalogPage.qml" line="248"/> <source>No patches available</source> <translation>Ni popravkov</translation> </message> @@ -263,27 +283,47 @@ <translation>Posnetki zaslona</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Hide search field</source> <translation>Skrij polje za iskanje</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Show search field</source> <translation>Prikaži polje za iskanje</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>%1 patches</source> <translation>%1 popravkov</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="99"/> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by date updated)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by category)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="108"/> <source>Tap to enter search query</source> <translation>Pritisnite za vnos iskalnega niza</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="219"/> + <location filename="../src/qml/WebCatalogPage.qml" line="235"/> <source>Update available: %1</source> <translation>Na voljo je posodobitev: %1</translation> </message> @@ -348,70 +388,84 @@ <translation>Združljivost: %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="218"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="224"/> <source>Patch installed</source> <translation>Popravek je nameščen</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="219"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="225"/> <source>Patch %1 installed</source> <translation>%1 je nameščen</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="222"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="228"/> <source>Patch removed</source> <translation>Popravek je odstranjen</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="223"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="229"/> <source>Patch %1 removed</source> <translation>%1 je odstranjen</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="226"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="232"/> <source>Failed to install patch</source> <translation>Nespešno nameščanje popravka</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="227"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="233"/> <source>Patch %1 installation failed</source> <translation>Namestitev %1 ni uspela</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="230"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="236"/> <source>Failed to remove patch</source> <translation>Nespešno odstranjevanje popravka</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="231"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="237"/> <source>Patch %1 removal failed</source> <translation>Odstranjevanje %1 ni uspelo.</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="234"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="240"/>

@@ -38,9 +38,9 @@ <translation>Kunde inte tillämpa korrigeringar!</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/> <source>Patchmanager</source> <translation>Patchmanager</translation> </message> @@ -55,13 +55,27 @@ <translation>Patchmanager möjliggör systemändringar via korrigeringsfiler. Den tillhandahåller en systemtjänst som ansvarar för att utföra dessa korrigeringar, samt ett grafiskt gränssnitt för att kontrollera dessa åtgärder och installation/avinstallation av korrigeringsfiler.</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the <a href="%1"> BSD 3-Clause License</a></source> + <translation>Licensierad under villkoren för <a href="%1"> BSD 3-Clause License</a></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker <a href="%1">on GitHub</a></source> + <translation>Källor och ärendehanterare <a href="%1">på GitHub</a></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks <a href="%1">Developers</a></source> + <translation>Erkännanden och tack <a href="%1">Utvecklare</a></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation>Donera</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>Utvecklare</translation> @@ -98,7 +112,7 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="63"/> <location filename="../src/qml/NewPatchPage.qml" line="63"/> <source>Load engine before applying patches</source> - <translation type="unfinished"/> + <translation>Starta motorn före tillämpning av korrigeringar</translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="73"/> @@ -179,7 +193,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>Web catalog</source> <translation>Webbkatalog</translation> </message> @@ -215,8 +229,8 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="484"/> - <source>Have possible conflicts</source> - <translation>Har möjliga konflikter</translation> + <source>May have conflicts</source> + <translation>Möjliga konflikter</translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="487"/> @@ -240,7 +254,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="510"/> - <location filename="../src/qml/WebCatalogPage.qml" line="232"/> + <location filename="../src/qml/WebCatalogPage.qml" line="248"/> <source>No patches available</source> <translation>Inga korrigeringsfiler tillgängliga</translation> </message> @@ -261,27 +275,47 @@ <translation>Skärmklipp</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Hide search field</source> <translation>Dölj sökfältet</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Show search field</source> <translation>Visa sökfältet</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Category</source> + <translation>Sortera efter kategori</translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Date</source> + <translation>Sortera efter datum</translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>%1 patches</source> <translation>%1 korrigeringar</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="99"/> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by date updated)</source> + <translation>(uppdaterat efter datum)</translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by category)</source> + <translation>(efter kategori)</translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="108"/> <source>Tap to enter search query</source> <translation>Tryck för att ange söksträng</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="219"/> + <location filename="../src/qml/WebCatalogPage.qml" line="235"/> <source>Update available: %1</source> <translation>Uppdatering tillgänglig: %1</translation> </message> @@ -346,70 +380,80 @@ <translation>Kompatibel: %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="218"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="224"/> <source>Patch installed</source> <translation>Korrigering installerad</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="219"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="225"/> <source>Patch %1 installed</source> <translation>Korrigering %1 installerad</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="222"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="228"/> <source>Patch removed</source> <translation>Korrigering borttagen</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="223"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="229"/> <source>Patch %1 removed</source> <translation>Korrigering %1 borttagen</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="226"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="232"/> <source>Failed to install patch</source> <translation>Kunde inte installera korrigering</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="227"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="233"/> <source>Patch %1 installation failed</source> <translation>Korrigeringsfil %1 kunde inte installeras</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="230"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="236"/> <source>Failed to remove patch</source> <translation>Kunde inte ta bort korrigering</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="231"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="237"/> <source>Patch %1 removal failed</source> <translation>Korrigering %1 kunde inte tas bort</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="234"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="240"/> <source>Update available</source> <translation>Uppdatering tillgänglig</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="235"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="241"/> <source>Patch %1 have update candidate</source> <translation>Korrigeringsfil %1 har en uppdateringskandidat</translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="137"/> - <location filename="../src/qml/SettingsPage.qml" line="14"/> + <location filename="../src/qml/SettingsPage.qml" line="16"/> <source>Settings</source>

@@ -1,6 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_CN" version="2.1"> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="zh_CN"> <context> - <name/> + <name></name> <message> <location filename="../src/qml/AboutPage.qml" line="49"/> <location filename="../src/qml/PatchManagerPage.qml" line="142"/> @@ -38,9 +40,9 @@ <translation>应用补丁失败!</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/> <source>Patchmanager</source> <translation>补丁管理</translation> </message> @@ -55,13 +57,27 @@ <translation>补丁管理允许你通过补丁修改系统。它提供了负责执行补丁的系统守护程序和GUI以控制操作、安装或卸载补丁。</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the <a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker <a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks <a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation>捐赠</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>开发者</translation> @@ -98,7 +114,7 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="63"/> <location filename="../src/qml/NewPatchPage.qml" line="63"/> <source>Load engine before applying patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="73"/> @@ -179,7 +195,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>Web catalog</source> <translation>网络目录</translation> </message> @@ -215,8 +231,12 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="484"/> + <source>May have conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Have possible conflicts</source> - <translation>有可能与之冲突的补丁</translation> + <translation type="vanished">有可能与之冲突的补丁</translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="487"/> @@ -240,7 +260,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="510"/> - <location filename="../src/qml/WebCatalogPage.qml" line="232"/> + <location filename="../src/qml/WebCatalogPage.qml" line="248"/> <source>No patches available</source> <translation>无可用补丁</translation> </message> @@ -261,27 +281,47 @@ <translation>截图</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Hide search field</source> <translation>隐藏搜索字段</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Show search field</source> <translation>显示搜索字段</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>%1 patches</source> <translation>%1 补丁</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="99"/> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by date updated)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by category)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="108"/> <source>Tap to enter search query</source> <translation>点击以进入搜索查询</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="219"/> + <location filename="../src/qml/WebCatalogPage.qml" line="235"/> <source>Update available: %1</source> <translation>可供安装更新: %1</translation> </message> @@ -346,70 +386,84 @@ <translation>兼容: %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="218"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="224"/> <source>Patch installed</source> <translation>补丁已安装</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="219"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="225"/> <source>Patch %1 installed</source> <translation>已安装 %1 补丁</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="222"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="228"/> <source>Patch removed</source> <translation>已移除补丁</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="223"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="229"/> <source>Patch %1 removed</source> <translation>已移除 %1 补丁</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="226"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="232"/> <source>Failed to install patch</source> <translation>移除补丁失败</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="227"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="233"/> <source>Patch %1 installation failed</source> <translation>补丁 %1 安装失败</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="230"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="236"/> <source>Failed to remove patch</source> <translation>移除补丁失败</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="231"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="237"/> <source>Patch %1 removal failed</source> <translation>补丁 %1 移除失败</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="234"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="240"/>

@@ -16,33 +16,33 @@ </message> <message> <location filename="../src/bin/dialog/dialog.qml" line="53"/> - <source>Patchmanager will automatically apply patches in 10 seconds.</source> + <source>Patchmanager will automatically apply all patches in 10 seconds.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/bin/dialog/dialog.qml" line="66"/> - <source>Exit</source> + <location filename="../src/bin/dialog/dialog.qml" line="136"/> + <source>Applied patches successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/bin/dialog/dialog.qml" line="28"/> - <source>Applying patches</source> + <location filename="../src/bin/dialog/dialog.qml" line="137"/> + <source>Failed to apply patches!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/bin/dialog/dialog.qml" line="136"/> - <source>Appled successfully!</source> + <location filename="../src/bin/dialog/dialog.qml" line="66"/> + <source>Exit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/bin/dialog/dialog.qml" line="137"/> - <source>Failed applying patches!</source> + <location filename="../src/bin/dialog/dialog.qml" line="28"/> + <source>Applying patches</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="222"/> <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/> <source>Patchmanager</source> <translation type="unfinished"></translation> </message> @@ -57,114 +57,143 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the <a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker <a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks <a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> - <location filename="../src/qml/DevelopersPage.qml" line="107"/> + <location filename="../src/qml/DevelopersPage.qml" line="157"/> <source>Developers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/DevelopersPage.qml" line="146"/> + <location filename="../src/qml/DevelopersPage.qml" line="196"/> <source>%1's webpage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/DevelopersPage.qml" line="151"/> - <source>%1's Twitter account</source> + <location filename="../src/qml/DevelopersPage.qml" line="201"/> + <source>%1's %2 account</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/LegacyPatchPage.qml" line="52"/> - <location filename="../src/qml/NewPatchPage.qml" line="52"/> + <location filename="../src/qml/UnifiedPatchPage.qml" line="65"/> <source>Patch being applied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/LegacyPatchPage.qml" line="54"/> - <location filename="../src/qml/NewPatchPage.qml" line="54"/> + <location filename="../src/qml/UnifiedPatchPage.qml" line="67"/> <source>Unapply patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/LegacyPatchPage.qml" line="55"/> - <location filename="../src/qml/NewPatchPage.qml" line="55"/> + <location filename="../src/qml/UnifiedPatchPage.qml" line="68"/> <source>Apply patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/LegacyPatchPage.qml" line="63"/> - <location filename="../src/qml/NewPatchPage.qml" line="63"/> + <location filename="../src/qml/UnifiedPatchPage.qml" line="85"/> <source>Load engine before applying patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/LegacyPatchPage.qml" line="73"/> <location filename="../src/qml/WebPatchPage.qml" line="85"/> <source>Patch information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/LegacyPatchPage.qml" line="83"/> - <location filename="../src/qml/NewPatchPage.qml" line="83"/> - <source>This patch is no available anymore. You won't be able to reinstall it.</source> + <location filename="../src/qml/UnifiedPatchPage.qml" line="116"/> + <source>Maintainer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/LegacyPatchPage.qml" line="87"/> - <source>Name</source> + <location filename="../src/qml/UnifiedPatchPage.qml" line="171"/> + <source>Description</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/LegacyPatchPage.qml" line="114"/> - <source>Maintainer</source> + <location filename="../src/qml/UnifiedPatchPage.qml" line="185"/> + <source>Patch log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/LegacyPatchPage.qml" line="128"/> - <location filename="../src/qml/NewPatchPage.qml" line="101"/> - <source>Possible conflicts</source> + <location filename="../src/qml/UnifiedPatchPage.qml" line="194"/> + <source>Press and hold to copy to Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/LegacyPatchPage.qml" line="141"/> - <location filename="../src/qml/NewPatchPage.qml" line="141"/> - <source>Description</source> + <location filename="../src/qml/UnifiedPatchPage.qml" line="207"/> + <source>No log yet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/LegacyPatchPage.qml" line="153"/> - <location filename="../src/qml/NewPatchPage.qml" line="154"/> - <source>Patch log</source> + <location filename="../src/qml/UnifiedPatchPage.qml" line="116"/> + <source>Author</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/LegacyPatchPage.qml" line="162"/> - <location filename="../src/qml/NewPatchPage.qml" line="164"/> - <source>No log yet</source> + <location filename="../src/qml/UnifiedPatchPage.qml" line="48"/> + <source>Log copied to Clipboard!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/NewPatchPage.qml" line="87"/> - <source>Author</source> + <location filename="../src/qml/UnifiedPatchPage.qml" line="75"/> + <source>Uninstall patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/UnifiedPatchPage.qml" line="78"/> + <source>Patch %1 uninstalled.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/UnifiedPatchPage.qml" line="107"/> + <source>This patch is not available anymore. You won't be able to reinstall it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/LegacyPatchPage.qml" line="100"/> - <location filename="../src/qml/NewPatchPage.qml" line="115"/> + <location filename="../src/qml/UnifiedPatchPage.qml" line="120"/> <source>Version</source> <translation type="unfinished"></translation>

[-] [+]	Changed	_service:tar_git:patchmanager.changes
@@ -1,3 +1,11 @@ +* Thu Oct 07 2021 Vlad G <b100dian@gmail.com> - 3.1.0 +- [check-package.sh] Add proper quoting (#72) +- [fixup] change whitespace/formatting +- [pm_apply / pm_unapply] Add missing quoting (#63) +- [translations] fix translation file search path in .pro file +- [ui] add menu option to sort web catalog +- [ui] show warning label for conflicting patches (#70) + * Fri Sep 24 2021 olf <Olf0@users.noreply.github.com> - 3.1.0-pre - [firejail] add and install our own whitelist (#58) - [rpmlint] remove executable bits from sources (#51)
[-] [+]	Changed	_service:tar_git:patchmanager.spec ^
@@ -9,9 +9,9 @@ Summary: Patchmanager allows for managing Sailfish OS patches Version: 3.1.0 -Release: pre2 +Release: 1 Group: Qt/Qt -License: TODO +License: BSD-3-Clause URL: https://github.com/sailfishos-patches/patchmanager Source0: %{name}-%{version}.tar.bz2 Requires: unzip
[-] [+]	Changed	_service ^
@@ -2,9 +2,10 @@ <service name="tar_git"> <param name="url">https://github.com/sailfishos-patches/patchmanager.git</param> <param name="branch">master</param> - <param name="revision">3.1.0-pre2</param> + <param name="revision">3.1.0</param> <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param> </service> + </services>
[-] [+]	Added	_service:tar_git:patchmanager-3.1.0.tar.bz2/LICENSE ^
@@ -0,0 +1,34 @@ +BSD 3-Clause License + +Copyright (c) 2013, Lucien XU <sfietkonstantin@free.fr> +Copyright (c) 2016, Andrey Kozhevnikov <coderusinbox@gmail.com> +Copyright (c) 2021, Patchmanger for SailfishOS contributors: + - olf "Olf0" <https://github.com/Olf0> + - Peter G. "nephros" <sailfish@nephros.org> + - Vlad G. "b100dian" <https://github.com/b100dian> +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3. Neither the name of the copyright holders nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/README.md ^
@@ -88,17 +88,17 @@ ## Web catalog for patches -Patchmanager supports installing patches from its web catalog. -Patch developers can upload patches to https://coderus.openrepos.net/pm2 to make them visible inside Patchmanager Web Catalog list. -When uploading a patch to web catalog, the patch developer should not provide a patch.json file with metadata, but should fill the necessary fields on the webpage before uploading, instead. +Patchmanager supports installing patches from its Web Catalog. +Patch developers can upload patches to https://coderus.openrepos.net/pm2 to enlist them on Patchmanager's Web Catalog. +When uploading a patch to the Web Catalog, the patch developer should not provide a patch.json file with metadata, but shall fill the necessary fields on the webpage before uploading, instead. ## Patches distribution at OpenRepos.net Patches can be too complex for Patchmanager's Web Catalog. In this case the developer can package the patch as an RPM and upload it at https://openrepos.net -For RPM patches, the patch content shall be installed in a directory `/usr/share/patchmanager/patches/<patch-name>/`; additional files (see above) for this patch shall also be placed there. +For RPM patches, the patch content shall be installed in a directory `/usr/share/patchmanager/patches/<patch-name>/`; [additional files (see above)](#additional-files) for this patch shall also be placed there. -Additionaly, when a patch developer decides to package a patch as an RPM, the compatibility of patch (to SailfishoS versions, instrastructure it uses etc.) shall be properly defined by RPM spec file dependencies ("Requires:", "Conflits:" etc.). +Additionaly, when a patch developer decides to package a patch as an RPM, the compatibility of a patch (to Sailfish OS release versions, infrastructure it uses etc.) shall be properly defined by RPM spec file dependencies ("Requires:", "Conflicts:" etc.). -Sample RPM patch project: https://github.com/CODeRUS/sailfishos-disable-glass-avatar +Example RPM patch project: https://github.com/CODeRUS/sailfishos-disable-glass-avatar
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/patchmanager.pro ^
@@ -3,7 +3,7 @@ OTHER_FILES += rpm/patchmanager.spec -TRANSLATIONS += translations/settings-$${TARGET}-.ts +TRANSLATIONS += $$files(translations/settings-$${TARGET}-.ts) TS_FILE = $${_PRO_FILE_PWD_}/translations/settings-$${TARGET}.ts HAVE_TRANSLATIONS = 0
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/src/bin/dialog/dialog.qml ^
@@ -18,7 +18,7 @@ ' </interface>\n' function show() { - console.warn("Show called!") + console.warn("Function show is called!") } } initialPage: Component { @@ -26,7 +26,7 @@ onStatusChanged: { if (status == PageStatus.Active && !appWindow.remorseItem) { remorse.execute(button, qsTranslate("", "Applying patches"), function() { - console.log("Accepted patch applying!") + console.log("Accepted applying patches.") dbusPm.call("loadRequest", [true]) }, 10000) appWindow.remorseItem = remorse @@ -50,7 +50,7 @@ anchors.right: parent.right anchors.margins: Theme.horizontalPageMargin wrapMode: Text.WrapAtWordBoundaryOrAnywhere - text: qsTranslate("", "Patchmanager will automatically apply patches in 10 seconds.") + text: qsTranslate("", "Patchmanager will automatically apply all patches in 10 seconds.") } Item { @@ -70,7 +70,7 @@ RemorseItem { id: remorse onCanceled: { - console.log("Cancelled patches applying!") + console.log("Cancelled applying patches.") dbusPm.call("loadRequest", [false]) Qt.quit() } @@ -133,8 +133,8 @@ function autoApplyingFinished(success) { console.log(success) button.enabled = true - progress.label = success ? qsTranslate("", "Appled successfully!") - : qsTranslate("", "Failed applying patches!") + progress.label = success ? qsTranslate("", "Applied patches successfully.") + : qsTranslate("", "Failed to apply patches!") } } }
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/src/bin/patchmanager-daemon/check-package.sh ^
@@ -1,12 +1,12 @@ #!/bin/sh -if [ -e $1 ]; then - echo "Must provide package name" +if [ -e "$1" ]; then + echo "Error: A package name must be provided!" exit -1 fi -rpm -q $1 > /dev/null 2>&1 -if [ ${?} -ne 0 ]; then - echo "Invalid package name" +rpm -q "$1" > /dev/null 2>&1 +if [ $? != 0 ]; then + echo "Error: Invalid package name!" exit -1 fi @@ -55,31 +55,31 @@ rm -f $BACKUP_FAILED_TMP_FILE rm -f $ORIGINAL_FAILED_FILE rm -f $BACKUP_FAILED_FILE -rm -f $LOG_ORIGINAL_FILE -rm -f $LOG_BACKUP_FILE +rm -f "$LOG_ORIGINAL_FILE" +rm -f "$LOG_BACKUP_FILE" mkdir -p /var/lib/patchmanager cd / # Verify original files in package -rpm -q --queryformat '[%{FILEMD5S} %{FILENAMES}\n]' $1 \| grep \\.qml > $TMP_FILE +rpm -q --queryformat '[%{FILEMD5S} %{FILENAMES}\n]' "$1" \| grep \\.qml > $TMP_FILE sha256sum -c $TMP_FILE 2> /dev/null \| grep -v OK > $ORIGINAL_FAILED_TMP_FILE while read i; do - file=`echo ${i} \|awk -F: '{print $1}'` - echo $file >> $ORIGINAL_FAILED_FILE + file="$(echo "$i" \| awk -F: '{print $1}')" + echo "$file" >> $ORIGINAL_FAILED_FILE done < $ORIGINAL_FAILED_TMP_FILE # Verify backup files in package -rpm -q --queryformat "[%{FILEMD5S} $BACKUP_PREFIX%{FILENAMES}\n]" $1 \| grep \\.qml > $TMP_FILE +rpm -q --queryformat "[%{FILEMD5S} $BACKUP_PREFIX%{FILENAMES}\n]" "$1" \| grep \\.qml > $TMP_FILE sha256sum -c $TMP_FILE 2> /dev/null \| grep -v OK > $BACKUP_FAILED_TMP_FILE while read i; do - file=`echo ${i} \|awk -F: '{print $1}'` - echo $file >> $BACKUP_FAILED_FILE + file="$(echo "$i" \| awk -F: '{print $1}')" + echo "$file" >> $BACKUP_FAILED_FILE done < $BACKUP_FAILED_TMP_FILE # If the backup is up-to-date, it's ok if [ ! -f $BACKUP_FAILED_FILE ]; then - echo "Backup available" + echo "Backup available." do_check_success fi @@ -87,28 +87,28 @@ # ok, we create the backup files if [ ! -f $ORIGINAL_FAILED_FILE ]; then - rpm -ql $1 \| grep \\.qml > $TMP_FILE + rpm -ql "$1" \| grep \\.qml > $TMP_FILE while read i; do backup_file="$BACKUP_PREFIX/$i" - rm -f $backup_file - backup_dir=$(dirname $backup_file) - mkdir -p $backup_dir - cp $i $backup_file + rm -f "$backup_file" + backup_dir="$(dirname "$backup_file")" + mkdir -p "$backup_dir" + cp "$i" "$backup_file" done < $TMP_FILE - echo "Backup done" + echo "Backup done." do_check_success fi while read i; do - file=`echo ${i} \|awk -F: '{print $1}'` - echo $file >> $LOG_ORIGINAL_FILE + file="$(echo "$i" \| awk -F: '{print $1}')" + echo "$file" >> $LOG_ORIGINAL_FILE done < $ORIGINAL_FAILED_TMP_FILE while read i; do - file=`echo ${i} \|awk -F: '{print $1}'` - echo $file >> $LOG_BACKUP_FILE + file="$(echo "$i" \| awk -F: '{print $1}')" + echo "$file" >> $LOG_BACKUP_FILE done < $BACKUP_FAILED_TMP_FILE -echo "Warning ! Both backup and installed files are corrupted !" -do_check_failure \ No newline at end of file +echo "Warning: Both backup and installed files are corrupted!" +do_check_failure
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/src/bin/patchmanager-daemon/dbus/org.SfietKonstantin.patchmanager.xml ^
@@ -62,7 +62,7 @@ <method name="checkEaster"> <arg name="easter" type="s" direction="out" /> </method> - <method name="getSsuVersion"> + <method name="getOsVersion"> <arg name="version" type="s" direction="out" /> </method> <method name="getPatchmanagerVersion">
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/src/bin/patchmanager-daemon/patchmanagerobject.cpp ^
@@ -82,7 +82,9 @@ } static const QString PATCHES_DIR = QStringLiteral("/usr/share/patchmanager/patches"); -static const QString PATCHES_ADDITIONAL_DIR = QStringLiteral("/tmp/patchmanager3/patches"); +static const QString PATCHES_WORK_DIR_PREFIX = QStringLiteral("/tmp/patchmanager3"); +static const QString PATCHES_WORK_DIR = QStringLiteral("%1/%2").arg(PATCHES_WORK_DIR_PREFIX, "work"); +static const QString PATCHES_ADDITIONAL_DIR = QStringLiteral("%1/%2").arg(PATCHES_WORK_DIR_PREFIX, "patches"); static const QString PATCH_FILE = QStringLiteral("patch.json"); static const QString NAME_KEY = QStringLiteral("name"); @@ -105,6 +107,13 @@ static const QString PM_APPLY = QStringLiteral("/usr/libexec/pm_apply"); static const QString PM_UNAPPLY = QStringLiteral("/usr/libexec/pm_unapply"); +// external binaries +static const QString BIN_UNZIP = QStringLiteral("/usr/bin/unzip"); +static const QString BIN_TAR = QStringLiteral("/bin/tar"); +static const QString BIN_PKCON = QStringLiteral("/usr/bin/pkcon"); +static const QString BIN_SYSTEMCTL_U = QStringLiteral("/bin/systemctl-user"); +static const QString BIN_RPM = QStringLiteral("/bin/rpm"); + static const QString BROWSER_CODE = QStringLiteral("browser"); static const QString CAMERA_CODE = QStringLiteral("camera"); static const QString CALENDAR_CODE = QStringLiteral("calendar"); @@ -197,7 +206,7 @@ json[COMPATIBLE_KEY] = QStringList(); json[ISCOMPATIBLE_KEY] = true; } else { - json[ISCOMPATIBLE_KEY] = json[COMPATIBLE_KEY].toStringList().contains(m_ssuRelease); + json[ISCOMPATIBLE_KEY] = json[COMPATIBLE_KEY].toStringList().contains(m_osRelease); } json[CONFLICTS_KEY] = QStringList(); patch = json; @@ -283,23 +292,9 @@ void PatchManagerObject::getVersion() { qDebug() << Q_FUNC_INFO; - QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("org.nemo.ssu"), - QStringLiteral("/org/nemo/ssu"), - QStringLiteral("org.nemo.ssu"), - QStringLiteral("release")); - msg.setArguments({ QVariant::fromValue(false) }); - QDBusPendingCallWatcher watcher = new QDBusPendingCallWatcher(QDBusConnection::systemBus().asyncCall(msg), this); - connect(watcher, &QDBusPendingCallWatcher::finished, [this](QDBusPendingCallWatcher watcher) { - watcher->deleteLater(); - if (!watcher->isError()) { - m_ssuRelease = QDBusPendingReply<QString>(watcher); - qDebug() << "Received ssu version:" << m_ssuRelease; - lateInitialize(); - } else { - qWarning() << "Ssu version request error!" << watcher->error(); - QCoreApplication::exit(2); - } - }); + m_osRelease = QSettings("/etc/os-release", QSettings::IniFormat).value("VERSION_ID").toString(); + qDebug() << "Received OS version:" << m_osRelease; + lateInitialize(); } void PatchManagerObject::lateInitialize() @@ -795,7 +790,7 @@ if (!m_sbus.send(m)) { qWarning() << Q_FUNC_INFO << "Error sending message"; qWarning() << Q_FUNC_INFO << "Invoking systemctl:" << - QProcess::execute(QStringLiteral("/bin/systemctl-user"), { QStringLiteral("--no-block"), QStringLiteral("restart"), serviceName }); + QProcess::execute(BIN_SYSTEMCTL_U, { QStringLiteral("--no-block"), QStringLiteral("restart"), serviceName }); } } @@ -842,7 +837,7 @@ qDebug() << Q_FUNC_INFO << "Processing file:" << file; QProcess rpmProc; - rpmProc.start(QStringLiteral("/bin/rpm"), { QStringLiteral("-qf"), QStringLiteral("--qf"), QStringLiteral("%{NAME}"), file }); + rpmProc.start(BIN_RPM, { QStringLiteral("-qf"), QStringLiteral("--qf"), QStringLiteral("%{NAME}"), file }); if (!rpmProc.waitForFinished(5000) \|\| rpmProc.exitCode() != 0) { continue; } @@ -863,14 +858,14 @@ qDebug() << Q_FUNC_INFO << "Refreshing repositories..."; QProcess refreshProc; - refreshProc.start(QStringLiteral("/usr/bin/pkcon"), { QStringLiteral("refresh") }); + refreshProc.start(BIN_PKCON, { QStringLiteral("refresh") }); refreshProc.waitForFinished(-1); for (const QString &package : packages) { qDebug() << Q_FUNC_INFO << "Reinstalling:" << package; QProcess pkconProc; - pkconProc.start(QStringLiteral("/usr/bin/pkcon"), { QStringLiteral("install"), QStringLiteral("-y"), package }); + pkconProc.start(BIN_PKCON, { QStringLiteral("install"), QStringLiteral("-y"), package }); pkconProc.waitForFinished(-1); if (pkconProc.exitCode() == 0) { @@ -1352,9 +1347,9 @@ return QCoreApplication::applicationVersion(); } -QString PatchManagerObject::getSsuVersion() const +QString PatchManagerObject::getOsVersion() const { - return m_ssuRelease; + return m_osRelease; } //void PatchManagerObject::checkPatches() @@ -1602,7 +1597,9 @@ path = toPatch.mid(toPatch.indexOf('/', 1)); } } - filesConflicts[path].append(patchFolder); + if (!filesConflicts[path].contains(patchFolder)) { + filesConflicts[path].append(patchFolder); + } QStringList patchFiles = m_patchFiles[patchFolder]; if (!patchFiles.contains(path)) { @@ -1897,10 +1894,15 @@ const QString &url = params.value(QStringLiteral("url")).toString(); const QString &patch = params.value(QStringLiteral("patch")).toString(); const QString &json = params.value(QStringLiteral("json")).toString(); - const QString &archive = QStringLiteral("/tmp/%1").arg(url.section(QChar('/'), -1)); + const QString &archive = QStringLiteral("%1/%2").arg(PATCHES_WORK_DIR, url.section(QChar('/'), -1)); const QString &version = params.value(QStringLiteral("version")).toString(); qDebug() << Q_FUNC_INFO << "Saving archive to" << archive; + QDir workDir(PATCHES_WORK_DIR); + if (!workDir.mkpath(PATCHES_WORK_DIR)) { + qDebug() << Q_FUNC_INFO << QStringLiteral("Error: could not create ") << workDir; + return; + }; QFile archiveFile = new QFile(archive, this); if (!archiveFile->open(QFile::WriteOnly)) { return; @@ -1948,9 +1950,18 @@ QProcess proc; int ret = 0; if (archive.endsWith(QStringLiteral(".zip"))) { - ret = proc.execute(QStringLiteral("/usr/bin/unzip"), {archive, QStringLiteral("-d"), patchPath}); + ret = proc.execute(BIN_UNZIP, {QStringLiteral("-o"), archive, QStringLiteral("-d"), patchPath }); } else { - ret = proc.execute(QStringLiteral("/bin/tar"), {QStringLiteral("xzf"), archive, QStringLiteral("-C"), patchPath}); + QString uncompressOpt; + if (archive.endsWith(QStringLiteral("gz"))) { uncompressOpt = QStringLiteral("-z"); } + else if (archive.endsWith(QStringLiteral("bz2"))) { uncompressOpt = QStringLiteral("-j"); } + // careful: GNU tar has J for everything xz/lz, and a for automatic, BusyBox has J for .xz and a for .lzma + else if (archive.endsWith(QStringLiteral("xz"))) { uncompressOpt = QStringLiteral("-J"); } + else { + qWarning() << Q_FUNC_INFO << QStringLiteral("Archive format unsupported"); + uncompressOpt = QStringLiteral(""); + } + ret = proc.execute(BIN_TAR, {QStringLiteral("x"), uncompressOpt, QStringLiteral("-f"), archive, QStringLiteral("-C"), patchPath}); } if (ret == 0) { if (m_updates.contains(patch)) { @@ -1965,6 +1976,13 @@ } } } else { + QString retMsg = QStringLiteral("process exited with code (%1)").arg(ret); + if ( ret == -2 ) { + retMsg = QStringLiteral("Process could not start (%1)").arg(ret); + } else if ( ret == -1 ) { + retMsg = QStringLiteral("Process crashed (%1)").arg(ret); + } + qDebug() << Q_FUNC_INFO << QStringLiteral("Error: extraction failed:") << proc.error() << retMsg; patchDir.removeRecursively(); } @@ -2009,7 +2027,7 @@ } else { qDebug() << Q_FUNC_INFO << "Removing patch package" << rpmPatch; - const int ret = QProcess::execute(QStringLiteral("/usr/bin/pkcon"), {QStringLiteral("remove"), QStringLiteral("-y"), getRpmName(rpmPatch)}); + const int ret = QProcess::execute(BIN_PKCON, {QStringLiteral("remove"), QStringLiteral("-y"), getRpmName(rpmPatch)}); removeSuccess = ret == 0; } @@ -2250,7 +2268,7 @@ QUrl url(QStringLiteral(CATALOG_URL "/" PROJECTS_PATH)); QUrlQuery query; - query.addQueryItem("version", m_ssuRelease); + query.addQueryItem("version", m_osRelease); url.setQuery(query); QNetworkRequest request(url); QNetworkReply reply = m_nam->get(request); @@ -2326,7 +2344,7 @@ for (const QVariant &fileVar : files) { const QVariantMap file = fileVar.toMap(); const QStringList compatible = file.value("compatible").toStringList(); - if (!compatible.contains(m_ssuRelease)) { + if (!compatible.contains(m_osRelease)) { continue; } const QString version = file.value("version").toString();
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/src/bin/patchmanager-daemon/patchmanagerobject.h ^
@@ -132,7 +132,7 @@ void lipstickChanged(const QString &state); QString getPatchmanagerVersion() const; - QString getSsuVersion() const; + QString getOsVersion() const; protected: bool eventFilter(QObject watched, QEvent event); @@ -235,7 +235,8 @@ QVariantMap m_updates; - QString m_ssuRelease; + QString m_osRelease; + PatchManagerAdaptor m_adaptor = nullptr; QNetworkAccessManager m_nam = nullptr;
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/src/qml/AboutPage.qml ^
@@ -81,27 +81,66 @@ text: qsTranslate("", "Patchmanager allows system modification via patches. It provides a system daemon that is in charge of performing those patches, as well as a GUI, to control those operations and installation/removal of patches.") } - BackgroundItem { + Separator { width: parent.width - onClicked: Qt.openUrlExternally(PAYPAL_DONATE) - Label { - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: Theme.horizontalPageMargin - anchors.verticalCenter: parent.verticalCenter - text: qsTranslate("", "Donate") - } + color: Theme.primaryColor + horizontalAlignment: Qt.AlignHCenter } - BackgroundItem { - width: parent.width - onClicked: pageStack.push(Qt.resolvedUrl("DevelopersPage.qml")) - Label { - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: Theme.horizontalPageMargin - anchors.verticalCenter: parent.verticalCenter - text: qsTranslate("", "Developers") + Column { + width: parent.width - Theme.paddingSmall + spacing: Theme.paddingLarge + + Text { + anchors.horizontalCenter: parent.horizontalCenter + text: qsTranslate("", "Licensed under the terms of the<br /><a href=\"%1\"> BSD 3-Clause License</a>").arg("https://opensource.org/licenses/BSD-3-Clause") + textFormat: Text.StyledText + horizontalAlignment: Text.AlignHCenter + font.pixelSize: Theme.fontSizeSmall + color: Theme.secondaryColor + linkColor: Theme.highlightColor + onLinkActivated: Qt.openUrlExternally("https://opensource.org/licenses/BSD-3-Clause") + } + Text { + anchors.horizontalCenter: parent.horizontalCenter + text: qsTranslate("", "Sources and Issue Tracker<br /><a href=\"%1\">on GitHub</a>").arg(SOURCE_REPO) + textFormat: Text.StyledText + horizontalAlignment: Text.AlignHCenter + font.pixelSize: Theme.fontSizeSmall + color: Theme.secondaryColor + linkColor: Theme.highlightColor + onLinkActivated: Qt.openUrlExternally(SOURCE_REPO) } + + Separator { + width: parent.width + color: Theme.primaryColor + horizontalAlignment: Qt.AlignHCenter + } + + Text { + anchors.horizontalCenter: parent.horizontalCenter + text: qsTranslate("", "Credits and Thanks<br /><a href=\"%1\">Developers</a>").arg("about:_blank") + textFormat: Text.StyledText + horizontalAlignment: Text.AlignHCenter + font.pixelSize: Theme.fontSizeSmall + color: Theme.secondaryColor + linkColor: Theme.highlightColor + onLinkActivated: pageStack.push(Qt.resolvedUrl("DevelopersPage.qml")) + } + + Separator { + width: parent.width + color: Theme.primaryColor + horizontalAlignment: Qt.AlignHCenter + } + + Button { + preferredWidth: Theme.buttonWidthMedium + anchors.horizontalCenter: parent.horizontalCenter + onClicked: Qt.openUrlExternally(PAYPAL_DONATE) + text: qsTranslate("", "Donate") + } + } property int rotAngle: 0
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/src/qml/DevelopersPage.qml ^
@@ -43,7 +43,8 @@ name: "webOS Internals" nickname: "" description: "Team behind AUSMT" - twitter: "https://twitter.com/webosinternals" + socialmedia: "https://twitter.com/webosinternals" + socialmedianame: "Twitter" website: "http://www.webos-internals.org/wiki/Main_Page" } ListElement { @@ -51,8 +52,9 @@ category: "Patchmanager" name: "Lucien Xu" nickname: "Sfiet_Konstantin" - description: "Main developer" - twitter: "https://twitter.com/SfietKonstantin" + description: "Original developer" + socialmedia: "https://twitter.com/SfietKonstantin" + socialmedianame: "Twitter" website: "https://github.com/SfietKonstantin" } ListElement { @@ -61,16 +63,48 @@ name: "Andrey Kozhevnikov" nickname: "coderus" description: "Community developer" - twitter: "https://twitter.com/icoderus" + socialmedia: "https://twitter.com/icoderus" + socialmedianame: "Twitter" website: "https://github.com/coderus" } ListElement { + icon: "/usr/share/patchmanager/data/nephros.png" + category: "Patchmanager" + name: "Peter G." + nickname: "nephros" + description: "Maintainer, UI Tweaker" + socialmedia: "https://mastodon.sdf.org/@renalcalculus" + socialmedianame: "Mastodon" + website: "https://forum.sailfishos.org/u/nephros/summary" + } + ListElement { + icon: "/usr/share/patchmanager/data/b100dian.png" + category: "Patchmanager" + name: "Vlad G." + nickname: "b100dian" + description: "Maintainer" + socialmedia: "https://mastodon.social/@b100dian" + socialmedianame: "Mastodon" + website: "https://forum.sailfishos.org/u/vlagged/summary" + } + ListElement { + icon: "/usr/share/patchmanager/data/olf.png" + category: "Patchmanager" + name: "olf" + nickname: "Olf0" + description: "Maintainer" + socialmedia: "https://mastodon.social/@olf" + socialmedianame: "Mastodon" + website: "https://talk.maemo.org/member.php?u=72347" + } + ListElement { icon: "/usr/share/patchmanager/data/morpog.jpeg" category: "Thanks to" name: "Stephan Beyerle" nickname: "Morpog" description: "Icons master" - twitter: "https://twitter.com/Morpog" + socialmedia: "https://twitter.com/Morpog" + socialmedianame: "Twitter" website: "" } ListElement { @@ -79,7 +113,8 @@ name: "" nickname: "Ancelad" description: "Icons master" - twitter: "https://twitter.com/iAncelad" + socialmedia: "https://twitter.com/iAncelad" + socialmedianame: "Twitter" website: "" } ListElement { @@ -88,9 +123,24 @@ name: "Jakob Dietrich" nickname: "Jakibaki" description: "Prepatch developer" - twitter: "" + socialmedia: "" + socialmedianame: "" website: "https://github.com/jakibaki" } + /* + * TEMPLATE for new entry + * + ListElement { + icon: "" # local image file, remember to add to src/share/share.pro + category: "Patchmanager" # under which section to show the name + name: "Anonymous" # long name, required + nickname: "anon" # short name, required + description: "Anonymous developer" + socialmedia: "" # URL to social media profile + socialmedianame: "" # name of the social media site, e.g. "Twitter" + website: "" # web site URL + } + */ } @@ -147,9 +197,9 @@ onClicked: Qt.openUrlExternally(model.website) } MenuItem { - visible: model.twitter != "" - text: qsTranslate("", "%1's Twitter account").arg(model.name \|\| model.nickname) - onClicked: Qt.openUrlExternally(model.twitter) + visible: model.socialmedia != "" + text: qsTranslate("", "%1's %2 account").arg(model.name \|\| model.nickname).arg(model.socialmedianame \|\| "Social Media") + onClicked: Qt.openUrlExternally(model.socialmedia) } } }
[-] [+]	Deleted	_service:tar_git:patchmanager-3.1.0.tar.bz2/src/qml/LegacyPatchPage.qml ^
@@ -1,174 +0,0 @@ -/* - * Copyright (C) 2013 Lucien XU <sfietkonstantin@free.fr> - * Copyright (C) 2016 Andrey Kozhevnikov <coderusinbox@gmail.com> - * - * You may use this file under the terms of the BSD license as follows: - * - * "Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * The names of its contributors may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." - */ - -import QtQuick 2.0 -import Sailfish.Silica 1.0 -import org.SfietKonstantin.patchmanager 2.0 - -Page { - id: container - property var modelData - property QtObject delegate - signal doPatch - - SilicaFlickable { - id: view - anchors.fill: parent - contentHeight: content.height - - PullDownMenu { - busy: container.delegate.applying - MenuItem { - text: container.delegate.applying - ? qsTranslate("", "Patch being applied") - : (modelData.patched - ? qsTranslate("", "Unapply patch") - : qsTranslate("", "Apply patch")) - enabled: !container.delegate.applying && PatchManager.loaded - onClicked: { - container.delegate.doPatch() - } - } - MenuLabel { - visible: !PatchManager.loaded - text: qsTranslate("", "Load engine before applying patches") - } - } - - Column { - id: content - width: view.width - spacing: Theme.paddingMedium - - PageHeader { - title: qsTranslate("", "Patch information") - } - - Label { - visible: !modelData.available - color: Theme.primaryColor - anchors.left: parent.left; anchors.leftMargin: Theme.horizontalPageMargin - anchors.right: parent.right; anchors.rightMargin: Theme.horizontalPageMargin - wrapMode: Text.WordWrap - font.pixelSize: Theme.fontSizeLarge - text: qsTranslate("", "This patch is no available anymore. You won't be able to reinstall it.") - } - - SectionHeader { - text: qsTranslate("", "Name") - } - - Label { - color: Theme.highlightColor - anchors.left: parent.left; anchors.leftMargin: Theme.horizontalPageMargin - anchors.right: parent.right; anchors.rightMargin: Theme.horizontalPageMargin - wrapMode: Text.WordWrap - font.pixelSize: Theme.fontSizeLarge - text: modelData.name - } - - SectionHeader { - text: qsTranslate("", "Version") - } - - Label { - color: Theme.highlightColor - anchors.left: parent.left; anchors.leftMargin: Theme.horizontalPageMargin - anchors.right: parent.right; anchors.rightMargin: Theme.horizontalPageMargin - wrapMode: Text.WordWrap - font.pixelSize: Theme.fontSizeLarge - text: modelData.rpm ? modelData.rpm : modelData.version - } - - SectionHeader { - visible: !!modelData.infos && modelData.infos.maintainer - text: qsTranslate("", "Maintainer") - } - - Label { - color: Theme.highlightColor - anchors.left: parent.left; anchors.leftMargin: Theme.horizontalPageMargin - anchors.right: parent.right; anchors.rightMargin: Theme.horizontalPageMargin - wrapMode: Text.WordWrap - visible: !!modelData.infos && modelData.infos.maintainer - text: modelData.infos.maintainer - } - - SectionHeader { - visible: modelData.conflicts.length > 0 - text: qsTranslate("", "Possible conflicts") - } - - Label { - color: Theme.highlightColor - anchors.left: parent.left; anchors.leftMargin: Theme.horizontalPageMargin - anchors.right: parent.right; anchors.rightMargin: Theme.horizontalPageMargin - wrapMode: Text.WordWrap - visible: modelData.conflicts.length > 0 - text: modelData.conflicts.map(function(i) { return PatchManager.patchName(i) }).join("\n") - } - - SectionHeader { - text: qsTranslate("", "Description") - } - - Label { - color: Theme.highlightColor - anchors.left: parent.left; anchors.leftMargin: Theme.horizontalPageMargin - anchors.right: parent.right; anchors.rightMargin: Theme.horizontalPageMargin - wrapMode: Text.WordWrap - text: modelData.description - } - - SectionHeader { - text: qsTranslate("", "Patch log") - visible: PatchManager.developerMode - } - - Label { - color: Theme.highlightColor - anchors.left: parent.left; anchors.leftMargin: Theme.horizontalPageMargin - anchors.right: parent.right; anchors.rightMargin: Theme.horizontalPageMargin - wrapMode: Text.WrapAnywhere - text: modelData.log \|\| qsTranslate("", "No log yet") - font.family: "Courier" - font.pixelSize: Theme.fontSizeTiny - visible: PatchManager.developerMode - - MouseArea { - anchors.fill: parent - onClicked: Clipboard.text = modelData.log - } - } - } - } -}
[-] [+]	Deleted	_service:tar_git:patchmanager-3.1.0.tar.bz2/src/qml/NewPatchPage.qml ^
@@ -1,176 +0,0 @@ -/* - * Copyright (C) 2013 Lucien XU <sfietkonstantin@free.fr> - * Copyright (C) 2016 Andrey Kozhevnikov <coderusinbox@gmail.com> - * - * You may use this file under the terms of the BSD license as follows: - * - * "Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * The names of its contributors may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." - */ - -import QtQuick 2.0 -import Sailfish.Silica 1.0 -import org.SfietKonstantin.patchmanager 2.0 - -Page { - id: container - property var modelData - property var delegate - signal doPatch - - SilicaFlickable { - id: view - anchors.fill: parent - contentHeight: content.height - - PullDownMenu { - busy: container.delegate.applying - MenuItem { - text: container.delegate.applying - ? qsTranslate("", "Patch being applied") - : (modelData.patched - ? qsTranslate("", "Unapply patch") - : qsTranslate("", "Apply patch")) - enabled: !container.delegate.applying && PatchManager.loaded - onClicked: { - container.delegate.doPatch() - } - } - MenuLabel { - visible: !PatchManager.loaded - text: qsTranslate("", "Load engine before applying patches") - } - } - - Column { - id: content - width: view.width - spacing: Theme.paddingMedium - - PageHeader { - title: modelData.display_name - } - - Label { - visible: !modelData.available - color: Theme.primaryColor - anchors.left: parent.left; anchors.leftMargin: Theme.horizontalPageMargin - anchors.right: parent.right; anchors.rightMargin: Theme.horizontalPageMargin - wrapMode: Text.WordWrap - font.pixelSize: Theme.fontSizeLarge - text: qsTranslate("", "This patch is no available anymore. You won't be able to reinstall it.") - } - - SectionHeader { - text: qsTranslate("", "Author") - } - - Label { - color: Theme.highlightColor - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: Theme.horizontalPageMargin - wrapMode: Text.WordWrap - text: modelData.author - } - - SectionHeader { - visible: modelData.conflicts.length > 0 - text: qsTranslate("", "Possible conflicts") - } - - Label { - color: Theme.highlightColor - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: Theme.horizontalPageMargin - wrapMode: Text.WrapAtWordBoundaryOrAnywhere - text: modelData.conflicts.map(function(i) { return PatchManager.patchName(i) }).join("\n") - visible: modelData.conflicts.length > 0 - } - - SectionHeader { - text: qsTranslate("", "Version") - } - - Label { - color: Theme.highlightColor - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: Theme.horizontalPageMargin - wrapMode: Text.WordWrap - text: modelData.rpm ? modelData.rpm : modelData.version - } - - SectionHeader { - text: qsTranslate("", "Compatible") - } - - Label { - color: Theme.highlightColor - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: Theme.horizontalPageMargin - wrapMode: Text.WrapAtWordBoundaryOrAnywhere - text: modelData.compatible.join(', ') - } - - SectionHeader { - text: qsTranslate("", "Description") - } - - Label { - color: Theme.highlightColor - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: Theme.horizontalPageMargin - wrapMode: Text.WordWrap - text: modelData.description - } - - SectionHeader { - text: qsTranslate("", "Patch log") - visible: PatchManager.developerMode - } - - Label { - color: Theme.highlightColor - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: Theme.horizontalPageMargin - wrapMode: Text.WrapAnywhere - text: modelData.log \|\| qsTranslate("", "No log yet") - font.family: "Courier" - font.pixelSize: Theme.fontSizeTiny - visible: PatchManager.developerMode - - MouseArea { - anchors.fill: parent - onClicked: Clipboard.text = modelData.log - } - } - } - } -}
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/src/qml/PatchManagerPage.qml ^
@@ -396,7 +396,7 @@ } function openPatchInfo() { - pageStack.push(Qt.resolvedUrl(patchObject.details.isNewPatch ? "NewPatchPage.qml" : "LegacyPatchPage.qml"), + pageStack.push(Qt.resolvedUrl("UnifiedPatchPage.qml"), {modelData: patchObject.details, delegate: background}) } @@ -480,10 +480,11 @@ } } MenuLabel { - visible: patchObject.details.conflicts.length > 0 - text: qsTranslate("", "Have possible conflicts") + visible: !patchObject.details.patched && patchObject.details.conflicts.length > 0 + text: qsTr("May conflict with %n other patch(es), see %2", "", patchObject.details.conflicts.length).arg(patchinfoitem.text) } MenuItem { + id: patchinfoitem text: qsTranslate("", "Patch info") onClicked: background.openPatchInfo() }
[-] [+]	Added	_service:tar_git:patchmanager-3.1.0.tar.bz2/src/qml/UnifiedPatchPage.qml ^
@@ -0,0 +1,220 @@ +/* + * Copyright (C) 2013 Lucien XU <sfietkonstantin@free.fr> + * Copyright (C) 2016 Andrey Kozhevnikov <coderusinbox@gmail.com> + * + * You may use this file under the terms of the BSD license as follows: + * + * "Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * The names of its contributors may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." + / + +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Nemo.Notifications 1.0 +import org.SfietKonstantin.patchmanager 2.0 + +Page { + id: container + property var modelData + property var delegate + property bool legacyPatch: !modelData.isNewPatch + signal doPatch + + Notification { + id: popup + appName: modelData.display_name + summary: qsTranslate("", "Log copied to Clipboard!") + previewSummary: summary + icon: "image://theme/icon-s-clipboard" + category: "transfer.complete" + expireTimeout: 2000 + isTransient: true + } + + SilicaFlickable { + id: view + anchors.fill: parent + contentHeight: content.height + + PullDownMenu { + busy: container.delegate.applying + MenuItem { + text: container.delegate.applying + ? qsTranslate("", "Patch being applied") + : (modelData.patched + ? qsTranslate("", "Unapply patch") + : qsTranslate("", "Apply patch")) + enabled: !container.delegate.applying && PatchManager.loaded + onClicked: { + container.delegate.doPatch() + } + } + MenuItem { + text: qsTranslate("", "Uninstall patch") + enabled: !modelData.patched + onClicked: { + Remorse.popupAction(container, qsTranslate("", "Patch %1 uninstalled.").arg(modelData.display_name), + function() { container.delegate.doUninstall(); pageStack.pop(); } + ) + } + } + MenuLabel { + visible: !PatchManager.loaded + text: qsTranslate("", "Load engine before applying patches") + } + } + + Column { + id: content + width: view.width + spacing: Theme.paddingMedium + anchors.bottomMargin: Theme.itemSizeSmall + + PageHeader { + title: legacyPatch ? modelData.display_name : modelData.display_name + } + + Label { + visible: !modelData.available + anchors.left: parent.left + anchors.right: parent.right + anchors.margins: Theme.horizontalPageMargin + color: Theme.primaryColor + wrapMode: Text.WordWrap + font.pixelSize: Theme.fontSizeLarge + text: qsTranslate("", "This patch is not available anymore. You will not be able to reinstall it.") + } + + Column { + width: parent.width - Theme.itemSizeMedium 2 + anchors.horizontalCenter: parent.horizontalCenter + spacing: Theme.paddingSmall + + DetailItem { + label: legacyPatch ? qsTranslate("", "Maintainer") : qsTranslate("", "Author") + value: legacyPatch ? modelData.infos.maintainer : modelData.author + } + DetailItem { + label: qsTranslate("", "Version") + value: modelData.rpm ? modelData.rpm : (modelData.version != "0.0.0") ? modelData.version : qsTranslate("", "not available") + _valueItem.wrapMode: Text.WordWrap + } + DetailItem { + label: qsTranslate("", "Compatible") + value: modelData.compatible.length > 0 ? modelData.compatible.join(', ') : qsTranslate("", "not available") + _valueItem.wrapMode: Text.WrapAtWordBoundaryOrAnywhere + } + } + Separator { + width: parent.width + color: Theme.primaryColor + horizontalAlignment: Qt.AlignHCenter + } + SectionHeader { + visible: modelData.conflicts.length > 0 + text: qsTranslate("", "May conflict with:") + } + Repeater { + visible: modelData.conflicts.length > 0 + model: modelData.conflicts + delegate: TextSwitch { + anchors.left: parent.left + anchors.right: parent.right + anchors.margins: Theme.horizontalPageMargin + automaticCheck : false + checked: PatchManager.isApplied(modelData) + _label.color: checked ? Theme.primaryColor : Theme.secondaryColor + height: Math.max(Theme.itemSizeMedium, implicitHeight) + text: PatchManager.patchName(modelData) + } + } + + Label { + visible: PatchManager.developerMode && legacyPatch + color: Theme.primaryColor + anchors.left: parent.left + anchors.right: parent.right + anchors.margins: Theme.horizontalPageMargin + wrapMode: Text.WordWrap + horizontalAlignment: Text.AlignJustify + font.pixelSize: Theme.fontSizeSmall + textFormat: Text.StyledText + property string link: SOURCE_REPO + "/blob/master/README.md#for-developers" + text: qsTranslate("", "This patch uses the legacy format for its patch.json file. If you are the maintainer, do consider updating to the new format. If you are using Web Catalog you should not include a patch.json file at all in your upload.<br />See the developer section in the <a href=\"%1\">README</a> for more information.").arg(link) + linkColor: Theme.highlightColor + onLinkActivated: Qt.openUrlExternally(link) + } + + SectionHeader { + text: qsTranslate("", "Description") + } + + Label { + color: Theme.secondaryHighlightColor + anchors.left: parent.left + anchors.right: parent.right + anchors.margins: Theme.horizontalPageMargin + horizontalAlignment: Text.AlignJustify + wrapMode: Text.WordWrap + text: modelData.description + } + + SectionHeader { + text: qsTranslate("", "Patch log") + visible: PatchManager.developerMode + } + + Label { + anchors.right: parent.right + anchors.rightMargin: Theme.horizontalPageMargin + anchors.leftMargin: Theme.horizontalPageMargin + color: Theme.secondaryHighlightColor + text: qsTranslate("", "Press and hold to copy to Clipboard") + font.pixelSize: Theme.fontSizeTiny + visible: modelData.log && log.visible + } + + TextArea {
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/src/qml/WebCatalogPage.qml ^
@@ -41,6 +41,7 @@ property var versions property string search property bool searchVisible + property bool sortByDate: true onStatusChanged: { if (status == PageStatus.Active) { @@ -84,13 +85,21 @@ searchVisible = !searchVisible } } + MenuItem { + text: sortByDate ? qsTranslate("", "Sort by Category") : qsTranslate("", "Sort by Date") + onClicked: { + sortByDate = !sortByDate + } + } + } header: Component { Column { width: view.width PageHeader { - title: container.author ? qsTranslate("", "%1 patches").arg(container.author) : qsTranslate("", "Web catalog") + title: container.author ? qsTranslate("", "%1 patches").arg(container.author) : qsTranslate("", "Web catalog") + description: container.sortByDate ? qsTranslate("", "(by date updated)") : qsTranslate("", "(by category)") } SearchField { @@ -130,15 +139,22 @@ } model: WebPatchesModel { id: patchModel - queryParams: container.author ? { 'author': container.author } - : container.search ? { 'display_name__contains': container.search } - : {} + sorted: !container.sortByDate + queryParams: { + var p = {}; + if (container.author) p = { 'author': container.author }; + if (container.search) p = { 'display_name__contains': container.search }; + return p; + } } section.criteria: ViewSection.FullString section.delegate: SectionHeader { - text: qsTranslate("Sections", section) + text: container.sortByDate ? "" : qsTranslate("Sections", section) + font.capitalization: Font.Capitalize + height: text.length > 0 ? implicitHeight : 0 + visible: text.length > 0 } - section.property: "category" + section.property: container.sortByDate ? "undefined" : "category" currentIndex: -1 spacing: Theme.paddingSmall @@ -167,7 +183,7 @@ width: parent.width Label { id: nameLabel - width: parent.width - authorLabel.width - Theme.paddingMedium + width: parent.width - secondaryLabel.width - Theme.paddingMedium text: model.display_name color: background.down ? Theme.highlightColor : Theme.primaryColor font.bold: isInstalled @@ -175,11 +191,11 @@ } Label { - id: authorLabel + id: secondaryLabel anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter font.pixelSize: Theme.fontSizeExtraSmall - text: model.author + text: container.sortByDate ? model.category : model.author color: Theme.secondaryHighlightColor } }
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/src/qml/WebPatchPage.qml ^
@@ -326,7 +326,7 @@ width: parent.width contentHeight: filesContent.height property bool isInstalled: !!container.versions && container.versions[modelData.project] == modelData.version - property bool isCompatible: modelData.compatible.indexOf(PatchManager.ssuVersion) >= 0 + property bool isCompatible: modelData.compatible.indexOf(PatchManager.osVersion) >= 0 onClicked: { if (!PatchManager.developerMode && !isCompatible) {
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/src/qml/patchmanager.cpp ^
@@ -162,22 +162,7 @@ }); - QDBusPendingCallWatcher watchGetSsuVersion = new QDBusPendingCallWatcher(m_interface->getSsuVersion(), this); - connect(watchGetSsuVersion, &QDBusPendingCallWatcher::finished, [this](QDBusPendingCallWatcher watcher){ - watcher->deleteLater(); - QDBusPendingReply<QString> reply = watcher; - if (reply.isError()) { - qWarning() << Q_FUNC_INFO << reply.error().type() << reply.error().name() << reply.error().message(); - return; - } - - qDebug() << Q_FUNC_INFO << reply.value(); - - const QString ssuVersion = reply.value(); - m_ssuVersion = ssuVersion; - emit ssuVersionChanged(m_ssuVersion); - - }); + m_osVersion = QSettings("/etc/os-release", QSettings::IniFormat).value("VERSION_ID").toString(); } PatchManager PatchManager::GetInstance(QObject parent) @@ -247,11 +232,6 @@ return m_patchmanagerVersion; } -QString PatchManager::ssuVersion() const -{ - return m_ssuVersion; -} - bool PatchManager::toggleServices() const { return m_toggleServices; @@ -379,6 +359,11 @@ return m_installedModel->patchName(patch); } +bool PatchManager::isApplied(const QString &name) const +{ + return m_installedModel->isApplied(name); +} + //QDBusPendingCallWatcher PatchManager::putSettings(const QString &name, const QVariant &value) //{ // return new QDBusPendingCallWatcher(m_interface->putSettings(name, value), this);
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/src/qml/patchmanager.h ^
@@ -73,7 +73,7 @@ Q_PROPERTY(bool failure READ failure NOTIFY failureChanged) Q_PROPERTY(bool loaded READ loaded NOTIFY loadedChanged) Q_PROPERTY(QString patchmanagerVersion READ patchmanagerVersion NOTIFY patchmanagerVersionChanged) - Q_PROPERTY(QString ssuVersion READ ssuVersion NOTIFY ssuVersionChanged) + Q_PROPERTY(QString osVersion MEMBER m_osVersion CONSTANT) public: explicit PatchManager(QObject *parent = nullptr); @@ -88,7 +88,6 @@ QVariantMap getUpdates() const; QStringList getUpdatesNames() const; QString patchmanagerVersion() const; - QString ssuVersion() const; bool toggleServices() const; bool failure() const; @@ -122,6 +121,7 @@ void restartServices(); QString patchName(const QString &patch) const; + bool isApplied(const QString &name) const; bool installTranslator(const QString & patch); bool removeTranslator(const QString & patch); @@ -161,7 +161,6 @@ void failureChanged(bool failed); void loadedChanged(bool loaded); void patchmanagerVersionChanged(const QString &patchmanagerVersion); - void ssuVersionChanged(const QString &ssuVersion); private: void successCall(QJSValue callback, const QVariant &value); @@ -180,7 +179,7 @@ bool m_loaded = false; QString m_patchmanagerVersion; - QString m_ssuVersion; + QString m_osVersion; }; #endif // PATCHMANAGER_H
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/src/qml/patchmanagermodel.cpp ^
@@ -239,6 +239,17 @@ return m_patchMap[patch]->details()->value(QStringLiteral("display_name")).toString(); } +bool PatchManagerModel::isApplied(const QString &name) const +{ + // FIXME: there certainly is a more efficient way, e.g. std::find_if? + for (PatchObject o : m_modelData) { + if (o->details()->value(QStringLiteral("name")).toString() == name ) { + return o->details()->value(QStringLiteral("patched")).toBool(); + } + } + return false; +} + void PatchManagerModel::itemRemoved(PatchObject object) { qDebug() << Q_FUNC_INFO << object;
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/src/qml/patchmanagermodel.h ^
@@ -56,6 +56,7 @@ Q_INVOKABLE void saveLayout(); QString patchName(const QString &patch) const; + bool isApplied(const QString &name) const; private slots: void itemRemoved(PatchObject *object);
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/src/qml/plugin.cpp ^
@@ -41,6 +41,8 @@ // TODO: ask for paypal.me static QString PAYPAL_DONATE = QStringLiteral("https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=R6AJV4U2G33XG"); +static QString SOURCE_REPO = QStringLiteral("https://github.com/sailfishos-patches/patchmanager"); + static QObject patchmanager_singleton(QQmlEngine engine, QJSEngine scriptEngine) { Q_UNUSED(scriptEngine) @@ -61,6 +63,7 @@ { Q_ASSERT(strcmp(uri, "org.SfietKonstantin.patchmanager") == 0); engine->rootContext()->setContextProperty(QStringLiteral("PAYPAL_DONATE"), PAYPAL_DONATE); + engine->rootContext()->setContextProperty(QStringLiteral("SOURCE_REPO"), SOURCE_REPO); } void registerTypes(const char uri)
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/src/qml/qml.pro ^
@@ -26,11 +26,10 @@ AboutPage.qml \ DevelopersPage.qml \ RestartServicesDialog.qml \ - LegacyPatchPage.qml \ + UnifiedPatchPage.qml \ WebCatalogPage.qml \ WebPatchPage.qml \ ItemErrorComponent.qml \ - NewPatchPage.qml \ ScreenshotsPage.qml \ SettingsPage.qml
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/src/qml/qmldir ^
@@ -4,5 +4,4 @@ AboutPage 2.0 AboutPage.qml DevelopersPage 2.0 DevelopersPage.qml LipstickWarningDialog 2.0 LipstickWarningDialog.qml -LegacyPatchPage 2.0 LegacyPatchPage.qml RestartServicesDialog 2.0 RestartServicesDialog.qml
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/src/qml/settings-patchmanager.ts ^
@@ -191,7 +191,7 @@ </message> <message> <location filename="PatchManagerPage.qml" line="484"/> - <source>Have possible conflicts</source> + <source>May conflict with %n other patch(es), see %2</source> <translation type="unfinished"></translation> </message> <message>
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/src/qml/webpatchesmodel.cpp ^
@@ -36,6 +36,8 @@ #include <QDBusPendingReply> #include <QDebug> +#include <algorithm> + WebPatchesModel::WebPatchesModel(QObject * parent) : QAbstractListModel(parent) { @@ -53,6 +55,7 @@ } _completed = false; + _sorted = false; _nam = new QNetworkAccessManager(this); } @@ -76,12 +79,31 @@ } } } +void WebPatchesModel::setSorted(const bool & sorted) { + if (sorted != _sorted) { + _sorted = sorted; + emit WebPatchesModel::sortedChanged(); + if (_completed) { + componentComplete(); + } + } +} void WebPatchesModel::classBegin() { } +QString translateCategory(const QByteArray &category) +{ + return QCoreApplication::translate("Sections", category.data()); +} + +bool compareStrings(const QString &a, const QString &b) +{ + return a.compare(b, Qt::CaseInsensitive) < 0; +} + void WebPatchesModel::componentComplete() { if (_modelData.size() > 0) { @@ -94,9 +116,38 @@ connect(watcher, &QDBusPendingCallWatcher::finished, [this](QDBusPendingCallWatcher watcher){ QDBusPendingReply<QVariantList> reply = watcher; if (!reply.isError()) { - const QVariantList catalog = PatchManager::unwind(reply.value()).toList(); + QVariantList catalog = PatchManager::unwind(reply.value()).toList(); qDebug() << Q_FUNC_INFO << catalog.count(); + if (_sorted) { + const QLatin1String category("category"); + const QLatin1String name("display_name"); + const QByteArray other("other"); + std::sort(catalog.begin(), catalog.end(), [&category, &name, &other](const QVariant &a, const QVariant &b) { + const auto amap = a.toMap(); + const auto bmap = b.toMap(); + + const auto acat = amap[category].toByteArray(); + const auto bcat = bmap[category].toByteArray(); + + if (acat == bcat) { + // If categories are equal then sort by name + return compareStrings(amap[name].toString(), bmap[name].toString()); + } + + // Move others to the end + if (acat == other) { + return false; + } + if (bcat == other) { + return true; + } + + // Sort by localized category name + return compareStrings(translateCategory(acat), translateCategory(bcat)); + }); + } + beginInsertRows(QModelIndex(), 0, catalog.count() - 1); _modelData = catalog; endInsertRows();
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/src/qml/webpatchesmodel.h ^
@@ -49,6 +49,9 @@ Q_PROPERTY(QVariantMap queryParams READ queryParams WRITE setQueryParams NOTIFY queryParamsChanged) QVariantMap queryParams() const; void setQueryParams(const QVariantMap & queryParams); + Q_PROPERTY(bool sorted READ sorted WRITE setSorted NOTIFY sortedChanged) + bool sorted() const { return _sorted; }; + void setSorted(const bool & sorted); explicit WebPatchesModel(QObject * parent = 0); virtual ~WebPatchesModel(); @@ -63,6 +66,7 @@ private: QVariantMap _queryParams; bool _completed; + bool _sorted; QNetworkAccessManager * _nam; @@ -72,6 +76,7 @@ signals: void queryParamsChanged(const QVariantMap & queryParams); + void sortedChanged(); };
	Added	_service:tar_git:patchmanager-3.1.0.tar.bz2/src/share/b100dian.png ^
	Added	_service:tar_git:patchmanager-3.1.0.tar.bz2/src/share/nephros.png ^
	Added	_service:tar_git:patchmanager-3.1.0.tar.bz2/src/share/olf.png ^
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/src/share/share.pro ^
@@ -7,6 +7,9 @@ jakibaki.jpeg \ sfiet_konstantin.jpg \ coderus.jpg \ + nephros.png \ + b100dian.png \ + olf.png \ webosinternals.png data.files = $${OTHER_FILES}
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/src/tools/pm_apply ^
@@ -125,7 +125,7 @@ log "----------------------------------" log -log $(basename "$PATCH_DIR") +log "$(basename "$PATCH_DIR")" if [ -f "$PATCH_PATH" ]; then log " contains text patch"
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/src/tools/pm_unapply ^
@@ -16,7 +16,7 @@ PM_PATCH_BACKUP_DIR="$PM_PATCH_BACKUP_ROOT_DIR/$1" # Constants -PATCH_NAME=unified_diff.patch +PATCH_NAME="unified_diff.patch" PATCH_PATH="$PATCH_DIR/$PATCH_NAME" PATCH_BACKUP="$PM_PATCH_BACKUP_DIR/$PATCH_NAME" @@ -109,7 +109,7 @@ log "----------------------------------" log -log $(basename "$PATCH_DIR") +log "$(basename "$PATCH_DIR")" if [ -f "$PATCH_FILE" ]; then log " contains text patch"
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/translations/settings-patchmanager-de.ts ^
@@ -10,30 +10,38 @@ <translation>Über Patchmanager</translation> </message> <message> + <location filename="../src/bin/dialog/dialog.qml" line="45"/> <source>Apply patches</source> - <translation type="vanished">Patches anwenden</translation> + <translation>Patches anwenden</translation> </message> <message> + <location filename="../src/bin/dialog/dialog.qml" line="53"/> <source>Patchmanager will automatically apply patches in 10 seconds.</source> - <translation type="vanished">Patchmanager wendet Patches automatisch in 10 Sekunden an.</translation> + <translation>Patchmanager wendet Patches automatisch in 10 Sekunden an.</translation> </message> <message> + <location filename="../src/bin/dialog/dialog.qml" line="66"/> <source>Exit</source> - <translation type="vanished">Beenden</translation> + <translation>Beenden</translation> </message> <message> + <location filename="../src/bin/dialog/dialog.qml" line="28"/> <source>Applying patches</source> - <translation type="vanished">Anwenden von Patches</translation> + <translation>Anwenden von Patches</translation> </message> <message> + <location filename="../src/bin/dialog/dialog.qml" line="136"/> <source>Appled successfully!</source> - <translation type="vanished">Erfolgreich angewendet!</translation> + <translation>Erfolgreich angewendet!</translation> </message> <message> + <location filename="../src/bin/dialog/dialog.qml" line="137"/> <source>Failed applying patches!</source> - <translation type="vanished">Fehler beim Anwenden von Patches!</translation> + <translation>Fehler beim Anwenden von Patches!</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> + <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> <source>Patchmanager</source> <translation>Patchmanager</translation> @@ -49,13 +57,27 @@ <translation>Patchmanager ermöglicht es durch Patches Veränderungen am System vorzunehmen. Patchmanager besteht zum einen aus einem Daemon, welcher für die Verarbeitung der Patches zuständig ist und zum anderen aus der GUI, mit welcher sich die Patches installieren oder entfernen lassen.</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the<br /><a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker<br /><a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks<br /><a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation>Spenden</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>Entwickler</translation> @@ -173,7 +195,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>Web catalog</source> <translation>Web-Katalog</translation> </message> @@ -209,8 +231,12 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="484"/> + <source>May have conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Have possible conflicts</source> - <translation>Eventuelle Konflikte</translation> + <translation type="vanished">Eventuelle Konflikte</translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="487"/> @@ -234,7 +260,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="510"/> - <location filename="../src/qml/WebCatalogPage.qml" line="232"/> + <location filename="../src/qml/WebCatalogPage.qml" line="248"/> <source>No patches available</source> <translation>Keine Patches verfügbar</translation> </message> @@ -255,27 +281,47 @@ <translation>Screenshots</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Hide search field</source> <translation>Suchfeld verstecken</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Show search field</source> <translation>Suchfeld anzeigen</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>%1 patches</source> <translation>%1 Patches</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="99"/> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by date updated)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by category)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="108"/> <source>Tap to enter search query</source> <translation>Antippen zum Suchen</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="219"/> + <location filename="../src/qml/WebCatalogPage.qml" line="235"/> <source>Update available: %1</source> <translation>Aktualisierung verfügbar: %1</translation> </message> @@ -340,44 +386,54 @@ <translation>Kompatibel zu: %1 </translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="224"/> <source>Patch installed</source> - <translation type="vanished">Patch installiert</translation> + <translation>Patch installiert</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="225"/> <source>Patch %1 installed</source> - <translation type="vanished">Patch %1 installiert</translation> + <translation>Patch %1 installiert</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="228"/> <source>Patch removed</source> - <translation type="vanished">Patch entfernt</translation> + <translation>Patch entfernt</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="229"/> <source>Patch %1 removed</source> - <translation type="vanished">Patch %1 entfernt</translation> + <translation>Patch %1 entfernt</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="232"/> <source>Failed to install patch</source> - <translation type="vanished">Patch konnte nicht installiert werden</translation> + <translation>Patch konnte nicht installiert werden</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="233"/> <source>Patch %1 installation failed</source> - <translation type="vanished">Patch %1 konnte nicht installiert werden</translation> + <translation>Patch %1 konnte nicht installiert werden</translation> </message> <message>
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/translations/settings-patchmanager-en.ts ^
@@ -10,30 +10,38 @@ <translation>About</translation> </message> <message> + <location filename="../src/bin/dialog/dialog.qml" line="45"/> <source>Apply patches</source> - <translation type="vanished">Apply patches</translation> + <translation>Apply patches</translation> </message> <message> + <location filename="../src/bin/dialog/dialog.qml" line="53"/> <source>Patchmanager will automatically apply patches in 10 seconds.</source> - <translation type="vanished">Patchmanager will automatically apply patches in 10 seconds.</translation> + <translation>Patchmanager will automatically apply patches in 10 seconds.</translation> </message> <message> + <location filename="../src/bin/dialog/dialog.qml" line="66"/> <source>Exit</source> - <translation type="vanished">Exit</translation> + <translation>Exit</translation> </message> <message> + <location filename="../src/bin/dialog/dialog.qml" line="28"/> <source>Applying patches</source> - <translation type="vanished">Applying patches</translation> + <translation>Applying patches</translation> </message> <message> + <location filename="../src/bin/dialog/dialog.qml" line="136"/> <source>Appled successfully!</source> - <translation type="vanished">Appled successfully!</translation> + <translation>Appled successfully!</translation> </message> <message> + <location filename="../src/bin/dialog/dialog.qml" line="137"/> <source>Failed applying patches!</source> - <translation type="vanished">Failed applying patches!</translation> + <translation>Failed applying patches!</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> + <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> <source>Patchmanager</source> <translation>Patchmanager</translation> @@ -49,13 +57,27 @@ <translation>Patchmanager allows system modification via patches. It provides a system daemon that is in charge of performing those patches, as well as a GUI, to control those operations and installation/removal of patches.</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the<br /><a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker<br /><a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks<br /><a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation>Donate</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>Developers</translation> @@ -173,7 +195,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>Web catalog</source> <translation>Web catalog</translation> </message> @@ -209,8 +231,12 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="484"/> + <source>May have conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Have possible conflicts</source> - <translation>Have possible conflicts</translation> + <translation type="vanished">Have possible conflicts</translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="487"/> @@ -234,7 +260,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="510"/> - <location filename="../src/qml/WebCatalogPage.qml" line="232"/> + <location filename="../src/qml/WebCatalogPage.qml" line="248"/> <source>No patches available</source> <translation>No patches available</translation> </message> @@ -255,27 +281,47 @@ <translation>Screenshots</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Hide search field</source> <translation>Hide search field</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Show search field</source> <translation>Show search field</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>%1 patches</source> <translation>%1 patches</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="99"/> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by date updated)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by category)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="108"/> <source>Tap to enter search query</source> <translation>Tap to enter search query</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="219"/> + <location filename="../src/qml/WebCatalogPage.qml" line="235"/> <source>Update available: %1</source> <translation>Update available: %1</translation> </message> @@ -340,44 +386,54 @@ <translation>Compatible: %1</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="224"/> <source>Patch installed</source> - <translation type="vanished">Patch installed</translation> + <translation>Patch installed</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="225"/> <source>Patch %1 installed</source> - <translation type="vanished">Patch %1 installed</translation> + <translation>Patch %1 installed</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="228"/> <source>Patch removed</source> - <translation type="vanished">Patch removed</translation> + <translation>Patch removed</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="229"/> <source>Patch %1 removed</source> - <translation type="vanished">Patch %1 removed</translation> + <translation>Patch %1 removed</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="232"/> <source>Failed to install patch</source> - <translation type="vanished">Failed to install patch</translation> + <translation>Failed to install patch</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="233"/> <source>Patch %1 installation failed</source> - <translation type="vanished">Patch %1 installation failed</translation> + <translation>Patch %1 installation failed</translation> </message> <message>
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/translations/settings-patchmanager-es.ts ^
@@ -1,6 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="es" version="2.1"> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="es"> <context> - <name/> + <name></name> <message> <location filename="../src/qml/AboutPage.qml" line="49"/> <location filename="../src/qml/PatchManagerPage.qml" line="142"/> @@ -38,9 +40,9 @@ <translation>¡Error al aplicar parches!</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/> <source>Patchmanager</source> <translation>Gestor de parches</translation> </message> @@ -55,13 +57,27 @@ <translation>El gestor de parches permite la modificación del sistema a través de parches. Proporciona un sistema que se encarga de ejecutar esos parches en segundo plano, así como una GUI para controlar estas operaciones e instalar/eliminar parches.</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the<br /><a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker<br /><a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks<br /><a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation>Donar</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>Desarrolladores</translation> @@ -98,7 +114,7 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="63"/> <location filename="../src/qml/NewPatchPage.qml" line="63"/> <source>Load engine before applying patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="73"/> @@ -179,7 +195,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>Web catalog</source> <translation>Catálogo Web</translation> </message> @@ -215,8 +231,12 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="484"/> + <source>May have conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Have possible conflicts</source> - <translation>Hay posibles conflictos</translation> + <translation type="vanished">Hay posibles conflictos</translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="487"/> @@ -240,7 +260,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="510"/> - <location filename="../src/qml/WebCatalogPage.qml" line="232"/> + <location filename="../src/qml/WebCatalogPage.qml" line="248"/> <source>No patches available</source> <translation>No hay parches disponibles</translation> </message> @@ -261,27 +281,47 @@ <translation>Capturas</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Hide search field</source> <translation>Ocultar campo de búsqueda</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Show search field</source> <translation>Mostrar campo de búsqueda</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>%1 patches</source> <translation>%1 parches</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="99"/> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by date updated)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by category)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="108"/> <source>Tap to enter search query</source> <translation>Toca para escribir consulta</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="219"/> + <location filename="../src/qml/WebCatalogPage.qml" line="235"/> <source>Update available: %1</source> <translation>Actualización disponible: %1</translation> </message> @@ -346,70 +386,84 @@ <translation>Compatible: %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="218"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="224"/> <source>Patch installed</source> <translation>Parche instalado</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="219"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="225"/> <source>Patch %1 installed</source> <translation>Parche %1 instalado</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="222"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="228"/> <source>Patch removed</source> <translation>Parche eliminado</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="223"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="229"/> <source>Patch %1 removed</source> <translation>Parche %1 eliminado</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="226"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="232"/> <source>Failed to install patch</source> <translation>Error al instalar parche</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="227"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="233"/> <source>Patch %1 installation failed</source> <translation>Falló la instalación del parche %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="230"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="236"/> <source>Failed to remove patch</source> <translation>Error al eliminar parche</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="231"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="237"/> <source>Patch %1 removal failed</source> <translation>Falló la eliminación del parche %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="234"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="240"/>
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/translations/settings-patchmanager-fi.ts ^
@@ -1,6 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="fi" version="2.1"> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="fi"> <context> - <name/> + <name></name> <message> <location filename="../src/qml/AboutPage.qml" line="49"/> <location filename="../src/qml/PatchManagerPage.qml" line="142"/> @@ -38,9 +40,9 @@ <translation>Muutostiedostojen käyttöönotto epäonnistui!</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/> <source>Patchmanager</source> <translation>Muutostiedostojen hallinta</translation> </message> @@ -55,13 +57,27 @@ <translation>Muutostiedostojen hallinta (Patchmanager) sallii muutoksia järjestelmään muutostiedostoilla (patch). Se tarjoaa järjestelmän taustaprosessin joka vastaa kyseisten muutostiedostojen suorittamisesta, samoin kuin graafinen käyttöliittymä (GUI), hallitakseen niiden toimintoja ja muutostiedostojen asennuksia/poistoja.</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the<br /><a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker<br /><a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks<br /><a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation>Lahjoita</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>Kehittäjät</translation> @@ -98,7 +114,7 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="63"/> <location filename="../src/qml/NewPatchPage.qml" line="63"/> <source>Load engine before applying patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="73"/> @@ -179,7 +195,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>Web catalog</source> <translation>Luettelo muutostiedostoista verkossa</translation> </message> @@ -215,8 +231,12 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="484"/> + <source>May have conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Have possible conflicts</source> - <translation>Mahdollisia ristiriitoja</translation> + <translation type="vanished">Mahdollisia ristiriitoja</translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="487"/> @@ -240,7 +260,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="510"/> - <location filename="../src/qml/WebCatalogPage.qml" line="232"/> + <location filename="../src/qml/WebCatalogPage.qml" line="248"/> <source>No patches available</source> <translation>Muutostiedostoja ei ole saatavilla</translation> </message> @@ -261,27 +281,47 @@ <translation>Näyttökuvat</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Hide search field</source> <translation>Piilota hakukenttä</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Show search field</source> <translation>Näytä hakukenttä</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>%1 patches</source> <translation>%1 muutostiedostoa</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="99"/> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by date updated)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by category)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="108"/> <source>Tap to enter search query</source> <translation>Mitä haet?</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="219"/> + <location filename="../src/qml/WebCatalogPage.qml" line="235"/> <source>Update available: %1</source> <translation>Päivitys saatavilla: %1</translation> </message> @@ -346,70 +386,84 @@ <translation>Yhteensopiva: %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="218"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="224"/> <source>Patch installed</source> <translation>Muutostiedosto asennettu</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="219"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="225"/> <source>Patch %1 installed</source> <translation>Muutostiedosto %1 asennettu</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="222"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="228"/> <source>Patch removed</source> <translation>Muutostiedosto poistettu</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="223"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="229"/> <source>Patch %1 removed</source> <translation>Muutostiedosto %1 poistettu</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="226"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="232"/> <source>Failed to install patch</source> <translation>Muutostiedoston asennus epäonnistui</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="227"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="233"/> <source>Patch %1 installation failed</source> <translation>Muutostiedoston %1 asennus epäonnistui</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="230"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="236"/> <source>Failed to remove patch</source> <translation>Muutostiedoston poistaminen epäonnistui</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="231"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="237"/> <source>Patch %1 removal failed</source> <translation>Muutostiedoston %1 poisto epäonnistui</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="234"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="240"/>
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/translations/settings-patchmanager-fi_FI.ts ^
@@ -1,6 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="fi_FI" version="2.1"> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="fi_FI"> <context> - <name/> + <name></name> <message> <location filename="../src/qml/AboutPage.qml" line="49"/> <location filename="../src/qml/PatchManagerPage.qml" line="142"/> @@ -38,9 +40,9 @@ <translation>Käyttöönotto epäonnistui!</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/> <source>Patchmanager</source> <translation>Muutostiedostojen hallinta</translation> </message> @@ -52,16 +54,30 @@ <message> <location filename="../src/qml/AboutPage.qml" line="81"/> <source>Patchmanager allows system modification via patches. It provides a system daemon that is in charge of performing those patches, as well as a GUI, to control those operations and installation/removal of patches.</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the<br /><a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker<br /><a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks<br /><a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation>Lahjoita</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>Kehittäjät</translation> @@ -98,7 +114,7 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="63"/> <location filename="../src/qml/NewPatchPage.qml" line="63"/> <source>Load engine before applying patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="73"/> @@ -110,7 +126,7 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="83"/> <location filename="../src/qml/NewPatchPage.qml" line="83"/> <source>This patch is no available anymore. You won't be able to reinstall it.</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="87"/> @@ -138,278 +154,308 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="153"/> <location filename="../src/qml/NewPatchPage.qml" line="154"/> <source>Patch log</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="162"/> <location filename="../src/qml/NewPatchPage.qml" line="164"/> <source>No log yet</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/NewPatchPage.qml" line="87"/> <source>Author</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="100"/> <location filename="../src/qml/NewPatchPage.qml" line="115"/> <source>Version</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/NewPatchPage.qml" line="128"/> <source>Compatible</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="147"/> <source>Unapply all patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="153"/> <source>Load engine</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> <source>Updates available</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>Web catalog</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="165"/> <source>Restart preloaded services</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="171"/> <source>Resolve failure</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="178"/> <source>Installed patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="357"/> <source>This patch is not compatible with SailfishOS version!</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="365"/> <source>Uninstalling patch %1</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="470"/> <source>Compatible with:</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="484"/> - <source>Have possible conflicts</source> - <translation type="unfinished"/> + <source>May have conflicts</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="487"/> <source>Patch info</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="491"/> <source>Unapply</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="491"/> <source>Apply</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="496"/> <source>Uninstall</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message>
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/translations/settings-patchmanager-fr_FR.ts ^
@@ -1,6 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr_FR" version="2.1"> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="fr_FR"> <context> - <name/> + <name></name> <message> <location filename="../src/qml/AboutPage.qml" line="49"/> <location filename="../src/qml/PatchManagerPage.qml" line="142"/> @@ -38,9 +40,9 @@ <translation>Échec de l'application des patches !</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/> <source>Patchmanager</source> <translation>Patchmanager</translation> </message> @@ -55,13 +57,27 @@ <translation>Patchmanager permet des modifications du système via des patchs. Il fournit un daemon système en charge d'appliquer ces patchs mais également un GUI pour contrôler ces opérations d'installation/suppression de patchs.</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the<br /><a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker<br /><a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks<br /><a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation>Donation</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>Développeurs</translation> @@ -98,7 +114,7 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="63"/> <location filename="../src/qml/NewPatchPage.qml" line="63"/> <source>Load engine before applying patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="73"/> @@ -179,7 +195,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>Web catalog</source> <translation>Catalogue web</translation> </message> @@ -215,8 +231,12 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="484"/> + <source>May have conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Have possible conflicts</source> - <translation>A de possibles conflits</translation> + <translation type="vanished">A de possibles conflits</translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="487"/> @@ -240,7 +260,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="510"/> - <location filename="../src/qml/WebCatalogPage.qml" line="232"/> + <location filename="../src/qml/WebCatalogPage.qml" line="248"/> <source>No patches available</source> <translation>Pas de patch disponible</translation> </message> @@ -261,27 +281,47 @@ <translation>Captures d'écran</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Hide search field</source> <translation>Masquer la recherche</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Show search field</source> <translation>Afficher la recherche</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>%1 patches</source> <translation>%1 patchs</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="99"/> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by date updated)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by category)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="108"/> <source>Tap to enter search query</source> <translation>Appuyer pour lancer la recherche</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="219"/> + <location filename="../src/qml/WebCatalogPage.qml" line="235"/> <source>Update available: %1</source> <translation>Mises à jour disponibles : %1</translation> </message> @@ -346,70 +386,84 @@ <translation>Compatible: %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="218"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="224"/> <source>Patch installed</source> <translation>Patch installé</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="219"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="225"/> <source>Patch %1 installed</source> <translation>Patch %1 installé</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="222"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="228"/> <source>Patch removed</source> <translation>Patch supprimé</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="223"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="229"/> <source>Patch %1 removed</source> <translation>Patch %1 supprimé</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="226"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="232"/> <source>Failed to install patch</source> <translation>Échec lors de d'installation du patch</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="227"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="233"/> <source>Patch %1 installation failed</source> <translation>L'installation du patch %1 a échouée</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="230"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="236"/> <source>Failed to remove patch</source> <translation>Échec de suppression du patch</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="231"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="237"/> <source>Patch %1 removal failed</source> <translation>Échec de suppression du patch %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="234"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="240"/>
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/translations/settings-patchmanager-hu.ts ^
@@ -1,21 +1,23 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="hu" version="2.1"> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="hu"> <context> - <name/> + <name></name> <message> <location filename="../src/qml/AboutPage.qml" line="49"/> <location filename="../src/qml/PatchManagerPage.qml" line="142"/> <source>About</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/bin/dialog/dialog.qml" line="45"/> <source>Apply patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/bin/dialog/dialog.qml" line="53"/> <source>Patchmanager will automatically apply patches in 10 seconds.</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/bin/dialog/dialog.qml" line="66"/> @@ -25,22 +27,22 @@ <message> <location filename="../src/bin/dialog/dialog.qml" line="28"/> <source>Applying patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/bin/dialog/dialog.qml" line="136"/> <source>Appled successfully!</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/bin/dialog/dialog.qml" line="137"/> <source>Failed applying patches!</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/> <source>Patchmanager</source> <translation>Patchmanager</translation> </message> @@ -52,16 +54,30 @@ <message> <location filename="../src/qml/AboutPage.qml" line="81"/> <source>Patchmanager allows system modification via patches. It provides a system daemon that is in charge of performing those patches, as well as a GUI, to control those operations and installation/removal of patches.</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the<br /><a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker<br /><a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks<br /><a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>Fejlesztők</translation> @@ -69,7 +85,7 @@ <message> <location filename="../src/qml/DevelopersPage.qml" line="146"/> <source>%1's webpage</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/DevelopersPage.qml" line="151"/> @@ -80,25 +96,25 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="52"/> <location filename="../src/qml/NewPatchPage.qml" line="52"/> <source>Patch being applied</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="54"/> <location filename="../src/qml/NewPatchPage.qml" line="54"/> <source>Unapply patch</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="55"/> <location filename="../src/qml/NewPatchPage.qml" line="55"/> <source>Apply patch</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="63"/> <location filename="../src/qml/NewPatchPage.qml" line="63"/> <source>Load engine before applying patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="73"/> @@ -110,7 +126,7 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="83"/> <location filename="../src/qml/NewPatchPage.qml" line="83"/> <source>This patch is no available anymore. You won't be able to reinstall it.</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="87"/> @@ -120,31 +136,31 @@ <message> <location filename="../src/qml/LegacyPatchPage.qml" line="114"/> <source>Maintainer</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="128"/> <location filename="../src/qml/NewPatchPage.qml" line="101"/> <source>Possible conflicts</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="141"/> <location filename="../src/qml/NewPatchPage.qml" line="141"/> <source>Description</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="153"/> <location filename="../src/qml/NewPatchPage.qml" line="154"/> <source>Patch log</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="162"/> <location filename="../src/qml/NewPatchPage.qml" line="164"/> <source>No log yet</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/NewPatchPage.qml" line="87"/> @@ -160,155 +176,175 @@ <message> <location filename="../src/qml/NewPatchPage.qml" line="128"/> <source>Compatible</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="147"/> <source>Unapply all patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="153"/> <source>Load engine</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> <source>Updates available</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation>
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/translations/settings-patchmanager-nl.ts ^
@@ -1,6 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl" version="2.1"> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="nl"> <context> - <name/> + <name></name> <message> <location filename="../src/qml/AboutPage.qml" line="49"/> <location filename="../src/qml/PatchManagerPage.qml" line="142"/> @@ -38,9 +40,9 @@ <translation>Kleven van pleisters mislukt!</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/> <source>Patchmanager</source> <translation>Patchmanager</translation> </message> @@ -55,13 +57,27 @@ <translation>Patchmanager biedt je de mogelijkheid je systeem aan te passen met pleisters. Het biedt een systeemdaemon verantwoordelijk voor het uitvoeren van de pleisters, evenals een grafische interface om de bewerkingen en installatie/verwijderen van de pleisters te beheren.</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the<br /><a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker<br /><a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks<br /><a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation>Doneren</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>Ontwikkelaars</translation> @@ -98,7 +114,7 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="63"/> <location filename="../src/qml/NewPatchPage.qml" line="63"/> <source>Load engine before applying patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="73"/> @@ -179,7 +195,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>Web catalog</source> <translation>Webcatalogus</translation> </message> @@ -215,8 +231,12 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="484"/> + <source>May have conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Have possible conflicts</source> - <translation>Hebben mogelijke conflicten</translation> + <translation type="vanished">Hebben mogelijke conflicten</translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="487"/> @@ -240,7 +260,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="510"/> - <location filename="../src/qml/WebCatalogPage.qml" line="232"/> + <location filename="../src/qml/WebCatalogPage.qml" line="248"/> <source>No patches available</source> <translation>Geen pleisters beschikbaar</translation> </message> @@ -261,27 +281,47 @@ <translation>Schermafdrukken</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Hide search field</source> <translation>Zoekveld verbergen</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Show search field</source> <translation>Zoekveld tonen</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>%1 patches</source> <translation>%1 pleisters</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="99"/> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by date updated)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by category)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="108"/> <source>Tap to enter search query</source> <translation>Tik om een zoekopdracht in te voeren</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="219"/> + <location filename="../src/qml/WebCatalogPage.qml" line="235"/> <source>Update available: %1</source> <translation>Update beschikbaar: %1</translation> </message> @@ -346,70 +386,84 @@ <translation>Compatibel: %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="218"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="224"/> <source>Patch installed</source> <translation>Pleister geïnstalleerd</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="219"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="225"/> <source>Patch %1 installed</source> <translation>Pleister %1 geïnstalleerd</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="222"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="228"/> <source>Patch removed</source> <translation>Pleister verwijderd</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="223"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="229"/> <source>Patch %1 removed</source> <translation>Pleister %1 verwijderd</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="226"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="232"/> <source>Failed to install patch</source> <translation>Installeren van pleister mislukt</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="227"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="233"/> <source>Patch %1 installation failed</source> <translation>Installeren van pleister %1 mislukt</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="230"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="236"/> <source>Failed to remove patch</source> <translation>Verwijderen van pleister mislukt</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="231"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="237"/> <source>Patch %1 removal failed</source> <translation>Verwijderen van pleister %1 mislukt</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="234"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="240"/>
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/translations/settings-patchmanager-nl_BE.ts ^
@@ -1,6 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl_BE" version="2.1"> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="nl_BE"> <context> - <name/> + <name></name> <message> <location filename="../src/qml/AboutPage.qml" line="49"/> <location filename="../src/qml/PatchManagerPage.qml" line="142"/> @@ -38,9 +40,9 @@ <translation>Plakken mislukt!</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/> <source>Patchmanager</source> <translation>Patchmanager</translation> </message> @@ -55,13 +57,27 @@ <translation>Patchmanager biedt u de mogelijkheid uw systeem aan te passen met plakkers. Het biedt ne systeemdaemon verantwoordelijk voor het uitvoeren van de plakkers, evenals ne grafischen interface voor de bewerkingen en installatie/verwijderen van de plakkers te beheren.</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the<br /><a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker<br /><a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks<br /><a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation>Doneren</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>Ontwikkelaars</translation> @@ -98,7 +114,7 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="63"/> <location filename="../src/qml/NewPatchPage.qml" line="63"/> <source>Load engine before applying patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="73"/> @@ -179,7 +195,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>Web catalog</source> <translation>Webcataloog</translation> </message> @@ -215,8 +231,12 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="484"/> + <source>May have conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Have possible conflicts</source> - <translation>Hebben mogelijke conflicten</translation> + <translation type="vanished">Hebben mogelijke conflicten</translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="487"/> @@ -240,7 +260,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="510"/> - <location filename="../src/qml/WebCatalogPage.qml" line="232"/> + <location filename="../src/qml/WebCatalogPage.qml" line="248"/> <source>No patches available</source> <translation>Geen plakkers beschikbaar</translation> </message> @@ -261,27 +281,47 @@ <translation>Schermafdrukken</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Hide search field</source> <translation>Zoekveld verbergen</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Show search field</source> <translation>Zoekveld weergeven</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>%1 patches</source> <translation>%1 plakkers</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="99"/> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by date updated)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by category)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="108"/> <source>Tap to enter search query</source> <translation>Tikt voor een zoekopdracht in te voeren</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="219"/> + <location filename="../src/qml/WebCatalogPage.qml" line="235"/> <source>Update available: %1</source> <translation>Update beschikbaar: %1</translation> </message> @@ -346,70 +386,84 @@ <translation>Compatibel: %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="218"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="224"/> <source>Patch installed</source> <translation>Plakker geïnstalleerd</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="219"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="225"/> <source>Patch %1 installed</source> <translation>Plakker %1 geïnstalleerd</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="222"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="228"/> <source>Patch removed</source> <translation>Plakker verwijderd</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="223"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="229"/> <source>Patch %1 removed</source> <translation>Plakker %1 verwijderd</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="226"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="232"/> <source>Failed to install patch</source> <translation>Installeren van plakker mislukt</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="227"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="233"/> <source>Patch %1 installation failed</source> <translation>Installeren van plakker %1 mislukt</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="230"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="236"/> <source>Failed to remove patch</source> <translation>Verwijderen van plakker mislukt</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="231"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="237"/> <source>Patch %1 removal failed</source> <translation>Verwijderen van plakker %1 mislukt</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="234"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="240"/>
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/translations/settings-patchmanager-pl.ts ^
@@ -1,6 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl" version="2.1"> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="pl"> <context> - <name/> + <name></name> <message> <location filename="../src/qml/AboutPage.qml" line="49"/> <location filename="../src/qml/PatchManagerPage.qml" line="142"/> @@ -38,9 +40,9 @@ <translation>Błąd podczas włącznia łatek!</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/> <source>Patchmanager</source> <translation>Patchmanager</translation> </message> @@ -55,13 +57,27 @@ <translation>Patchmanager pozwala na modyfikacje systemu za pomocą łatek. Dostarcza on systemowego daemona, który wykonyje modyfikacje, jak i dostarcza GUI, aby móc zarządzać operacjami instalacji/usuwania łatek.</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the<br /><a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker<br /><a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks<br /><a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation>Wspomóż</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>Deweloperzy</translation> @@ -98,7 +114,7 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="63"/> <location filename="../src/qml/NewPatchPage.qml" line="63"/> <source>Load engine before applying patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="73"/> @@ -179,7 +195,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>Web catalog</source> <translation>Katalog internetowy</translation> </message> @@ -215,8 +231,12 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="484"/> + <source>May have conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Have possible conflicts</source> - <translation>Ma potencjalne konflikty</translation> + <translation type="vanished">Ma potencjalne konflikty</translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="487"/> @@ -240,7 +260,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="510"/> - <location filename="../src/qml/WebCatalogPage.qml" line="232"/> + <location filename="../src/qml/WebCatalogPage.qml" line="248"/> <source>No patches available</source> <translation>Brak łatek</translation> </message> @@ -261,27 +281,47 @@ <translation>Zrzuty ekranu</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Hide search field</source> <translation>Ukryj pole wyszukiwania</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Show search field</source> <translation>Pokaż pole wyszukiwania</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>%1 patches</source> <translation>%1 łatki</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="99"/> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by date updated)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by category)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="108"/> <source>Tap to enter search query</source> <translation>Dotknij aby wprowadzić zapytanie</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="219"/> + <location filename="../src/qml/WebCatalogPage.qml" line="235"/> <source>Update available: %1</source> <translation>Aktualizacja dostępna: %1</translation> </message> @@ -346,70 +386,84 @@ <translation>Kompatybilny: %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="218"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="224"/> <source>Patch installed</source> <translation>Łatka zainstalowana</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="219"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="225"/> <source>Patch %1 installed</source> <translation>Łatka %1 zainstalowana</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="222"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="228"/> <source>Patch removed</source> <translation>Łatka usunięta</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="223"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="229"/> <source>Patch %1 removed</source> <translation>Łatka %1 usunięta</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="226"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="232"/> <source>Failed to install patch</source> <translation>Błąd instalacji łatki</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="227"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="233"/> <source>Patch %1 installation failed</source> <translation>Błąd instalacji łatki %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="230"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="236"/> <source>Failed to remove patch</source> <translation>Nieudane usunięcie łatki</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="231"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="237"/> <source>Patch %1 removal failed</source> <translation>Nieudane usunięcie łatki %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="234"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="240"/>
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/translations/settings-patchmanager-pt_BR.ts ^
@@ -1,6 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_BR" version="2.1"> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="pt_BR"> <context> - <name/> + <name></name> <message> <location filename="../src/qml/AboutPage.qml" line="49"/> <location filename="../src/qml/PatchManagerPage.qml" line="142"/> @@ -38,9 +40,9 @@ <translation>Falha ao aplicar patches!</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/> <source>Patchmanager</source> <translation>Patchmanager</translation> </message> @@ -55,13 +57,27 @@ <translation>O Patchmanager permite a modificação do sistema via patches. Ele fornece um daemon de sistema encarregado de executar esses patches, bem como uma GUI, para controlar essas operações e instalação / remoção de patches.</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the<br /><a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker<br /><a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks<br /><a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation>Doação</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>Desenvolvedores</translation> @@ -98,7 +114,7 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="63"/> <location filename="../src/qml/NewPatchPage.qml" line="63"/> <source>Load engine before applying patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="73"/> @@ -179,7 +195,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>Web catalog</source> <translation>Catálogo da web</translation> </message> @@ -215,8 +231,12 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="484"/> + <source>May have conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Have possible conflicts</source> - <translation>Tem possíveis conflitos</translation> + <translation type="vanished">Tem possíveis conflitos</translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="487"/> @@ -240,7 +260,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="510"/> - <location filename="../src/qml/WebCatalogPage.qml" line="232"/> + <location filename="../src/qml/WebCatalogPage.qml" line="248"/> <source>No patches available</source> <translation>Nenhum patch disponível</translation> </message> @@ -261,27 +281,47 @@ <translation>Screenshots</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Hide search field</source> <translation>Ocultar campo de pesquisa</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Show search field</source> <translation>Mostrar campo de pesquisa</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>%1 patches</source> <translation>%1 patches</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="99"/> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by date updated)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by category)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="108"/> <source>Tap to enter search query</source> <translation>Toque para inserir a consulta de pesquisa</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="219"/> + <location filename="../src/qml/WebCatalogPage.qml" line="235"/> <source>Update available: %1</source> <translation>Atualização disponível: %1</translation> </message> @@ -346,70 +386,84 @@ <translation>Compatível: %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="218"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="224"/> <source>Patch installed</source> <translation>Patch instalado</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="219"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="225"/> <source>Patch %1 installed</source> <translation>Patch %1 instalado</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="222"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="228"/> <source>Patch removed</source> <translation>Patch removido </translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="223"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="229"/> <source>Patch %1 removed</source> <translation>Patch %1 removido</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="226"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="232"/> <source>Failed to install patch</source> <translation>Falha ao instalar o patch</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="227"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="233"/> <source>Patch %1 installation failed</source> <translation>Falha na instalação do patch %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="230"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="236"/> <source>Failed to remove patch</source> <translation>Falha ao remover o patch</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="231"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="237"/> <source>Patch %1 removal failed</source> <translation>Falha na remoção do patch %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="234"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="240"/>
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/translations/settings-patchmanager-ru.ts ^
@@ -1,6 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="ru" version="2.1"> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="ru"> <context> - <name/> + <name></name> <message> <location filename="../src/qml/AboutPage.qml" line="49"/> <location filename="../src/qml/PatchManagerPage.qml" line="142"/> @@ -38,9 +40,9 @@ <translation>Ошибка применения патчей!</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/> <source>Patchmanager</source> <translation>Патчменеджер</translation> </message> @@ -55,13 +57,27 @@ <translation>Патчменеджер позволяет применять патчи к сисемным файлам. Предоставляет демон занимающийся подменой оригинальных файлов на измененные и страницу настроек для управления патчами в системе.</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the<br /><a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker<br /><a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks<br /><a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation>Пожертвовать</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>Разработчики</translation> @@ -179,7 +195,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>Web catalog</source> <translation>Онлайн каталог</translation> </message> @@ -215,8 +231,12 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="484"/> + <source>May have conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Have possible conflicts</source> - <translation>Есть возможные конфликты</translation> + <translation type="vanished">Есть возможные конфликты</translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="487"/> @@ -240,7 +260,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="510"/> - <location filename="../src/qml/WebCatalogPage.qml" line="232"/> + <location filename="../src/qml/WebCatalogPage.qml" line="248"/> <source>No patches available</source> <translation>Патчи отсутствуют</translation> </message> @@ -261,27 +281,47 @@ <translation>Скриншоты</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Hide search field</source> <translation>Скрыть поле ввода</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Show search field</source> <translation>Показать поле ввода</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>%1 patches</source> <translation>Патчи %1</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="99"/> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by date updated)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by category)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="108"/> <source>Tap to enter search query</source> <translation>Коснитесь для поиска</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="219"/> + <location filename="../src/qml/WebCatalogPage.qml" line="235"/> <source>Update available: %1</source> <translation>Доступно обновление: %1</translation> </message> @@ -346,70 +386,84 @@ <translation>Совместимость: %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="218"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="224"/> <source>Patch installed</source> <translation>Патч установлен</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="219"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="225"/> <source>Patch %1 installed</source> <translation>Патч %1 установлен</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="222"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="228"/> <source>Patch removed</source> <translation>Патч удален</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="223"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="229"/> <source>Patch %1 removed</source> <translation>Патч %1 удален</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="226"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="232"/> <source>Failed to install patch</source> <translation>Ошибка при применении патча</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="227"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="233"/> <source>Patch %1 installation failed</source> <translation>Ошибка при применении %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="230"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="236"/> <source>Failed to remove patch</source> <translation>Ошибка при удалении патча</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="231"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="237"/> <source>Patch %1 removal failed</source> <translation>Ошибка при удалении %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="234"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="240"/> <source>Update available</source> <translation>Обновление доступно</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="235"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="241"/> <source>Patch %1 have update candidate</source> <translation>Есть обновления для %1</translation> </message>
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/translations/settings-patchmanager-sl.ts ^
@@ -1,6 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="sl" version="2.1"> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="sl"> <context> - <name/> + <name></name> <message> <location filename="../src/qml/AboutPage.qml" line="49"/> <location filename="../src/qml/PatchManagerPage.qml" line="142"/> @@ -38,9 +40,9 @@ <translation>Nespešno uveljavljanje popravkov!</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/> <source>Patchmanager</source> <translation>Patchmanager</translation> </message> @@ -57,13 +59,27 @@ Patchmanager omogoča spreminjanje sistema s popravki. Program je zagnan v ozadju in nadzoruje nameščanje, upravljanje in odstranjevanje popravkov s pomočjo grafičnega vmesnika. </translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the<br /><a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker<br /><a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks<br /><a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation>Prispevaj</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>Razvojniki</translation> @@ -100,7 +116,7 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="63"/> <location filename="../src/qml/NewPatchPage.qml" line="63"/> <source>Load engine before applying patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="73"/> @@ -181,7 +197,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>Web catalog</source> <translation>Spletni katalog</translation> </message> @@ -217,8 +233,12 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="484"/> + <source>May have conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Have possible conflicts</source> - <translation>Možni spori</translation> + <translation type="vanished">Možni spori</translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="487"/> @@ -242,7 +262,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="510"/> - <location filename="../src/qml/WebCatalogPage.qml" line="232"/> + <location filename="../src/qml/WebCatalogPage.qml" line="248"/> <source>No patches available</source> <translation>Ni popravkov</translation> </message> @@ -263,27 +283,47 @@ <translation>Posnetki zaslona</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Hide search field</source> <translation>Skrij polje za iskanje</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Show search field</source> <translation>Prikaži polje za iskanje</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>%1 patches</source> <translation>%1 popravkov</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="99"/> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by date updated)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by category)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="108"/> <source>Tap to enter search query</source> <translation>Pritisnite za vnos iskalnega niza</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="219"/> + <location filename="../src/qml/WebCatalogPage.qml" line="235"/> <source>Update available: %1</source> <translation>Na voljo je posodobitev: %1</translation> </message> @@ -348,70 +388,84 @@ <translation>Združljivost: %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="218"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="224"/> <source>Patch installed</source> <translation>Popravek je nameščen</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="219"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="225"/> <source>Patch %1 installed</source> <translation>%1 je nameščen</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="222"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="228"/> <source>Patch removed</source> <translation>Popravek je odstranjen</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="223"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="229"/> <source>Patch %1 removed</source> <translation>%1 je odstranjen</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="226"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="232"/> <source>Failed to install patch</source> <translation>Nespešno nameščanje popravka</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="227"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="233"/> <source>Patch %1 installation failed</source> <translation>Namestitev %1 ni uspela</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="230"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="236"/> <source>Failed to remove patch</source> <translation>Nespešno odstranjevanje popravka</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="231"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="237"/> <source>Patch %1 removal failed</source> <translation>Odstranjevanje %1 ni uspelo.</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="234"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="240"/>
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/translations/settings-patchmanager-sl_SI.ts ^
@@ -1,6 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="sl_SI" version="2.1"> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="sl_SI"> <context> - <name/> + <name></name> <message> <location filename="../src/qml/AboutPage.qml" line="49"/> <location filename="../src/qml/PatchManagerPage.qml" line="142"/> @@ -38,9 +40,9 @@ <translation>Nespešno uveljavljanje popravkov!</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/> <source>Patchmanager</source> <translation>Patchmanager</translation> </message> @@ -57,13 +59,27 @@ Patchmanager omogoča spreminjanje sistema s popravki. Program je zagnan v ozadju in nadzoruje nameščanje, upravljanje in odstranjevanje popravkov s pomočjo grafičnega vmesnika. </translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the<br /><a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker<br /><a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks<br /><a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation>Prispevaj</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>Razvojniki</translation> @@ -100,7 +116,7 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="63"/> <location filename="../src/qml/NewPatchPage.qml" line="63"/> <source>Load engine before applying patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="73"/> @@ -181,7 +197,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>Web catalog</source> <translation>Spletni katalog</translation> </message> @@ -217,8 +233,12 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="484"/> + <source>May have conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Have possible conflicts</source> - <translation>Možni spori</translation> + <translation type="vanished">Možni spori</translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="487"/> @@ -242,7 +262,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="510"/> - <location filename="../src/qml/WebCatalogPage.qml" line="232"/> + <location filename="../src/qml/WebCatalogPage.qml" line="248"/> <source>No patches available</source> <translation>Ni popravkov</translation> </message> @@ -263,27 +283,47 @@ <translation>Posnetki zaslona</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Hide search field</source> <translation>Skrij polje za iskanje</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Show search field</source> <translation>Prikaži polje za iskanje</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>%1 patches</source> <translation>%1 popravkov</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="99"/> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by date updated)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by category)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="108"/> <source>Tap to enter search query</source> <translation>Pritisnite za vnos iskalnega niza</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="219"/> + <location filename="../src/qml/WebCatalogPage.qml" line="235"/> <source>Update available: %1</source> <translation>Na voljo je posodobitev: %1</translation> </message> @@ -348,70 +388,84 @@ <translation>Združljivost: %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="218"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="224"/> <source>Patch installed</source> <translation>Popravek je nameščen</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="219"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="225"/> <source>Patch %1 installed</source> <translation>%1 je nameščen</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="222"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="228"/> <source>Patch removed</source> <translation>Popravek je odstranjen</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="223"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="229"/> <source>Patch %1 removed</source> <translation>%1 je odstranjen</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="226"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="232"/> <source>Failed to install patch</source> <translation>Nespešno nameščanje popravka</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="227"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="233"/> <source>Patch %1 installation failed</source> <translation>Namestitev %1 ni uspela</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="230"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="236"/> <source>Failed to remove patch</source> <translation>Nespešno odstranjevanje popravka</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="231"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="237"/> <source>Patch %1 removal failed</source> <translation>Odstranjevanje %1 ni uspelo.</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="234"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="240"/>
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/translations/settings-patchmanager-sv.ts ^
@@ -38,9 +38,9 @@ <translation>Kunde inte tillämpa korrigeringar!</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/> <source>Patchmanager</source> <translation>Patchmanager</translation> </message> @@ -55,13 +55,27 @@ <translation>Patchmanager möjliggör systemändringar via korrigeringsfiler. Den tillhandahåller en systemtjänst som ansvarar för att utföra dessa korrigeringar, samt ett grafiskt gränssnitt för att kontrollera dessa åtgärder och installation/avinstallation av korrigeringsfiler.</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the<br /><a href="%1"> BSD 3-Clause License</a></source> + <translation>Licensierad under villkoren för<br /><a href="%1"> BSD 3-Clause License</a></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker<br /><a href="%1">on GitHub</a></source> + <translation>Källor och ärendehanterare<br /><a href="%1">på GitHub</a></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks<br /><a href="%1">Developers</a></source> + <translation>Erkännanden och tack<br /><a href="%1">Utvecklare</a></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation>Donera</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>Utvecklare</translation> @@ -98,7 +112,7 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="63"/> <location filename="../src/qml/NewPatchPage.qml" line="63"/> <source>Load engine before applying patches</source> - <translation type="unfinished"/> + <translation>Starta motorn före tillämpning av korrigeringar</translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="73"/> @@ -179,7 +193,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>Web catalog</source> <translation>Webbkatalog</translation> </message> @@ -215,8 +229,8 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="484"/> - <source>Have possible conflicts</source> - <translation>Har möjliga konflikter</translation> + <source>May have conflicts</source> + <translation>Möjliga konflikter</translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="487"/> @@ -240,7 +254,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="510"/> - <location filename="../src/qml/WebCatalogPage.qml" line="232"/> + <location filename="../src/qml/WebCatalogPage.qml" line="248"/> <source>No patches available</source> <translation>Inga korrigeringsfiler tillgängliga</translation> </message> @@ -261,27 +275,47 @@ <translation>Skärmklipp</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Hide search field</source> <translation>Dölj sökfältet</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Show search field</source> <translation>Visa sökfältet</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Category</source> + <translation>Sortera efter kategori</translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Date</source> + <translation>Sortera efter datum</translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>%1 patches</source> <translation>%1 korrigeringar</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="99"/> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by date updated)</source> + <translation>(uppdaterat efter datum)</translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by category)</source> + <translation>(efter kategori)</translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="108"/> <source>Tap to enter search query</source> <translation>Tryck för att ange söksträng</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="219"/> + <location filename="../src/qml/WebCatalogPage.qml" line="235"/> <source>Update available: %1</source> <translation>Uppdatering tillgänglig: %1</translation> </message> @@ -346,70 +380,80 @@ <translation>Kompatibel: %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="218"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="224"/> <source>Patch installed</source> <translation>Korrigering installerad</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="219"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="225"/> <source>Patch %1 installed</source> <translation>Korrigering %1 installerad</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="222"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="228"/> <source>Patch removed</source> <translation>Korrigering borttagen</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="223"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="229"/> <source>Patch %1 removed</source> <translation>Korrigering %1 borttagen</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="226"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="232"/> <source>Failed to install patch</source> <translation>Kunde inte installera korrigering</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="227"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="233"/> <source>Patch %1 installation failed</source> <translation>Korrigeringsfil %1 kunde inte installeras</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="230"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="236"/> <source>Failed to remove patch</source> <translation>Kunde inte ta bort korrigering</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="231"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="237"/> <source>Patch %1 removal failed</source> <translation>Korrigering %1 kunde inte tas bort</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="234"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="240"/> <source>Update available</source> <translation>Uppdatering tillgänglig</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="235"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="241"/> <source>Patch %1 have update candidate</source> <translation>Korrigeringsfil %1 har en uppdateringskandidat</translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="137"/> - <location filename="../src/qml/SettingsPage.qml" line="14"/> + <location filename="../src/qml/SettingsPage.qml" line="16"/> <source>Settings</source>
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/translations/settings-patchmanager-zh_CN.ts ^
@@ -1,6 +1,8 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_CN" version="2.1"> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="zh_CN"> <context> - <name/> + <name></name> <message> <location filename="../src/qml/AboutPage.qml" line="49"/> <location filename="../src/qml/PatchManagerPage.qml" line="142"/> @@ -38,9 +40,9 @@ <translation>应用补丁失败!</translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="213"/> <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/> <source>Patchmanager</source> <translation>补丁管理</translation> </message> @@ -55,13 +57,27 @@ <translation>补丁管理允许你通过补丁修改系统。它提供了负责执行补丁的系统守护程序和GUI以控制操作、安装或卸载补丁。</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the<br /><a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker<br /><a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks<br /><a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation>捐赠</translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> <location filename="../src/qml/DevelopersPage.qml" line="107"/> <source>Developers</source> <translation>开发者</translation> @@ -98,7 +114,7 @@ <location filename="../src/qml/LegacyPatchPage.qml" line="63"/> <location filename="../src/qml/NewPatchPage.qml" line="63"/> <source>Load engine before applying patches</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/qml/LegacyPatchPage.qml" line="73"/> @@ -179,7 +195,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="159"/> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>Web catalog</source> <translation>网络目录</translation> </message> @@ -215,8 +231,12 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="484"/> + <source>May have conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Have possible conflicts</source> - <translation>有可能与之冲突的补丁</translation> + <translation type="vanished">有可能与之冲突的补丁</translation> </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="487"/> @@ -240,7 +260,7 @@ </message> <message> <location filename="../src/qml/PatchManagerPage.qml" line="510"/> - <location filename="../src/qml/WebCatalogPage.qml" line="232"/> + <location filename="../src/qml/WebCatalogPage.qml" line="248"/> <source>No patches available</source> <translation>无可用补丁</translation> </message> @@ -261,27 +281,47 @@ <translation>截图</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Hide search field</source> <translation>隐藏搜索字段</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="82"/> + <location filename="../src/qml/WebCatalogPage.qml" line="83"/> <source>Show search field</source> <translation>显示搜索字段</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="93"/> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="89"/> + <source>Sort by Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="101"/> <source>%1 patches</source> <translation>%1 补丁</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="99"/> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by date updated)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="102"/> + <source>(by category)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/WebCatalogPage.qml" line="108"/> <source>Tap to enter search query</source> <translation>点击以进入搜索查询</translation> </message> <message> - <location filename="../src/qml/WebCatalogPage.qml" line="219"/> + <location filename="../src/qml/WebCatalogPage.qml" line="235"/> <source>Update available: %1</source> <translation>可供安装更新: %1</translation> </message> @@ -346,70 +386,84 @@ <translation>兼容: %1</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="218"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="224"/> <source>Patch installed</source> <translation>补丁已安装</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="219"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="225"/> <source>Patch %1 installed</source> <translation>已安装 %1 补丁</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="222"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="228"/> <source>Patch removed</source> <translation>已移除补丁</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="223"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="229"/> <source>Patch %1 removed</source> <translation>已移除 %1 补丁</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="226"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="232"/> <source>Failed to install patch</source> <translation>移除补丁失败</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="227"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="233"/> <source>Patch %1 installation failed</source> <translation>补丁 %1 安装失败</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="230"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="236"/> <source>Failed to remove patch</source> <translation>移除补丁失败</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="231"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="237"/> <source>Patch %1 removal failed</source> <translation>补丁 %1 移除失败</translation> </message> <message> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="234"/> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="240"/>
[-] [+]	Changed	_service:tar_git:patchmanager-3.1.0.tar.bz2/translations/settings-patchmanager.ts ^
@@ -16,33 +16,33 @@ </message> <message> <location filename="../src/bin/dialog/dialog.qml" line="53"/> - <source>Patchmanager will automatically apply patches in 10 seconds.</source> + <source>Patchmanager will automatically apply all patches in 10 seconds.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/bin/dialog/dialog.qml" line="66"/> - <source>Exit</source> + <location filename="../src/bin/dialog/dialog.qml" line="136"/> + <source>Applied patches successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/bin/dialog/dialog.qml" line="28"/> - <source>Applying patches</source> + <location filename="../src/bin/dialog/dialog.qml" line="137"/> + <source>Failed to apply patches!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/bin/dialog/dialog.qml" line="136"/> - <source>Appled successfully!</source> + <location filename="../src/bin/dialog/dialog.qml" line="66"/> + <source>Exit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/bin/dialog/dialog.qml" line="137"/> - <source>Failed applying patches!</source> + <location filename="../src/bin/dialog/dialog.qml" line="28"/> + <source>Applying patches</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="222"/> <location filename="../src/bin/dialog/dialog.qml" line="165"/> <location filename="../src/qml/AboutPage.qml" line="63"/> - <location filename="../src/bin/patchmanager-daemon/patchmanagerobject.cpp" line="207"/> <source>Patchmanager</source> <translation type="unfinished"></translation> </message> @@ -57,114 +57,143 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="92"/> + <location filename="../src/qml/AboutPage.qml" line="95"/> + <source>Licensed under the terms of the<br /><a href="%1"> BSD 3-Clause License</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="105"/> + <source>Sources and Issue Tracker<br /><a href="%1">on GitHub</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="122"/> + <source>Credits and Thanks<br /><a href="%1">Developers</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/AboutPage.qml" line="141"/> <location filename="../src/qml/WebPatchPage.qml" line="246"/> <source>Donate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/AboutPage.qml" line="103"/> - <location filename="../src/qml/DevelopersPage.qml" line="107"/> + <location filename="../src/qml/DevelopersPage.qml" line="157"/> <source>Developers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/DevelopersPage.qml" line="146"/> + <location filename="../src/qml/DevelopersPage.qml" line="196"/> <source>%1's webpage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/DevelopersPage.qml" line="151"/> - <source>%1's Twitter account</source> + <location filename="../src/qml/DevelopersPage.qml" line="201"/> + <source>%1's %2 account</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/LegacyPatchPage.qml" line="52"/> - <location filename="../src/qml/NewPatchPage.qml" line="52"/> + <location filename="../src/qml/UnifiedPatchPage.qml" line="65"/> <source>Patch being applied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/LegacyPatchPage.qml" line="54"/> - <location filename="../src/qml/NewPatchPage.qml" line="54"/> + <location filename="../src/qml/UnifiedPatchPage.qml" line="67"/> <source>Unapply patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/LegacyPatchPage.qml" line="55"/> - <location filename="../src/qml/NewPatchPage.qml" line="55"/> + <location filename="../src/qml/UnifiedPatchPage.qml" line="68"/> <source>Apply patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/LegacyPatchPage.qml" line="63"/> - <location filename="../src/qml/NewPatchPage.qml" line="63"/> + <location filename="../src/qml/UnifiedPatchPage.qml" line="85"/> <source>Load engine before applying patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/LegacyPatchPage.qml" line="73"/> <location filename="../src/qml/WebPatchPage.qml" line="85"/> <source>Patch information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/LegacyPatchPage.qml" line="83"/> - <location filename="../src/qml/NewPatchPage.qml" line="83"/> - <source>This patch is no available anymore. You won't be able to reinstall it.</source> + <location filename="../src/qml/UnifiedPatchPage.qml" line="116"/> + <source>Maintainer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/LegacyPatchPage.qml" line="87"/> - <source>Name</source> + <location filename="../src/qml/UnifiedPatchPage.qml" line="171"/> + <source>Description</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/LegacyPatchPage.qml" line="114"/> - <source>Maintainer</source> + <location filename="../src/qml/UnifiedPatchPage.qml" line="185"/> + <source>Patch log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/LegacyPatchPage.qml" line="128"/> - <location filename="../src/qml/NewPatchPage.qml" line="101"/> - <source>Possible conflicts</source> + <location filename="../src/qml/UnifiedPatchPage.qml" line="194"/> + <source>Press and hold to copy to Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/LegacyPatchPage.qml" line="141"/> - <location filename="../src/qml/NewPatchPage.qml" line="141"/> - <source>Description</source> + <location filename="../src/qml/UnifiedPatchPage.qml" line="207"/> + <source>No log yet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/LegacyPatchPage.qml" line="153"/> - <location filename="../src/qml/NewPatchPage.qml" line="154"/> - <source>Patch log</source> + <location filename="../src/qml/UnifiedPatchPage.qml" line="116"/> + <source>Author</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/LegacyPatchPage.qml" line="162"/> - <location filename="../src/qml/NewPatchPage.qml" line="164"/> - <source>No log yet</source> + <location filename="../src/qml/UnifiedPatchPage.qml" line="48"/> + <source>Log copied to Clipboard!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/NewPatchPage.qml" line="87"/> - <source>Author</source> + <location filename="../src/qml/UnifiedPatchPage.qml" line="75"/> + <source>Uninstall patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/UnifiedPatchPage.qml" line="78"/> + <source>Patch %1 uninstalled.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/qml/UnifiedPatchPage.qml" line="107"/> + <source>This patch is not available anymore. You won't be able to reinstall it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/qml/LegacyPatchPage.qml" line="100"/> - <location filename="../src/qml/NewPatchPage.qml" line="115"/> + <location filename="../src/qml/UnifiedPatchPage.qml" line="120"/> <source>Version</source> <translation type="unfinished"></translation>

Changes of Revision 4