[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:15:25 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=bdb7f98
The following commit has been merged in the master branch:
commit bdb7f98c6f6093b724e58d232af73596d26c6131
Author: l10n daemon script <scripty at kde.org>
Date: Sun Jul 5 10:01:02 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"
---
org.kde.ktpcontactlist.desktop | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/org.kde.ktpcontactlist.desktop b/org.kde.ktpcontactlist.desktop
index 06d7133..b24ccf3 100644
--- a/org.kde.ktpcontactlist.desktop
+++ b/org.kde.ktpcontactlist.desktop
@@ -23,7 +23,7 @@ Name[nds]=KN-Kontakten
Name[nl]=IM-contactpersonen
Name[pl]=Kontakty komunikatorów internetowych
Name[pt]=Contactos de MI
-Name[pt_BR]=Contatos de mensagens instantâneas
+Name[pt_BR]=Contatos de Mensagens Instantâneas
Name[ro]=Contacte de MI
Name[ru]=Список контактов
Name[sk]=IM kontakty
--
ktp-contact-list packaging
More information about the pkg-kde-commits
mailing list