Commit 58dca312 authored by Script Kiddy's avatar Script Kiddy

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 118d91ae
...@@ -3,7 +3,7 @@ Name=KDE Connect Indicator ...@@ -3,7 +3,7 @@ Name=KDE Connect Indicator
Name[ast]=Indicador de KDE Connnect Name[ast]=Indicador de KDE Connnect
Name[ca]=Indicador del KDE Connect Name[ca]=Indicador del KDE Connect
Name[ca@valencia]=Indicador del KDE Connect Name[ca@valencia]=Indicador del KDE Connect
Name[cs]=Indikátor KDE Connect Name[cs]=Ukazatel KDE Connect
Name[da]=KDE Connect-indikator Name[da]=KDE Connect-indikator
Name[de]=KDE-Connect-Anzeige Name[de]=KDE-Connect-Anzeige
Name[el]=Εφαρμογή ένδειξης KDE Connect Name[el]=Εφαρμογή ένδειξης 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