From 4448caacaa63c66c948e4f0d509731b948c7b2f7 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 5 Jan 2017 05:58:54 +0100
Subject: [PATCH] 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"
---
 applets/activities/metadata.desktop              | 2 ++
 applets/clock/metadata.desktop                   | 2 ++
 applets/notifications/metadata.desktop           | 2 ++
 containments/homescreen/package/metadata.desktop | 1 +
 containments/panel/metadata.desktop              | 1 +
 containments/taskpanel/package/metadata.desktop  | 1 +
 dialer/package/metadata.desktop                  | 2 ++
 dialer/src/plasma_dialer.notifyrc                | 5 +++++
 kwinmultitasking/metadata.desktop                | 2 ++
 look-and-feel/metadata.desktop                   | 3 +++
 phonebook/metadata.desktop                       | 1 +
 shell/metadata.desktop                           | 1 +
 wallpaper/metadata.desktop                       | 1 +
 13 files changed, 24 insertions(+)

diff --git a/applets/activities/metadata.desktop b/applets/activities/metadata.desktop
index a739ed4e..c0d7a82d 100644
--- a/applets/activities/metadata.desktop
+++ b/applets/activities/metadata.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Phone Activities
+Name[ast]=Actividaes del teléfonu
 Name[ca]=Activitats del telèfon
 Name[ca@valencia]=Activitats del telèfon
 Name[cs]=Aktivity telefonu
@@ -17,6 +18,7 @@ Name[x-test]=xxPhone Activitiesxx
 Name[zh_TW]=手機活動
 
 Comment=Activity switcher for the phone
+Comment[ast]=Conmutador d'actividaes pal teléfonu
 Comment[ca]=Commutador de l'activitat per al telèfon
 Comment[ca@valencia]=Commutador de l'activitat per al telèfon
 Comment[cs]=Přepínač aktivit pro telefon
diff --git a/applets/clock/metadata.desktop b/applets/clock/metadata.desktop
index f647e9a6..a59f2c49 100644
--- a/applets/clock/metadata.desktop
+++ b/applets/clock/metadata.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Clock
+Name[ast]=Reló
 Name[ca]=Rellotge
 Name[ca@valencia]=Rellotge
 Name[cs]=Hodiny
@@ -17,6 +18,7 @@ Name[x-test]=xxClockxx
 Name[zh_TW]=時鐘
 
 Comment=Time displayed in a digital format
+Comment[ast]=Hora amosada en formatu dixital
 Comment[ca]=Mostra l'hora en un format digital
 Comment[ca@valencia]=Mostra l'hora en un format digital
 Comment[cs]=Čas zobrazený v digitální podobě
diff --git a/applets/notifications/metadata.desktop b/applets/notifications/metadata.desktop
index 40826b9f..366a2efc 100644
--- a/applets/notifications/metadata.desktop
+++ b/applets/notifications/metadata.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Notifications
+Name[ast]=Avisos
 Name[ca]=Notificacions
 Name[ca@valencia]=Notificacions
 Name[cs]=Oznamování
@@ -16,6 +17,7 @@ Name[uk]=Сповіщення
 Name[x-test]=xxNotificationsxx
 Name[zh_TW]=通知
 Comment=Display notifications and jobs
+Comment[ast]=Amuesa avisos y trabayos
 Comment[ca]=Mostra les notificacions i els treballs
 Comment[ca@valencia]=Mostra les notificacions i els treballs
 Comment[cs]=Oznámení a úlohy
diff --git a/containments/homescreen/package/metadata.desktop b/containments/homescreen/package/metadata.desktop
index 0da80159..9547e7a4 100644
--- a/containments/homescreen/package/metadata.desktop
+++ b/containments/homescreen/package/metadata.desktop
@@ -2,6 +2,7 @@
 Encoding=UTF-8
 Keywords=
 Name=Phone Homescreen
+Name[ast]=Pantalla d'aniciu del teléfonu
 Name[ca]=Pantalla d'inici del telèfon
 Name[ca@valencia]=Pantalla d'inici del telèfon
 Name[cs]=Domácí obrazovka telefonu
