Commit 7f37d793 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 8525f07c
......@@ -22,7 +22,7 @@ Name[pl]=Wskaźnik KDE Connect
Name[pt]=Indicador do KDE Connect
Name[pt_BR]=Indicador do KDE Connect
Name[ru]=Индикатор KDE Connect
Name[sk]=Ukozaovateľ KDE Connect
Name[sk]=KDE Connect Indikátor
Name[sr]=КДЕ‑конекцијин показатељ
Name[sr@ijekavian]=КДЕ‑конекцијин показатељ
Name[sr@ijekavianlatin]=KDE‑konekcijin pokazatelj
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