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 02:36:34 +01:00 · 2018-03-22 05:17:51 +01:00 · 2018-03-22 05:17:51 +01:00 · 91059a3fb3
commit 91059a3fb3
parent 34550e08f1
16 changed files with 20 additions and 0 deletions
--- a/src/plugins/GreaseMonkey/metadata.desktop
+++ b/src/plugins/GreaseMonkey/metadata.desktop
@ -2,6 +2,7 @@
 Name=GreaseMonkey
 Name[ca]=GreaseMonkey
 Name[ca@valencia]=GreaseMonkey
 Name[de]=GreaseMonkey
 Name[en_GB]=GreaseMonkey
 Name[fi]=GreaseMonkey
 Name[fr]=GreaseMonkey
--- a/src/plugins/KDESupport/metadata.desktop
+++ b/src/plugins/KDESupport/metadata.desktop
@ -5,6 +5,7 @@ Name[ca@valencia]=Suport pel KDE
 Name[en_GB]=KDE Support
 Name[nl]=KDE ondersteuning
 Name[pt]=Suporte ao KDE
 Name[sv]=KDE-stöd
 Name[uk]=Підтримка KDE
 Name[x-test]=xxKDE Supportxx
 Comment=Provides support for KIO and storing passwords in KWallet
@ -13,6 +14,7 @@ Comment[ca@valencia]=Proporciona suport pel KIO i per emmagatzemar contrasenyes
 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
 Comment[sv]=Tillhandahåller stöd KIO och för att lagra lösenord i plånboken
 Comment[uk]=Забезпечує підтримку засобів введення-виведення KIO і зберігання паролів у KWallet
 Comment[x-test]=xxProvides support for KIO and storing passwords in KWalletxx
--- a/src/plugins/MouseGestures/metadata.desktop
+++ b/src/plugins/MouseGestures/metadata.desktop
@ -2,6 +2,7 @@
 Name=Mouse Gestures
 Name[ca]=Gestos del ratolí
 Name[ca@valencia]=Gestos del ratolí
 Name[de]=Maus-Gesten
 Name[en_GB]=Mouse Gestures
 Name[fi]=Hiirieleet
 Name[it]=Gesti del mouse
--- a/src/plugins/PIM/metadata.desktop
+++ b/src/plugins/PIM/metadata.desktop
@ -2,6 +2,7 @@
 Name=PIM
 Name[ca]=PIM
 Name[ca@valencia]=PIM
 Name[de]=PIM
 Name[en_GB]=PIM
 Name[fi]=Henkilökohtainen ajanhallinta
 Name[fr]=PIM
--- a/src/plugins/StatusBarIcons/metadata.desktop
+++ b/src/plugins/StatusBarIcons/metadata.desktop
@ -2,6 +2,7 @@
 Name=StatusBar Icons
 Name[ca]=Icones de la barra d'estat
 Name[ca@valencia]=Icones de la barra d'estat
 Name[de]=Statusleisten-Symbole
 Name[en_GB]=StatusBar Icons
 Name[fi]=Tilarivin kuvakkeet
 Name[it]=Icone della barra di stato
--- a/src/plugins/TabManager/metadata.desktop
+++ b/src/plugins/TabManager/metadata.desktop
@ -2,6 +2,7 @@
 Name=Tab Manager
 Name[ca]=Gestor de pestanyes
 Name[ca@valencia]=Gestor de pestanyes
 Name[de]=Unterfensterverwaltung
 Name[en_GB]=Tab Manager
 Name[fi]=Välilehtien hallinta
 Name[it]=Gestore delle schede
--- 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[de]=Wörterbuch
 Name[en_GB]=Dictionary
 Name[fr]=Dictionnaire
 Name[nl]=Woordenboek
--- 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[de]=Google
 Name[en_GB]=Google
 Name[fr]=Google
 Name[nl]=Google
@ -13,6 +14,7 @@ Name[zh_CN]=Google
 Comment=Search with...
 Comment[ca]=Cerca amb...
 Comment[ca@valencia]=Cerca amb...
 Comment[de]=Suchen mit ...
 Comment[en_GB]=Search with...
 Comment[nl]=Zoeken met...
 Comment[pt]=Procurar com...
--- 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[de]=TinEye
 Name[en_GB]=TinEye
 Name[nl]=TinEye
 Name[pt]=TinEye
@ -11,6 +12,7 @@ Name[x-test]=xxTinEyexx
 Comment=Search with...
 Comment[ca]=Cerca amb...
 Comment[ca@valencia]=Cerca amb...
 Comment[de]=Suchen mit ...
 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
@ -2,6 +2,7 @@
 Name=Translate page
 Name[ca]=Tradueix la pàgina
 Name[ca@valencia]=Tradueix la pàgina
 Name[de]=Seite übersetzen
 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
@ -2,6 +2,7 @@
 Name=Validate page
 Name[ca]=Valida la pàgina
 Name[ca@valencia]=Valida la pàgina
 Name[de]=Seite überprüfen
 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
@ -2,6 +2,7 @@
 Name=Yandex
 Name[ca]=Yandex
 Name[ca@valencia]=Yandex
 Name[de]=Yandex
 Name[en_GB]=Yandex
 Name[nl]=Yandex
 Name[pt]=Yandex
@ -11,6 +12,7 @@ Name[x-test]=xxYandexxx
 Comment=Search with...
 Comment[ca]=Cerca amb...
 Comment[ca@valencia]=Cerca amb...
 Comment[de]=Suchen mit ...
 Comment[en_GB]=Search with...
 Comment[nl]=Zoeken met...
 Comment[pt]=Procurar com...
--- a/themes/chrome/metadata.desktop
+++ b/themes/chrome/metadata.desktop
@ -2,6 +2,7 @@
 Name=Chrome
 Name[ca]=Chrome
 Name[ca@valencia]=Chrome
 Name[de]=Chrome
 Name[en_GB]=Chrome
 Name[fi]=Chrome
 Name[it]=Chrome
--- a/themes/linux/metadata.desktop
+++ b/themes/linux/metadata.desktop
@ -2,6 +2,7 @@
 Name=Linux
 Name[ca]=Linux
 Name[ca@valencia]=Linux
 Name[de]=Linux
 Name[en_GB]=Linux
 Name[fi]=Linux
 Name[it]=Linux
--- a/themes/mac/metadata.desktop
+++ b/themes/mac/metadata.desktop
@ -2,6 +2,7 @@
 Name=Mac
 Name[ca]=Mac
 Name[ca@valencia]=Mac
 Name[de]=Mac
 Name[en_GB]=Mac
 Name[fi]=Mac
 Name[it]=Mac
--- a/themes/windows/metadata.desktop
+++ b/themes/windows/metadata.desktop
@ -2,6 +2,7 @@
 Name=Windows
 Name[ca]=Windows
 Name[ca@valencia]=Windows
 Name[de]=Windows
 Name[en_GB]=Windows
 Name[fi]=Windows
 Name[it]=Windows