diff --git a/containments/panel/metadata.desktop b/containments/panel/metadata.desktop
index 7b698e90..2a3e2819 100644
--- a/containments/panel/metadata.desktop
+++ b/containments/panel/metadata.desktop
@@ -2,6 +2,7 @@
 Encoding=UTF-8
 Keywords=
 Name=Phone Panel
+Name[ast]=Panel del teléfonu
 Name[ca]=Plafó del telèfon
 Name[ca@valencia]=Plafó del telèfon
 Name[cs]=Panel telefonu
diff --git a/containments/taskpanel/package/metadata.desktop b/containments/taskpanel/package/metadata.desktop
index 478b29fb..5e957e1f 100644
--- a/containments/taskpanel/package/metadata.desktop
+++ b/containments/taskpanel/package/metadata.desktop
@@ -2,6 +2,7 @@
 Encoding=UTF-8
 Keywords=
 Name=Phone Task panel
+Name[ast]=Panel de xeres del teléfonu
 Name[ca]=Plafó de tasques del telèfon
 Name[ca@valencia]=Plafó de tasques del telèfon
 Name[en_GB]=Phone Task panel
diff --git a/dialer/package/metadata.desktop b/dialer/package/metadata.desktop
index e41b1352..9b79757c 100644
--- a/dialer/package/metadata.desktop
+++ b/dialer/package/metadata.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Comment=Plasma phone dialer
+Comment[ast]=Marcador Plasma del teléfonu
 Comment[ca]=Marcador del telèfon del Plasma
 Comment[ca@valencia]=Marcador del telèfon del Plasma
 Comment[en_GB]=Plasma phone dialer
@@ -15,6 +16,7 @@ Comment[zh_TW]=Plasma 手機撥號程式
 Encoding=UTF-8
 Keywords=
 Name=Phone
+Name[ast]=Teléfonu
 Name[ca]=Telèfon
 Name[ca@valencia]=Telèfon
 Name[cs]=Telefon
diff --git a/dialer/src/plasma_dialer.notifyrc b/dialer/src/plasma_dialer.notifyrc
index ff692bb1..6ef40cdc 100644
--- a/dialer/src/plasma_dialer.notifyrc
+++ b/dialer/src/plasma_dialer.notifyrc
@@ -1,6 +1,7 @@
 [Global]
 IconName=call-start
 Comment=Phone
+Comment[ast]=Teléfonu
 Comment[ca]=Telèfon
 Comment[ca@valencia]=Telèfon
 Comment[cs]=Telefon
@@ -18,6 +19,7 @@ Comment[zh_TW]=電話
 
 [Event/callMissed]
 Name=Missed Call
+Name[ast]=Llamada perdida
 Name[ca]=Trucada perduda
 Name[ca@valencia]=Trucada perduda
 Name[cs]=Zmeškaný hovor
@@ -33,6 +35,7 @@ Name[uk]=Пропущений дзвінок
 Name[x-test]=xxMissed Callxx
 Name[zh_TW]=錯過的來電
 Comment=A call has been missed
+Comment[ast]=Perdióse una llamada
 Comment[ca]=S'ha perdut una trucada
 Comment[ca@valencia]=S'ha perdut una trucada
 Comment[de]=Ein Anruf wurde verpasst
@@ -50,6 +53,7 @@ Action=Popup
 
 [Event/ringing]
 Name=Ringing
+Name[ast]=Sonando
 Name[ca]=Sonant...
 Name[ca@valencia]=Sonant...
 Name[cs]=Zvoní
@@ -65,6 +69,7 @@ Name[uk]=Дзвінок
 Name[x-test]=xxRingingxx
 Name[zh_TW]=響鈴中
 Comment=The phone is ringing
+Comment[ast]=El teléfonu ta sonando
 Comment[ca]=El telèfon està sonant
 Comment[ca@valencia]=El telèfon està sonant
 Comment[cs]=Telefon zvoní
