Commit 93ba9eaf authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent 7f67e3f0
Pipeline #67539 skipped
......@@ -2,6 +2,9 @@
Name=Documentation
Name[ca]=Documentació
Name[es]=Documentación
Name[fr]=Documentation
Name[nl]=Documentatie
Name[pt]=Documentação
Name[uk]=Документація
Name[x-test]=xxDocumentationxx
ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
......
......@@ -3,6 +3,9 @@
"Description": "A panel to display the official documentation of various backends",
"Description[ca]": "Un plafó per a mostrar la documentació oficial de diversos dorsals.",
"Description[es]": "Un panel para mostrar la documentación oficial de diversos motores",
"Description[fr]": "Un panneau pour afficher la documentation officielle des différents moteurs.",
"Description[nl]": "Een paneel voor de officiële documentatie van diverse backends",
"Description[pt]": "Um painel para mostrar a documentação oficial das várias infra-estruturas",
"Description[uk]": "Панель для показу офіційної документації до різних модулів обробки",
"Description[x-test]": "xxA panel to display the official documentation of various backendsxx",
"Icon": "",
......@@ -11,6 +14,9 @@
"Name": "Documentation",
"Name[ca]": "Documentació",
"Name[es]": "Documentación",
"Name[fr]": "Documentation",
"Name[nl]": "Documentatie",
"Name[pt]": "Documentação",
"Name[uk]": "Документація",
"Name[x-test]": "xxDocumentationxx",
"ServiceTypes": [
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment