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"
2024-12-20 18:56:34 +01:00 · 2019-05-04 08:50:18 +02:00 · 2019-05-04 08:50:18 +02:00 · 8393f62ad4
commit 8393f62ad4
parent 5614a32d5c
11 changed files with 18 additions and 0 deletions
--- a/src/plugins/KDEFrameworksIntegration/metadata.desktop
+++ b/src/plugins/KDEFrameworksIntegration/metadata.desktop
@ -2,6 +2,7 @@
 Name=KDE Frameworks Integration
 Name[ca]=Integració amb els Frameworks del KDE
 Name[ca@valencia]=Integració amb els Frameworks del KDE
 Name[cs]=Integrace KDE Frameworks
 Name[en_GB]=KDE Frameworks Integration
 Name[es]=Integración con la infraestructura de KDE
 Name[fi]=KDE Frameworks -integrointi
@ -22,6 +23,7 @@ Name[zh_TW]=KDE Frameworks 整合
 Comment=Provides support for KIO and storing passwords in KWallet
 Comment[ca]=Proporciona suport pel KIO i per emmagatzemar les contrasenyes al KWallet
 Comment[ca@valencia]=Proporciona suport pel KIO i per emmagatzemar les contrasenyes al KWallet
 Comment[cs]=Poskytuje podporu pro KIO a ukládání hesel v Kwallet
 Comment[en_GB]=Provides support for KIO and storing passwords in KWallet
 Comment[es]=Implementa KIO y almacenamiento de contraseñas en KWallet
 Comment[fi]=Tarjoaa KIO-tuen sekä salasanojen tallentamisen KWalletiin
--- a/src/scripts/helloqml/metadata.desktop
+++ b/src/scripts/helloqml/metadata.desktop
@ -2,6 +2,7 @@
 Name=Hello Qml
 Name[ca]=Hola QML
 Name[ca@valencia]=Hola QML
 Name[cs]=Ahoj QML
 Name[en_GB]=Hello QML
 Name[es]=Hola Qml
 Name[fi]=Hei QML
@ -22,6 +23,7 @@ Name[zh_TW]=嗨 QML
 Comment=Sample Qml Plugin
 Comment[ca]=Connector QML d'exemple
 Comment[ca@valencia]=Connector QML d'exemple
 Comment[cs]=Ukázkový modul QML
 Comment[en_GB]=Sample QML Plugin
 Comment[es]=Complemento de ejemplo de Qml
 Comment[fi]=Esimerkki-QML-liitännäinen
--- a/src/scripts/middleclickloader/metadata.desktop
+++ b/src/scripts/middleclickloader/metadata.desktop
@ -2,6 +2,7 @@
 Name=MiddleClickLoader
 Name[ca]=MiddleClickLoader
 Name[ca@valencia]=MiddleClickLoader
 Name[cs]=Načtení prostředním tlačítkem myši
 Name[en_GB]=MiddleClickLoader
 Name[es]=Cargador de clic central
 Name[fi]=Keskipainikelatain
@ -22,6 +23,7 @@ Name[zh_TW]=MiddleClickLoader
 Comment=Load text in selection clipboard as URL
 Comment[ca]=Carrega text com a URL en una selecció del porta-retalls
 Comment[ca@valencia]=Carrega text com a URL en una selecció del porta-retalls
 Comment[cs]=Načíst text ve schránce výběru jako URL
 Comment[en_GB]=Load text in selection clipboard as URL
 Comment[es]=Cargar texto seleccionado en el portapapeles como URL
 Comment[fi]=Lataa leikepöytävalinnan tekstin verkko-osoitteeksi
--- a/src/scripts/runaction/actions/dictionary.desktop
+++ b/src/scripts/runaction/actions/dictionary.desktop
@ -2,6 +2,7 @@
 Name=Dictionary
 Name[ca]=Diccionari
 Name[ca@valencia]=Diccionari
 Name[cs]=Slovník
 Name[de]=Wörterbuch
 Name[en_GB]=Dictionary
 Name[es]=Diccionario
--- a/src/scripts/runaction/actions/googleimagesearch.desktop
+++ b/src/scripts/runaction/actions/googleimagesearch.desktop
@ -2,6 +2,7 @@
 Name=Google
 Name[ca]=Google
 Name[ca@valencia]=Google
 Name[cs]=Google
 Name[de]=Google
 Name[en_GB]=Google
 Name[es]=Google