diff --git a/kwinmultitasking/metadata.desktop b/kwinmultitasking/metadata.desktop
index 61e08bb5..76a24958 100644
--- a/kwinmultitasking/metadata.desktop
+++ b/kwinmultitasking/metadata.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Phone multitask
+Name[ast]=Multi-xera del teléfonu
 Name[ca]=Multitasca del telèfon
 Name[ca@valencia]=Multitasca del telèfon
 Name[en_GB]=Phone multitask
@@ -13,6 +14,7 @@ Name[uk]=Багатозадачний телефон
 Name[x-test]=xxPhone multitaskxx
 Name[zh_TW]=手機多工
 Comment=Multitasking user interface for Phone devices
+Comment[ast]=Interfaz multi-xera d'usuariu pa teléfonos
 Comment[ca]=Interfície d'usuari multitasca per als dispositius de telèfon
 Comment[ca@valencia]=Interfície d'usuari multitasca per als dispositius de telèfon
 Comment[en_GB]=Multitasking user interface for Phone devices
diff --git a/look-and-feel/metadata.desktop b/look-and-feel/metadata.desktop
index 07c26d05..cbd5737b 100644
--- a/look-and-feel/metadata.desktop
+++ b/look-and-feel/metadata.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Plasma Phone
+Name[ast]=Marcador Plasma del teléfonu
 Name[ca]=Telèfon del Plasma
 Name[ca@valencia]=Telèfon del Plasma
 Name[cs]=Plasma Phone
@@ -14,6 +15,7 @@ Name[uk]=Телефон Плазми
 Name[x-test]=xxPlasma Phonexx
 Name[zh_TW]=Plasma 電話
 Comment=Plasma workspace for smartphones
+Comment[ast]=Estaya de trabayu Plasma pa teléfonos intelixentes
 Comment[ca]=Espai de treball del plasma per a telèfons intel·ligents
 Comment[ca@valencia]=Espai de treball del plasma per a telèfons intel·ligents
 Comment[en_GB]=Plasma workspace for smartphones
@@ -27,6 +29,7 @@ Comment[uk]=Робочий простір Плазми для смартфоні
 Comment[x-test]=xxPlasma workspace for smartphonesxx
 Comment[zh_TW]=智慧型手機的 Plasma 工作空間
 Keywords=Phone, Workspace, Look and Feel
+Keywords[ast]=Teléfonu, Phone, Estaya de trabayu, Aspeutu y sentir
 Keywords[ca]=Telèfon, Espai de treball, Aspecte i comportament
 Keywords[ca@valencia]=Telèfon, Espai de treball, Aspecte i comportament
 Keywords[en_GB]=Phone, Workspace, Look and Feel
diff --git a/phonebook/metadata.desktop b/phonebook/metadata.desktop
index 8b59259d..0c2497f2 100644
--- a/phonebook/metadata.desktop
+++ b/phonebook/metadata.desktop
@@ -3,6 +3,7 @@ Comment=
 Encoding=UTF-8
 Keywords=
 Name=Phonebook
+Name[ast]=Axenda telefónica
 Name[ca]=Guia telefònica
 Name[ca@valencia]=Guia telefònica
 Name[de]=Telefonbuch
diff --git a/shell/metadata.desktop b/shell/metadata.desktop
index 7604e03c..a3e69f50 100644
--- a/shell/metadata.desktop
+++ b/shell/metadata.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Phone
+Name[ast]=Teléfonu
 Name[ca]=Telèfon
 Name[ca@valencia]=Telèfon
 Name[cs]=Telefon
diff --git a/wallpaper/metadata.desktop b/wallpaper/metadata.desktop
index 879eac3a..7b1b19ed 100644
--- a/wallpaper/metadata.desktop
+++ b/wallpaper/metadata.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Plasma Phone Lockers
+Name[ast]=Bloquiadores de Plasma Phone
 Name[ca]=Bloqueigs del telèfon del Plasma
 Name[ca@valencia]=Bloqueigs del telèfon del Plasma
 Name[en_GB]=Plasma Phone Lockers