From f1bfb665bdff9ec63d682e4fca7122be3cf3d0ca Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 10 Oct 2019 09:07:52 +0200
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/systemtray/container/package/metadata.desktop         | 2 +-
 appmenu/appmenu.desktop                                       | 4 ++--
 .../applauncher/plasma-containmentactions-applauncher.desktop | 4 ++--
 .../applicationjobs/plasma-dataengine-applicationjobs.desktop | 4 ++--
 dataengines/apps/plasma-dataengine-apps.desktop               | 4 ++--
 .../notifications/plasma-dataengine-notifications.desktop     | 2 +-
 .../plasma-dataengine-statusnotifieritem.desktop              | 2 +-
 ktimezoned/ktimezoned.desktop                                 | 2 +-
 menu/desktop/kf5-games-arcade.directory                       | 2 +-
 menu/desktop/kf5-games-roguelikes.directory                   | 2 +-
 menu/desktop/kf5-internet-terminal.directory                  | 4 ++--
 menu/desktop/kf5-more.directory                               | 4 ++--
 menu/desktop/kf5-multimedia.directory                         | 2 +-
 menu/desktop/kf5-system-terminal.directory                    | 4 ++--
 phonon/platform_kde/phonon.notifyrc                           | 2 +-
 plasma-windowed/plasma-windowed.desktop                       | 2 +-
 runners/kill/plasma-runner-kill.desktop                       | 4 ++--
 runners/kill/plasma-runner-kill_config.desktop                | 2 +-
 runners/services/plasma-runner-services.desktop               | 2 +-
 19 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/applets/systemtray/container/package/metadata.desktop b/applets/systemtray/container/package/metadata.desktop
index 5b67970f0..77b232b54 100644
--- a/applets/systemtray/container/package/metadata.desktop
+++ b/applets/systemtray/container/package/metadata.desktop
@@ -105,7 +105,7 @@ Comment[fi]=Hae piilotettuja sovelluksia, jotka on pienennetty ilmoitusalueelle
 Comment[fr]=Accède aux applications cachées et réduites dans la boîte à miniatures
 Comment[fy]=Jou tagong ta programma's dy't yn it systeemfak rinne
 Comment[ga]=Rochtain feidhmchláir atá íoslaghdaithe i dtráidire an chórais
-Comment[gl]=Accede a aplicativos agochados minimizados na bandexa do sistema
+Comment[gl]=Accede a aplicacións agochadas minimizadas na bandexa do sistema
 Comment[gu]=સિસ્ટમ ટ્રેમાં નીચાં કરેલ છુપાયેલ કાર્યક્રમોને જુઓ
 Comment[he]=גישה ליישומים מוסתרים הממוזערים במגש המערכת
 Comment[hi]=तंत्र तश्तरी में न्यूनतम किए गए छुपे अनुप्रयोगों पर पहुँच
diff --git a/appmenu/appmenu.desktop b/appmenu/appmenu.desktop
index 8112e38d0..8f87ffad1 100644
--- a/appmenu/appmenu.desktop
+++ b/appmenu/appmenu.desktop
@@ -15,7 +15,7 @@ Name[et]=Rakenduste menüü deemon
 Name[eu]=Aplikazio-menuen daimona
 Name[fi]=Sovellusvalikkopalvelu
 Name[fr]=Démon de menus des applications
-Name[gl]=Servizo de menús do aplicativo
+Name[gl]=Servizo de menús da aplicación
 Name[he]=תהליך רקע של תפריט היישומים
 Name[hu]=Alkalmazás menük démon
 Name[ia]=Demone de menus de application
@@ -64,7 +64,7 @@ Comment[et]=Rakenduste menüü paigutamine töölauale
 Comment[eu]=Aplikazioen menua mahaigainera transferitzen du
 Comment[fi]=Siirtää sovelluksen valikon työpöydälle
 Comment[fr]=Transfère le menu des applications sur le bureau
