Commit afb8e4e8 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 c74fbacc
Pipeline #27385 skipped
...@@ -3,6 +3,7 @@ Name=KDE Connect URL Handler ...@@ -3,6 +3,7 @@ Name=KDE Connect URL Handler
Name[ca]=Gestor d'URL del KDE Connect Name[ca]=Gestor d'URL del KDE Connect
Name[ca@valencia]=Gestor d'URL del KDE Connect Name[ca@valencia]=Gestor d'URL del KDE Connect
Name[fr]=Gestionnaire d'URL de KDE Connect Name[fr]=Gestionnaire d'URL de KDE Connect
Name[it]=Gestore URL di KDE Connect
Name[nl]=URL behandelaar van KDE-Connect Name[nl]=URL behandelaar van KDE-Connect
Name[nn]=KDE Connect adressehandsamar Name[nn]=KDE Connect adressehandsamar
Name[pt]=Tratamento de URL's do KDE Connect Name[pt]=Tratamento de URL's do KDE Connect
......
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