[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:28:38 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=0899923
The following commit has been merged in the master branch:
commit 0899923dbc9cda1e3bb0f5243d9d56eb788b78ad
Author: l10n daemon script <scripty at kde.org>
Date: Tue Jun 16 13:33:29 2015 +0000
SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
---
app/org.kde.kdeconnect.app.desktop | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/app/org.kde.kdeconnect.app.desktop b/app/org.kde.kdeconnect.app.desktop
index 1e3d40c..ec4c0b7 100644
--- a/app/org.kde.kdeconnect.app.desktop
+++ b/app/org.kde.kdeconnect.app.desktop
@@ -2,18 +2,24 @@
Name=KDE Connect Application
Name[ca]=Aplicació KDE Connect
Name[nl]=KDE Connect-toepassing
+Name[pt]=Aplicação do KDE Connect
+Name[pt_BR]=Aplicativo KDE Connect
Name[sv]=Programmet KDE-anslut
Name[uk]=Програма KDE Connect
Name[x-test]=xxKDE Connect Applicationxx
GenericName=Device Synchronization
GenericName[ca]=Sincronització de dispositius
GenericName[nl]=Synchronisatie van apparaat
+GenericName[pt]=Sincronização de Dispositivos
+GenericName[pt_BR]=Sincronização de dispositivo
GenericName[sv]=Enhetssynkronisering
GenericName[uk]=Синхронізація із пристроями
GenericName[x-test]=xxDevice Synchronizationxx
Comment=Make all your devices one
Comment[ca]=Fa que tots els vostres dispositius siguin un
Comment[nl]=Al uw apparaten een maken
+Comment[pt]=Unifique todos os seus dispositivos
+Comment[pt_BR]=Torne todos os seus dispositivos em um
Comment[sv]=Gör alla enheter till en
Comment[uk]=Поєднайте усі ваші пристрої
Comment[x-test]=xxMake all your devices onexx
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list