@ -23,6 +24,7 @@ Name[zh_TW]=Google
 Comment=Search with...
 Comment[ca]=Cerca amb...
 Comment[ca@valencia]=Cerca amb...
 Comment[cs]=Hledat pomocí...
 Comment[de]=Suchen mit ...
 Comment[en_GB]=Search with...
 Comment[es]=Buscar con...
--- a/src/scripts/runaction/actions/mpv.desktop
+++ b/src/scripts/runaction/actions/mpv.desktop
@ -2,6 +2,7 @@
 Name=Open with mpv
 Name[ca]=Obre amb el «mpv»
 Name[ca@valencia]=Obri amb el «mpv»
 Name[cs]=Otevřít pomocí mpv
 Name[en_GB]=Open with mpv
 Name[es]=Abrir con mpv
 Name[fi]=Avaa mpv:hen
--- a/src/scripts/runaction/actions/tineyeimagesearch.desktop
+++ b/src/scripts/runaction/actions/tineyeimagesearch.desktop
@ -2,6 +2,7 @@
 Name=TinEye
 Name[ca]=TinEye
 Name[ca@valencia]=TinEye
 Name[cs]=TinEye
 Name[de]=TinEye
 Name[en_GB]=TinEye
 Name[es]=TinEye
@ -23,6 +24,7 @@ Name[zh_TW]=TinEye
 Comment=Search with...
 Comment[ca]=Cerca amb...
 Comment[ca@valencia]=Cerca amb...
 Comment[cs]=Hledat pomocí...
 Comment[de]=Suchen mit ...
 Comment[en_GB]=Search with...
 Comment[es]=Buscar con...
--- a/src/scripts/runaction/actions/translate.desktop
+++ b/src/scripts/runaction/actions/translate.desktop
@ -2,6 +2,7 @@
 Name=Translate page
 Name[ca]=Tradueix la pàgina
 Name[ca@valencia]=Tradueix la pàgina
 Name[cs]=Přeložit stránku
 Name[de]=Seite übersetzen
 Name[en_GB]=Translate page
 Name[es]=Traducir página
--- a/src/scripts/runaction/actions/w3.desktop
+++ b/src/scripts/runaction/actions/w3.desktop
@ -2,6 +2,7 @@
 Name=Validate page
 Name[ca]=Valida la pàgina
 Name[ca@valencia]=Valida la pàgina
 Name[cs]=Ověřit stránku
 Name[de]=Seite überprüfen
 Name[en_GB]=Validate page
 Name[es]=Validar página
--- a/src/scripts/runaction/actions/yandeximagesearch.desktop
+++ b/src/scripts/runaction/actions/yandeximagesearch.desktop
@ -2,6 +2,7 @@
 Name=Yandex
 Name[ca]=Yandex
 Name[ca@valencia]=Yandex
 Name[cs]=Yandex
 Name[de]=Yandex
 Name[en_GB]=Yandex
 Name[es]=Yandex
@ -23,6 +24,7 @@ Name[zh_TW]=Yandex
 Comment=Search with...
 Comment[ca]=Cerca amb...
 Comment[ca@valencia]=Cerca amb...
 Comment[cs]=Hledat pomocí...
 Comment[de]=Suchen mit ...
 Comment[en_GB]=Search with...
 Comment[es]=Buscar con...
--- a/src/scripts/runaction/metadata.desktop
+++ b/src/scripts/runaction/metadata.desktop
@ -2,6 +2,7 @@
 Name=Run Action
 Name[ca]=Executa una acció
 Name[ca@valencia]=Executa una acció
 Name[cs]=Spustit činnost
 Name[en_GB]=Run Action
 Name[es]=Ejecutar acción
 Name[fi]=Suorita toiminto
@ -22,6 +23,7 @@ Name[zh_TW]=執行動作
 Comment=Run various actions on sites
 Comment[ca]=Executa diverses accions als llocs
 Comment[ca@valencia]=Executa diverses accions als llocs
 Comment[cs]=Spouštět různé činnosti na stránkách
 Comment[en_GB]=Run various actions on sites
 Comment[es]=Ejecutar varias acciones en sitios
 Comment[fi]=Suorita eri toimintoja sivustoilla