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"
This commit is contained in:
l10n daemon script 2020-06-07 05:04:18 +02:00
parent a9f151947b
commit 6f39937e75
2 changed files with 7 additions and 0 deletions

View file

@ -6,6 +6,7 @@
"Name": "Aditya Mehra", "Name": "Aditya Mehra",
"Name[ca]": "Aditya Mehra", "Name[ca]": "Aditya Mehra",
"Name[cs]": "Aditya Mehra", "Name[cs]": "Aditya Mehra",
"Name[en_GB]": "Aditya Mehra",
"Name[et]": "Aditya Mehra", "Name[et]": "Aditya Mehra",
"Name[fr]": "Aditya Mehra", "Name[fr]": "Aditya Mehra",
"Name[it]": "Aditya Mehra", "Name[it]": "Aditya Mehra",
@ -15,6 +16,7 @@
"Name[pt]": "Aditya Mehra", "Name[pt]": "Aditya Mehra",
"Name[pt_BR]": "Aditya Mehra", "Name[pt_BR]": "Aditya Mehra",
"Name[sk]": "Aditya Mehra", "Name[sk]": "Aditya Mehra",
"Name[sv]": "Aditya Mehra",
"Name[uk]": "Aditya Mehra", "Name[uk]": "Aditya Mehra",
"Name[x-test]": "xxAditya Mehraxx" "Name[x-test]": "xxAditya Mehraxx"
} }
@ -22,6 +24,7 @@
"Description": "Bigscreen Plugin", "Description": "Bigscreen Plugin",
"Description[ca]": "Connector de la Bigscreen", "Description[ca]": "Connector de la Bigscreen",
"Description[cs]": "Modul pro velkou obrazovku", "Description[cs]": "Modul pro velkou obrazovku",
"Description[en_GB]": "Bigscreen Plugin",
"Description[et]": "Suurekraani plugin", "Description[et]": "Suurekraani plugin",
"Description[fr]": "Module externe « Bigscreen »", "Description[fr]": "Module externe « Bigscreen »",
"Description[it]": "Estensione Bigscreen", "Description[it]": "Estensione Bigscreen",
@ -31,6 +34,7 @@
"Description[pt]": "'Plugin' de Ecrã Grande", "Description[pt]": "'Plugin' de Ecrã Grande",
"Description[pt_BR]": "Plugin de tela grande", "Description[pt_BR]": "Plugin de tela grande",
"Description[sk]": "Doplnok veľkej obrazovky", "Description[sk]": "Doplnok veľkej obrazovky",
"Description[sv]": "Insticksprogram för storskärm",
"Description[uk]": "Додаток для великих екранів", "Description[uk]": "Додаток для великих екранів",
"Description[x-test]": "xxBigscreen Pluginxx", "Description[x-test]": "xxBigscreen Pluginxx",
"EnabledByDefault": true, "EnabledByDefault": true,
@ -40,6 +44,7 @@
"Name": "Bigscreen", "Name": "Bigscreen",
"Name[ca]": "Bigscreen", "Name[ca]": "Bigscreen",
"Name[cs]": "Velká obrazovka", "Name[cs]": "Velká obrazovka",
"Name[en_GB]": "Bigscreen",
"Name[et]": "Suurekraan", "Name[et]": "Suurekraan",
"Name[fr]": "Bigscreen", "Name[fr]": "Bigscreen",
"Name[it]": "Bigscreen", "Name[it]": "Bigscreen",
@ -49,6 +54,7 @@
"Name[pt]": "Ecrã grande", "Name[pt]": "Ecrã grande",
"Name[pt_BR]": "Tela grande", "Name[pt_BR]": "Tela grande",
"Name[sk]": "Veľká obrazovka", "Name[sk]": "Veľká obrazovka",
"Name[sv]": "Storskärm",
"Name[uk]": "Великий екран", "Name[uk]": "Великий екран",
"Name[x-test]": "xxBigscreenxx", "Name[x-test]": "xxBigscreenxx",
"ServiceTypes": [ "ServiceTypes": [

View file

@ -2,6 +2,7 @@
Name=KDE Connect URL Handler Name=KDE Connect URL Handler
Name[ca]=Gestor d'URL del KDE Connect Name[ca]=Gestor d'URL del KDE Connect
Name[cs]=Nástroj pro práci s URL v KDE Connect Name[cs]=Nástroj pro práci s URL v KDE Connect
Name[en_GB]=KDE Connect URL Handler
Name[es]=Controlador de URL de KDE Connect Name[es]=Controlador de URL de KDE Connect
Name[et]=KDE Connecti URL-ide käitleja Name[et]=KDE Connecti URL-ide käitleja
Name[fr]=Gestionnaire d'URL de KDE Connect Name[fr]=Gestionnaire d'URL de KDE Connect