[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [discover] /: Merge branch 'Plasma/5.12'
From:       Marco Martin <null () kde ! org>
Date:       2018-01-31 15:41:12
Message-ID: E1eguVc-0001Lw-Lx () code ! kde ! org
[Download RAW message or body]

Git commit 4304516c122a535752d0d1ded3040b9560dc4dfd by Marco Martin.
Committed on 31/01/2018 at 15:40.
Pushed by mart into branch 'master'.

Merge branch 'Plasma/5.12'

M  +73   -59   discover/qml/SourcesPage.qml
M  +3    -0    libdiscover/backends/FlatpakBackend/org.kde.discover.flatpak.appdata.xml
 M  +3    -0    libdiscover/backends/PackageKitBackend/org.kde.discover.packagekit.appdata.xml
 M  +3    -0    libdiscover/backends/SnapBackend/org.kde.discover.snap.appdata.xml

https://commits.kde.org/discover/4304516c122a535752d0d1ded3040b9560dc4dfd

diff --cc libdiscover/backends/FlatpakBackend/org.kde.discover.flatpak.appdata.xml
index d91615e1,a44e5b2b..2d6b210b
--- a/libdiscover/backends/FlatpakBackend/org.kde.discover.flatpak.appdata.xml
+++ b/libdiscover/backends/FlatpakBackend/org.kde.discover.flatpak.appdata.xml
@@@ -12,7 -11,9 +12,8 @@@
    <name xml:lang="it">Motore Flatpak</name>
    <name xml:lang="nl">Flatpak-backend</name>
    <name xml:lang="nn">Flatpak-motor</name>
 -  <name xml:lang="pl">Silnik Flatpak</name>
    <name xml:lang="pt">Infra-estrutura do Flatpak</name>
+   <name xml:lang="ru">Модуль для работы с форматом \
Flatpak</name>  <name xml:lang="sk">Backend Flatpak</name>
    <name xml:lang="sl">Zaledje Flatpak</name>
    <name xml:lang="sv">Gränssnitt för Flatpak</name>
@@@ -30,7 -30,9 +31,8 @@@
    <summary xml:lang="it">Integra le applicazioni Flatpak in Discover</summary>
    <summary xml:lang="nl">Integreert Flatpak-toepassingen in Discover</summary>
    <summary xml:lang="nn">Integrerer Flatpak-program i Discover</summary>
 -  <summary xml:lang="pl">Integruje aplikacje Flatpak w Odkrywcy</summary>
    <summary xml:lang="pt">Integra as aplicações do Flatpak no Discover</summary>
+   <summary xml:lang="ru">Добавление поддержки формата \
Flatpak в центр программ Discover</summary>  <summary \
xml:lang="sk">Integruje aplikácie Flatpad do Discoveru</summary>  <summary \
xml:lang="sl">V Discover vgradi programe Flatpack</summary>  <summary \
xml:lang="sv">Integrerar Flatpak-program i Discover</summary> @@@ -52,7 -52,9 +54,8 \
@@@  <developer_name xml:lang="it">Aleix Pol Gonzalez</developer_name>
    <developer_name xml:lang="nl">Aleix Pol Gonzalez</developer_name>
    <developer_name xml:lang="nn">Aleix Pol Gonzalez</developer_name>
 -  <developer_name xml:lang="pl">Aleix Pol Gonzalez</developer_name>
    <developer_name xml:lang="pt">Aleix Pol Gonzalez</developer_name>
+   <developer_name xml:lang="ru">Aleix Pol Gonzalez</developer_name>
    <developer_name xml:lang="sk">Aleix Pol Gonzalez</developer_name>
    <developer_name xml:lang="sl">Aleix Pol Gonzalez</developer_name>
    <developer_name xml:lang="sv">Aleix Pol Gonzalez</developer_name>
diff --cc libdiscover/backends/PackageKitBackend/org.kde.discover.packagekit.appdata.xml
 index 869aea5d,6fde1fbc..732aba1e
--- a/libdiscover/backends/PackageKitBackend/org.kde.discover.packagekit.appdata.xml
+++ b/libdiscover/backends/PackageKitBackend/org.kde.discover.packagekit.appdata.xml
@@@ -12,7 -11,9 +12,8 @@@
    <name xml:lang="it">Motore PackageKit</name>
    <name xml:lang="nl">PackageKit-backend</name>
    <name xml:lang="nn">PackageKit-motor</name>
 -  <name xml:lang="pl">Silnik PackageKit</name>
    <name xml:lang="pt">Infra-estrutura do PackageKit</name>
+   <name xml:lang="ru">Модуль поддержки PackageKit</name>
    <name xml:lang="sk">Backend PackageKit</name>
    <name xml:lang="sl">Zaledje PackageKit</name>
    <name xml:lang="sv">Gränssnitt för PackageKit</name>
@@@ -30,7 -30,9 +31,8 @@@
    <summary xml:lang="it">Integra le applicazioni della distribuzione in \
Discover</summary>  <summary xml:lang="nl">Integreert distributie-toepassingen in \
Discover</summary>  <summary xml:lang="nn">Integrerer distribusjonsprogram i \
                Discover</summary>
 -  <summary xml:lang="pl">Integruje aplikacje dystrybucji w Odkrywcy</summary>
    <summary xml:lang="pt">Integra as aplicações da distribuição no \
Discover</summary> +   <summary xml:lang="ru">Добавление поддержки \
приложений из дистрибутива ОС в центр \
программ Discover</summary>  <summary xml:lang="sk">Integruje distribučné \
aplikácie do Discovera</summary>  <summary xml:lang="sl">V Discover vgradi programe \
distribucije</summary>  <summary xml:lang="sv">Integrerar distributionsprogram i \
Discover</summary> @@@ -52,7 -52,9 +54,8 @@@
    <developer_name xml:lang="it">Aleix Pol Gonzalez</developer_name>
    <developer_name xml:lang="nl">Aleix Pol Gonzalez</developer_name>
    <developer_name xml:lang="nn">Aleix Pol Gonzalez</developer_name>
 -  <developer_name xml:lang="pl">Aleix Pol Gonzalez</developer_name>
    <developer_name xml:lang="pt">Aleix Pol Gonzalez</developer_name>
+   <developer_name xml:lang="ru">Aleix Pol Gonzalez</developer_name>
    <developer_name xml:lang="sk">Aleix Pol Gonzalez</developer_name>
    <developer_name xml:lang="sl">Aleix Pol Gonzalez</developer_name>
    <developer_name xml:lang="sv">Aleix Pol Gonzalez</developer_name>
diff --cc libdiscover/backends/SnapBackend/org.kde.discover.snap.appdata.xml
index c1cd93aa,2fb5b592..c4b41616
--- a/libdiscover/backends/SnapBackend/org.kde.discover.snap.appdata.xml
+++ b/libdiscover/backends/SnapBackend/org.kde.discover.snap.appdata.xml
@@@ -12,7 -11,9 +12,8 @@@
    <name xml:lang="it">Motore Snap</name>
    <name xml:lang="nl">Snap-backend</name>
    <name xml:lang="nn">Snap-motor</name>
 -  <name xml:lang="pl">Silnik Snap</name>
    <name xml:lang="pt">Infra-estrutura do Snap</name>
+   <name xml:lang="ru">Модуль поддержки формата Snap</name>
    <name xml:lang="sk">Backend Snap</name>
    <name xml:lang="sl">Zaledje Snap</name>
    <name xml:lang="sv">Gränssnitt för Snap</name>
@@@ -30,7 -30,9 +31,8 @@@
    <summary xml:lang="it">Integra le applicazioni Snap in Discover</summary>
    <summary xml:lang="nl">Integreert Snap-toepassingen in Discover</summary>
    <summary xml:lang="nn">Integrerer Snap-program i Discover</summary>
 -  <summary xml:lang="pl">Integruje aplikacje Snap w Odkrywcy</summary>
    <summary xml:lang="pt">Integra as aplicações do Snap no Discover</summary>
+   <summary xml:lang="ru">Добавление поддержки формата \
Snap в центр программ Discover</summary>  <summary \
xml:lang="sk">Integruje aplikácie Snap do Discoveru</summary>  <summary \
xml:lang="sl">V Discover vgradi programe Snap</summary>  <summary \
xml:lang="sv">Integrerar Snap-program i Discover</summary> @@@ -52,7 -52,9 +54,8 @@@
    <developer_name xml:lang="it">Aleix Pol Gonzalez</developer_name>
    <developer_name xml:lang="nl">Aleix Pol Gonzalez</developer_name>
    <developer_name xml:lang="nn">Aleix Pol Gonzalez</developer_name>
 -  <developer_name xml:lang="pl">Aleix Pol Gonzalez</developer_name>
    <developer_name xml:lang="pt">Aleix Pol Gonzalez</developer_name>
+   <developer_name xml:lang="ru">Aleix Pol Gonzalez</developer_name>
    <developer_name xml:lang="sk">Aleix Pol Gonzalez</developer_name>
    <developer_name xml:lang="sl">Aleix Pol Gonzalez</developer_name>
    <developer_name xml:lang="sv">Aleix Pol Gonzalez</developer_name>


[prev in list] [next in list] [prev in thread] [next in thread]