-Comment[gl]=Transfire o menú do aplicativo ao escritorio
+Comment[gl]=Transfire o menú de aplicación ao escritorio
 Comment[he]=מעביר את התפריטים של היישום אל שולחן העבודה
 Comment[hu]=Átviszi az alkalmazás menüjét az asztalra
 Comment[ia]=Il transfere menu de applicationes al scriptorio
diff --git a/containmentactions/applauncher/plasma-containmentactions-applauncher.desktop b/containmentactions/applauncher/plasma-containmentactions-applauncher.desktop
index 4b34e2720..33c2c1639 100644
--- a/containmentactions/applauncher/plasma-containmentactions-applauncher.desktop
+++ b/containmentactions/applauncher/plasma-containmentactions-applauncher.desktop
@@ -25,7 +25,7 @@ Name[fi]=Sovelluskäynnistin
 Name[fr]=Lanceur d'application
 Name[fy]=In applikaashe starter
 Name[ga]=Tosaitheoir Feidhmchlár
-Name[gl]=Iniciador de aplicativos
+Name[gl]=Iniciador de aplicacións
 Name[gu]=કાર્યક્રમ ચલાવનાર
 Name[he]=משגר יישומים
 Name[hi]=अनुप्रयोग चालक
@@ -105,7 +105,7 @@ Comment[fi]=Yksinkertainen sovelluskäynnistin
 Comment[fr]=Lanceur simple d'application
 Comment[fy]=Ienfâldige applikaasje útfierder
 Comment[ga]=Tosaitheoir simplí feidhmchlár
-Comment[gl]=Iniciador simple de aplicativos
+Comment[gl]=Iniciador simple de aplicacións
 Comment[he]=משגר יישומים פשוט
 Comment[hi]=सरल अनुप्रयोग चालक
 Comment[hr]=Jednostavan pokretač aplikacija
diff --git a/dataengines/applicationjobs/plasma-dataengine-applicationjobs.desktop b/dataengines/applicationjobs/plasma-dataengine-applicationjobs.desktop
index 3d4b125f6..d2c149bb7 100644
--- a/dataengines/applicationjobs/plasma-dataengine-applicationjobs.desktop
+++ b/dataengines/applicationjobs/plasma-dataengine-applicationjobs.desktop
@@ -19,7 +19,7 @@ Name[fi]=Sovellustyötiedot
 Name[fr]=Informations sur les tâches d'applications en cours d'exécution
 Name[fy]=Programma taak ynformaasje
 Name[ga]=Eolas Faoi Jabanna Feidhmchláir
-Name[gl]=Información de tarefas de aplicativo
+Name[gl]=Información de tarefas de aplicación
 Name[gu]=કાર્યક્રમ કાર્ય માહિતી
 Name[he]=מידע אודות עבודת יישום
 Name[hi]=अनुप्रयोग कार्य जानकारी
@@ -86,7 +86,7 @@ Comment[eu]=Aplikazioko lanen eguneratzeak (kuiserver bidez)
 Comment[fi]=Sovellustyöpäivitykset (kuiserver-palvelimen kautta)
 Comment[fr]=Mise à jours des tâches d'application (via « kuiserver »)
 Comment[fy]=Applikaasje taak fernijing (mei kuiserver) 
-Comment[gl]=Actualización de tarefa do aplicativo (mediante kuiserver)
+Comment[gl]=Actualización de tarefa da aplicación (mediante kuiserver)
 Comment[he]=עידכוני עבודת יישום (באמצעות kuiserver)
 Comment[hr]=Ažuriranja poslova aplikacija (preko kuiservera)
 Comment[hu]=Feladatfrissítő (a kuiserveren keresztül)
