[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:28:32 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=3efaae6
The following commit has been merged in the master branch:
commit 3efaae6f88b915cb578359c55c43214553af8b9f
Author: l10n daemon script <scripty at kde.org>
Date: Sun May 3 10:29:27 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"
---
fileitemactionplugin/kdeconnectsendfile.desktop | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fileitemactionplugin/kdeconnectsendfile.desktop b/fileitemactionplugin/kdeconnectsendfile.desktop
index f169bb7..dc309c0 100644
--- a/fileitemactionplugin/kdeconnectsendfile.desktop
+++ b/fileitemactionplugin/kdeconnectsendfile.desktop
@@ -17,7 +17,7 @@ Name[ko]=KDE Connect 서비스로 파일 보내기
Name[nl]=Bestand via de service KDE Connect versturen
Name[pl]=Wyślij plik przez usługę KDE Connect
Name[pt]=Enviar um ficheiro pelo serviço KDE Connect
-Name[pt_BR]=Enviar um arquivo pelo serviço KDE Connect
+Name[pt_BR]=Enviar arquivo pelo serviço KDE Connect
Name[sk]=Poslať súbor cez službu KDE Connect
Name[sv]=Skicka fil via KDE:s anslutningstjänst
Name[uk]=Надсилання файла за допомогою служби з’єднання KDE
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list