[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:07:01 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=be4a1e0
The following commit has been merged in the master branch:
commit be4a1e050f07d787e6e2a8e4a0e4f9212da06f0b
Author: l10n daemon script <scripty at kde.org>
Date: Wed Dec 30 09:34:03 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"
---
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 78b8c54..0054c7e 100644
--- a/src/KCMTelepathyAccounts/ktpaccountskcminternal-accountuiplugin.desktop
+++ b/src/KCMTelepathyAccounts/ktpaccountskcminternal-accountuiplugin.desktop
@@ -23,7 +23,7 @@ Comment[it]=Estensioni di interfaccia utente di account per il modulo di configu
Comment[kk]=Telepathy KCM модуль тіркелгі пайдаланушы интерфейс плагиндері
Comment[km]=គណនី Telepathy នៃកម្មវិធីជំនួយចំណុចប្រទាក់អ្នកប្រើម៉ូឌុល KCM
Comment[ko]=Telepathy 계정 KCM 모듈 계정 사용자 인터페이스 플러그인
-Comment[lt]=Telepathy paskyros KCM modulis paskyros naudotojo sąsajos priedai
+Comment[lt]=Telepathy paskyros KCM modulis paskyros naudotojo sąsajos papildiniai
Comment[mr]=टेलिपथी खाते KCM विभाग खाते वापरकर्ता संवाद प्लगइन
Comment[nb]=Program tillegg for brukerflater til Telepathy-kontoer med KCM modulkonto
Comment[nds]=KCM-Moduul för Böversietmodulen vun Telepathy-Kontos
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list