diff --git a/dataengines/apps/plasma-dataengine-apps.desktop b/dataengines/apps/plasma-dataengine-apps.desktop
index cf0354418..d0bf8d7c9 100644
--- a/dataengines/apps/plasma-dataengine-apps.desktop
+++ b/dataengines/apps/plasma-dataengine-apps.desktop
@@ -19,7 +19,7 @@ Name[fi]=Sovellustiedot
 Name[fr]=Informations sur l'application
 Name[fy]=Applikaasje ynformaasje
 Name[ga]=Eolas faoi Fheidhmchláir
-Name[gl]=Información do aplicativo
+Name[gl]=Información da aplicación
 Name[gu]=કાર્યક્રમ માહિતી
 Name[he]=מידע אודות יישום
 Name[hi]=अनुप्रयोग जानकारी
@@ -81,7 +81,7 @@ Comment[eu]=Aplikazio-menuko aplikazio guztiei buruzko informazioa eta haien abi
 Comment[fi]=Tietoja ja kaikkien sovellusten käynnistäminen sovellusvalikossa.
 Comment[fr]=Informations et démarrage de toutes les applications du menu des applications.
 Comment[fy]=Ynformaasje en útfiere fan alle applikaasjes yn it app menu.
-Comment[gl]=Información e inicio de todos os aplicativos do menú.
+Comment[gl]=Información e inicio de todas as aplicacións do menú.
 Comment[he]=מידע והפעלה של כל היישומים בתפריט היישומים.
 Comment[hr]=Informacije i pokretanja od svih aplikacija u izborniku aplikacija.
 Comment[hu]=Az alkalmazásmenü alkalmazásainak indítása és jellemzőinek megjelenítése.
diff --git a/dataengines/notifications/plasma-dataengine-notifications.desktop b/dataengines/notifications/plasma-dataengine-notifications.desktop
index a368a5079..834375d50 100644
--- a/dataengines/notifications/plasma-dataengine-notifications.desktop
+++ b/dataengines/notifications/plasma-dataengine-notifications.desktop
@@ -22,7 +22,7 @@ Name[fi]=Sovellusilmoitukset
 Name[fr]=Notifications des applications
 Name[fy]=Applikaasje ntifikaasjes
 Name[ga]=Fógairtí Feidhmchláir
-Name[gl]=Notificacións dos aplicativos
+Name[gl]=Notificacións das aplicacións
 Name[gu]=કાર્યક્રમ નોંધણીઓ
 Name[he]=הודעות יישומים
 Name[hi]=अनुप्रयोग सूचनाएँ
diff --git a/dataengines/statusnotifieritem/plasma-dataengine-statusnotifieritem.desktop b/dataengines/statusnotifieritem/plasma-dataengine-statusnotifieritem.desktop
index dacfa52a3..c0bb3bd6b 100644
--- a/dataengines/statusnotifieritem/plasma-dataengine-statusnotifieritem.desktop
+++ b/dataengines/statusnotifieritem/plasma-dataengine-statusnotifieritem.desktop
@@ -72,7 +72,7 @@ Comment[et]=Rakenduse olekuteabe mootor Status Notifieri protokolli alusel.
 Comment[eu]=Aplikazioen egoerari buruzko informazioa emateko motorra, egoera-jakinarazlearen protokoloan oinarritua.
 Comment[fi]=Kone sovelusten tilatiedoille, perustuu tilailmoitinyhteyskäytäntöön.
 Comment[fr]=Moteur d'informations sur l'état des applications utilisant le protocole de notification d'état.
-Comment[gl]=Motor para información do estado dos aplicativos, baseado no protocolo Status Notifier.
+Comment[gl]=Motor para información do estado das aplicacións, baseado no protocolo Status Notifier.
 Comment[he]=מנוע עבור מידע אודות מצב של יישומים, המתבסס על הפרוטוקול של Status Notifier.
 Comment[hr]=Mehanizam za statusne informacije aplikacija baziran na protokolu glasnika stanja.
 Comment[hu]=Az állaporértesítés protokollon alapuló  modul az alkalmazások állapotértesítési információihoz.
