[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:42 UTC 2017


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

The following commit has been merged in the master branch:
commit 74b5349ec0e5743909b5acbe2b8dc7198c8c8ccc
Author: l10n daemon script <scripty at kde.org>
Date:   Sat Apr 8 04:17:58 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"
---
 plugins/morse/ktpaccountskcm_plugin_morse.desktop.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/morse/ktpaccountskcm_plugin_morse.desktop.cmake b/plugins/morse/ktpaccountskcm_plugin_morse.desktop.cmake
index 8432d03..5528cd0 100644
--- a/plugins/morse/ktpaccountskcm_plugin_morse.desktop.cmake
+++ b/plugins/morse/ktpaccountskcm_plugin_morse.desktop.cmake
@@ -16,6 +16,7 @@ Comment[fi]=Morse-yhteyshallintaa käyttävien tilien mukautettu hallintakäytt
 Comment[fr]=Interface utilisateur personnalisée pour la configuration de comptes en utilisant le gestionnaire de connexions « Morse ».
 Comment[gl]=Interface de usuario de configuración personalizada da conta para contas que empreguen o xestor de conexións Morse.
 Comment[hu]=Egyedi beállítófelület a Morse kapcsolatkezelőt használó azonosítókhoz.
+Comment[ia]=Interfacie de usator pro configuration de conto personalisate pro contos usante le gerente de connexion Morse.
 Comment[it]=Interfaccia utente personalizzata di configurazione account per account che usano il gestore di connessioni Morse.
 Comment[ko]=Morse 연결 관리자를 사용하는 계정 설정 사용자 인터페이스입니다.
 Comment[nb]=Brukerflate for å sette opp egendefinerte kontoer ved bruk av Morse tilkoblingsbehandler.

-- 
ktp-accounts-kcm packaging



More information about the pkg-kde-commits mailing list