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"
8 years ago · 738cc1d55f
parent 46bed4a478
commit 738cc1d55f
9 changed files with 14 additions and 0 deletions
--- a/src/plugins/KDESupport/metadata.desktop
+++ b/src/plugins/KDESupport/metadata.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=KDE Support
 Name[ca]=Suport pel KDE
+Name[ca@valencia]=Suport pel KDE
 Name[en_GB]=KDE Support
 Name[nl]=KDE ondersteuning
 Name[pt]=Suporte ao KDE
@ -8,6 +9,7 @@ Name[uk]=Підтримка KDE
 Name[x-test]=xxKDE Supportxx
 Comment=Provides support for KIO and storing passwords in KWallet
 Comment[ca]=Proporciona suport pel KIO i per emmagatzemar contrasenyes al KWallet
+Comment[ca@valencia]=Proporciona suport pel KIO i per emmagatzemar contrasenyes al KWallet
 Comment[en_GB]=Provides support for KIO and storing passwords in KWallet
 Comment[nl]=Biedt ondersteuning voor KIO en opslaan van wachtwoorden in KWallet
 Comment[pt]=Oferece o suporte para o KIO e para guardar as senhas no KWallet
--- a/src/scripts/runaction/actions/dictionary.desktop
+++ b/src/scripts/runaction/actions/dictionary.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Dictionary
 Name[ca]=Diccionari
+Name[ca@valencia]=Diccionari
 Name[en_GB]=Dictionary
 Name[fr]=Dictionnaire
 Name[nl]=Woordenboek
--- a/src/scripts/runaction/actions/googleimagesearch.desktop
+++ b/src/scripts/runaction/actions/googleimagesearch.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Google
 Name[ca]=Google
+Name[ca@valencia]=Google
 Name[en_GB]=Google
 Name[fr]=Google
 Name[nl]=Google
@ -11,6 +12,7 @@ Name[x-test]=xxGooglexx
 Name[zh_CN]=Google
 Comment=Search with...
 Comment[ca]=Cerca amb...
+Comment[ca@valencia]=Cerca amb...
 Comment[en_GB]=Search with...
 Comment[nl]=Zoeken met...
 Comment[pt]=Procurar com...
--- a/src/scripts/runaction/actions/mpv.desktop
+++ b/src/scripts/runaction/actions/mpv.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Open with mpv
 Name[ca]=Obre amb el «mpv»
+Name[ca@valencia]=Obri amb el «mpv»
 Name[en_GB]=Open with mpv
 Name[nl]=Met mpv openen
 Name[pt]=Abrir com o 'mpv'
--- a/src/scripts/runaction/actions/tineyeimagesearch.desktop
+++ b/src/scripts/runaction/actions/tineyeimagesearch.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=TinEye
 Name[ca]=TinEye
+Name[ca@valencia]=TinEye
 Name[en_GB]=TinEye
 Name[nl]=TinEye
 Name[pt]=TinEye
@ -9,6 +10,7 @@ Name[uk]=TinEye
 Name[x-test]=xxTinEyexx
 Comment=Search with...
 Comment[ca]=Cerca amb...
+Comment[ca@valencia]=Cerca amb...
 Comment[en_GB]=Search with...
 Comment[nl]=Zoeken met...
 Comment[pt]=Procurar com...
--- a/src/scripts/runaction/actions/translate.desktop
+++ b/src/scripts/runaction/actions/translate.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Translate page
 Name[ca]=Tradueix la pàgina
+Name[ca@valencia]=Tradueix la pàgina
 Name[en_GB]=Translate page
 Name[nl]=Pagina vertalen
 Name[pt]=Traduzir a página
--- a/src/scripts/runaction/actions/w3.desktop
+++ b/src/scripts/runaction/actions/w3.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Validate page
 Name[ca]=Valida la pàgina
+Name[ca@valencia]=Valida la pàgina
 Name[en_GB]=Validate page
 Name[nl]=Pagina valideren
 Name[pt]=Validar a página
--- a/src/scripts/runaction/actions/yandeximagesearch.desktop
+++ b/src/scripts/runaction/actions/yandeximagesearch.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Yandex
 Name[ca]=Yandex
+Name[ca@valencia]=Yandex
 Name[en_GB]=Yandex
 Name[nl]=Yandex
 Name[pt]=Yandex
@ -9,6 +10,7 @@ Name[uk]=Яндекс
 Name[x-test]=xxYandexxx
 Comment=Search with...
 Comment[ca]=Cerca amb...
+Comment[ca@valencia]=Cerca amb...
 Comment[en_GB]=Search with...
 Comment[nl]=Zoeken met...
 Comment[pt]=Procurar com...
--- a/src/scripts/runaction/metadata.desktop
+++ b/src/scripts/runaction/metadata.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Run Action
 Name[ca]=Executa una acció
+Name[ca@valencia]=Executa una acció
 Name[en_GB]=Run Action
 Name[nl]=Uitvoeractie
 Name[pt]=Executar uma Acção
@ -9,6 +10,7 @@ Name[uk]=Виконати дію
 Name[x-test]=xxRun Actionxx
 Comment=Run various actions on sites
 Comment[ca]=Executa diverses accions als llocs
+Comment[ca@valencia]=Executa diverses accions als llocs
 Comment[en_GB]=Run various actions on sites
 Comment[nl]=Verschillende acties op sites uitvoeren
 Comment[pt]=Executar várias acções sobre as páginas