diff --git a/ktimezoned/ktimezoned.desktop b/ktimezoned/ktimezoned.desktop
index 1859def97..7e3138cfb 100644
--- a/ktimezoned/ktimezoned.desktop
+++ b/ktimezoned/ktimezoned.desktop
@@ -94,7 +94,7 @@ Comment[fa]=منطقه زمانی سامانه را برای برنامه‌ها
 Comment[fi]=Tarjoaa järjestelmän aikavyöhyketiedon ohjelmille
 Comment[fr]=Fournit le fuseau horaire du système aux applications
 Comment[ga]=Soláthraíonn sé crios ama an chórais d'fheidhmchláir
-Comment[gl]=Fornece o fuso horario do sistema aos aplicativos
+Comment[gl]=Fornece o fuso horario do sistema ás aplicacións
 Comment[gu]=સિસ્ટમનો સમય વિસ્તાર કાર્યક્રમોને પૂરો પાડે છે
 Comment[he]=מספק את אזור הזמן של המערכת עבור יישומים
 Comment[hi]=अनुप्रयोगों को तंत्र का समय क्षेत्र उपलब्ध कराता है
diff --git a/menu/desktop/kf5-games-arcade.directory b/menu/desktop/kf5-games-arcade.directory
index 3a84918d9..04f9f74ce 100644
--- a/menu/desktop/kf5-games-arcade.directory
+++ b/menu/desktop/kf5-games-arcade.directory
@@ -86,7 +86,7 @@ Name[vi]=Mái vòm
 Name[wa]=Årcåde
 Name[xh]=Umqolo wesakhiwo esiphatha ubunzima bento
 Name[x-test]=xxArcadexx
-Name[zh_CN]=街机
+Name[zh_CN]=街机游戏
 Name[zh_TW]=大型遊戲機遊戲
 Icon=applications-games-arcade
 X-KDE-SuppressGenericNames=Game,Arcade Game
diff --git a/menu/desktop/kf5-games-roguelikes.directory b/menu/desktop/kf5-games-roguelikes.directory
index 93fc20fd8..08f56fdb0 100644
--- a/menu/desktop/kf5-games-roguelikes.directory
+++ b/menu/desktop/kf5-games-roguelikes.directory
@@ -85,5 +85,5 @@ Name[vi]=Trò chơi giống Rogue
 Name[wa]=Djeus ki rshonnèt-st a « rogue »
 Name[xh]=Imidlalo efana ne Rogue
 Name[x-test]=xxRogue-like Gamesxx
-Name[zh_CN]=恶作剧游戏
+Name[zh_CN]=地牢游戏
 Name[zh_TW]=冒險類遊戲
diff --git a/menu/desktop/kf5-internet-terminal.directory b/menu/desktop/kf5-internet-terminal.directory
index 664e01139..6bfb9c9e2 100644
--- a/menu/desktop/kf5-internet-terminal.directory
+++ b/menu/desktop/kf5-internet-terminal.directory
@@ -15,7 +15,7 @@ Name[et]=Terminalirakendused
 Name[eu]=Terminaleko aplikazioak
 Name[fi]=Päätesovellukset
 Name[fr]=Applications pour terminal
-Name[gl]=Aplicativos de terminal
+Name[gl]=Aplicacións de terminal
 Name[he]=ישומי טרמינל
 Name[hr]=Terminalske aplikacije
 Name[hu]=Parancsértelmezők
@@ -45,7 +45,7 @@ Name[sv]=Terminalprogram
 Name[tr]=Uçbirim Uygulamaları
 Name[uk]=Термінальні програми
 Name[x-test]=xxTerminal Applicationsxx
-Name[zh_CN]=终端应用程序
+Name[zh_CN]=终端应用
 Name[zh_TW]=終端機程式
 Icon=utilities-terminal
 Version=1.0
