[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/16.04.2-1-53-gf68d114

Maximiliano Curia maxy at moszumanska.debian.org
Tue Sep 12 14:06:43 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=d0122f4

The following commit has been merged in the master branch:
commit d0122f4bfff0bcdbf2806f60a7683735bf7a1050
Author: l10n daemon script <scripty at kde.org>
Date:   Sun Jun 11 04:37:49 2017 +0200

    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"
---
 src/KCMTelepathyAccounts/ktpaccountskcminternal-accountuiplugin.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/KCMTelepathyAccounts/ktpaccountskcminternal-accountuiplugin.desktop b/src/KCMTelepathyAccounts/ktpaccountskcminternal-accountuiplugin.desktop
index 7265559..dd14c3f 100644
--- a/src/KCMTelepathyAccounts/ktpaccountskcminternal-accountuiplugin.desktop
+++ b/src/KCMTelepathyAccounts/ktpaccountskcminternal-accountuiplugin.desktop
@@ -16,7 +16,7 @@ Comment[es]=Complementos de interfaz para las cuentas de Telepathy del módulo d
 Comment[et]=Telepathy kontode seadistustemooduli konto kasutajaliidese pluginad
 Comment[fi]=Telepathy-tilien asetusosion käyttöliittymäliitännäiset
 Comment[fr]=Modules externes d'interface utilisateur de compte de module KCM pour les comptes Telepathy
-Comment[gl]=Engadidos da interface de usuario do módulo KCM das contas de Telepathy
+Comment[gl]=Complementos da interface de usuario do módulo KCM das contas de Telepathy
 Comment[hu]=Telepathy azonosítóbeállító modul
 Comment[ia]=Contos de Telepathy Plugins de interfacie de usator de conto de modulo KCM
 Comment[it]=Estensioni di interfaccia utente di account per il modulo di configurazione degli account di Telepathy

-- 
ktp-accounts-kcm packaging



More information about the pkg-kde-commits mailing list