[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=307c58f

The following commit has been merged in the master branch:
commit 307c58f21a348d0c5afa11983a1d27fb5dd02bfe
Author: l10n daemon script <scripty at kde.org>
Date:   Sat Jul 4 10:54:12 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"
---
 logviewer/config/kcm_ktp_logviewer_behavior.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/logviewer/config/kcm_ktp_logviewer_behavior.desktop b/logviewer/config/kcm_ktp_logviewer_behavior.desktop
index 0e004eb..71cf155 100644
--- a/logviewer/config/kcm_ktp_logviewer_behavior.desktop
+++ b/logviewer/config/kcm_ktp_logviewer_behavior.desktop
@@ -13,6 +13,7 @@ Categories=Qt;KDE;X-KDE-settings-network;
 
 Name=LogViewer Behavior
 Name[ar]=سلوك عارض السّجلّات
+Name[ast]=Comportamientu del visor de rexistros
 Name[bs]=Ponašanje preglednika dnevnika
 Name[ca]=Comportament del visor del registre
 Name[ca at valencia]=Comportament del visor del registre

-- 
ktp-text-ui packaging