diff --git a/menu/desktop/kf5-more.directory b/menu/desktop/kf5-more.directory
index cacea9490..888518249 100644
--- a/menu/desktop/kf5-more.directory
+++ b/menu/desktop/kf5-more.directory
@@ -16,7 +16,7 @@ Name[et]=Muud rakendused
 Name[eu]=Aplikazio gehiago
 Name[fi]=Lisää sovelluksia
 Name[fr]=Plus d'applications
-Name[gl]=Máis aplicativos
+Name[gl]=Máis aplicacións
 Name[he]=עוד ישומים
 Name[hr]=Više aplikacija
 Name[hu]=További alkalmazások
@@ -47,5 +47,5 @@ Name[tg]=Барномаҳои бештар
 Name[tr]=Daha Fazla Uygulama
 Name[uk]=Інші програми
 Name[x-test]=xxMore Applicationsxx
-Name[zh_CN]=更多应用程序
+Name[zh_CN]=更多应用
 Name[zh_TW]=更多應用程式
diff --git a/menu/desktop/kf5-multimedia.directory b/menu/desktop/kf5-multimedia.directory
index 6f951eded..c24f5773a 100644
--- a/menu/desktop/kf5-multimedia.directory
+++ b/menu/desktop/kf5-multimedia.directory
@@ -90,7 +90,7 @@ Name[vi]=Nhạc/Ảnh
 Name[wa]=Multimedia
 Name[xh]=Iindlela ezininzi zokwenza
 Name[x-test]=xxMultimediaxx
-Name[zh_CN]=多媒体
+Name[zh_CN]=影音
 Name[zh_TW]=多媒體
 Icon=applications-multimedia
 
diff --git a/menu/desktop/kf5-system-terminal.directory b/menu/desktop/kf5-system-terminal.directory
index 664e01139..6bfb9c9e2 100644
--- a/menu/desktop/kf5-system-terminal.directory
+++ b/menu/desktop/kf5-system-terminal.directory
@@ -15,7 +15,7 @@ Name[et]=Terminalirakendused
 Name[eu]=Terminaleko aplikazioak
 Name[fi]=Päätesovellukset
 Name[fr]=Applications pour terminal
-Name[gl]=Aplicativos de terminal
+Name[gl]=Aplicacións de terminal
 Name[he]=ישומי טרמינל
 Name[hr]=Terminalske aplikacije
 Name[hu]=Parancsértelmezők
@@ -45,7 +45,7 @@ Name[sv]=Terminalprogram
 Name[tr]=Uçbirim Uygulamaları
 Name[uk]=Термінальні програми
 Name[x-test]=xxTerminal Applicationsxx
-Name[zh_CN]=终端应用程序
+Name[zh_CN]=终端应用
 Name[zh_TW]=終端機程式
 Icon=utilities-terminal
 Version=1.0
diff --git a/phonon/platform_kde/phonon.notifyrc b/phonon/platform_kde/phonon.notifyrc
index f88f95a1a..4b6979208 100644
--- a/phonon/platform_kde/phonon.notifyrc
+++ b/phonon/platform_kde/phonon.notifyrc
@@ -83,7 +83,7 @@ Name[et]=Rakendus
 Name[eu]=Aplikazioak
 Name[fi]=Sovellus
 Name[fr]=Application
-Name[gl]=Aplicativo
+Name[gl]=Aplicación
 Name[he]=יישומים
 Name[hr]=Aplikacija
 Name[hu]=Alkalmazás
diff --git a/plasma-windowed/plasma-windowed.desktop b/plasma-windowed/plasma-windowed.desktop
index b1f926e38..14c4c32b0 100755
--- a/plasma-windowed/plasma-windowed.desktop
+++ b/plasma-windowed/plasma-windowed.desktop
@@ -56,7 +56,7 @@ Comment[et]=Plasmoidide käivitamine tavaliste rakendustena
 Comment[eu]=Exekutatu Plasmoideak aplikazio arrunt gisa
 Comment[fi]=Suorita plasmoideja sovelluksina
 Comment[fr]=Lancer les plasmoïdes comme de simples applications
-Comment[gl]=Execute plasmoides como se fosen aplicativos sinxelos
+Comment[gl]=Execute plasmoides como se fosen aplicacións sinxelas
 Comment[hu]=Plazmoidok futtatása egyszerű alkalmazásként
 Comment[id]=Menjalankan Plasmoids sebagai aplikasi sederhana
 Comment[is]=Keyra Plasmíð sem einföld forrit
diff --git a/runners/kill/plasma-runner-kill.desktop b/runners/kill/plasma-runner-kill.desktop
index 87f685517..f14b79545 100644
--- a/runners/kill/plasma-runner-kill.desktop
+++ b/runners/kill/plasma-runner-kill.desktop
@@ -21,7 +21,7 @@ Name[fi]=Sovellusten lopetus
 Name[fr]=Terminer des applications
 Name[fy]=Programma's ôfbrekke
 Name[ga]=Scoir ó Fheidhmchláir
-Name[gl]=Terminar aplicativos
+Name[gl]=Terminar aplicacións
 Name[gu]=કાર્યક્રમો બંધ કરો
 Name[he]=סיום פעולת יישומים
 Name[hi]=अनुप्रयोग खतम करो
@@ -86,7 +86,7 @@ Comment[fi]=Pysäytä sovellukset, joita parhaillaan suoritetaan
 Comment[fr]=Arrête des applications en cours d'exécution
 Comment[fy]=Lit applikaasje dy't no rinne ophâlde
 Comment[ga]=Scoir ó fheidhmchláir atá ag rith faoi láthair
-Comment[gl]=Detén aplicativos que están a executarse
+Comment[gl]=Detén aplicacións que están a executarse
 Comment[he]=עצירת יישומים הפועלים כעת
 Comment[hr]=Zaustavi aplikacije koje su trenutno pokrenute
 Comment[hu]=Jelenleg futó alkalmazások leállítása
diff --git a/runners/kill/plasma-runner-kill_config.desktop b/runners/kill/plasma-runner-kill_config.desktop
index 7dcb9a6d1..6b4032d24 100644
--- a/runners/kill/plasma-runner-kill_config.desktop
+++ b/runners/kill/plasma-runner-kill_config.desktop
@@ -27,7 +27,7 @@ Name[fi]=Tuhoa sovellukset
 Name[fr]=Tuer des applications
 Name[fy]=Programma's ôfbrekke
 Name[ga]=Maraigh Feidhmchláir
-Name[gl]=Matar aplicativos
+Name[gl]=Matar aplicacións
 Name[gu]=કાર્યક્રમો બંધ કરો
 Name[he]=הריגת יישומים
 Name[hi]=अनुप्रयोग खतम करो
diff --git a/runners/services/plasma-runner-services.desktop b/runners/services/plasma-runner-services.desktop
index 7a5cce6d3..a3a65a4db 100644
--- a/runners/services/plasma-runner-services.desktop
+++ b/runners/services/plasma-runner-services.desktop
@@ -110,7 +110,7 @@ Comment[fi]=Etsi ohjelmat, asetukset ja palvelut
 Comment[fr]=Trouver des applications, des tableaux de bords et des services
 Comment[fy]=Sykje om applikaasjes, konfiguraasjemodules en tsjinsten
 Comment[ga]=Aimsigh feidhmchláir, painéil rialaithe agus seirbhísí
-Comment[gl]=Atopar aplicativos, paneis de control e servizos.
+Comment[gl]=Atopar aplicacións, paneis de control e servizos.
 Comment[gu]=કાર્યક્રમો, નિયંત્રણ પેનલો અને સેવાઓ શોધો
 Comment[he]=מצא קבצים הגדרות ושרותים
 Comment[hi]=अनुप्रयोग, नियंत्रण पटल तथा सेवाएँ ढूंढें