Commit 8b312b3d 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 bd90e200
Pipeline #163866 skipped
......@@ -51,7 +51,7 @@ Comment[pt]=Este 'plugin' adiciona muitas funções para cadeias de caracteres.
Comment[pt_BR]=Este plugin adiciona muitas funções para scripts.
Comment[sl]=Ta vtičnik doda številne funkcije nizov.
Comment[sv]=Det här insticksprogrammet lägger till en mängd strängfunktioner.
Comment[tr]=Bu eklenti, bir çok dizge fonksiyonu ekler.
Comment[tr]=Bu eklenti, bir çok dizi işlevi ekler.
Comment[uk]=За допомогою цього додатка реалізовано багато функцій, призначених для обробки рядків.
Comment[x-test]=xxThis plug-in adds many strings functions.xx
Supports Markdown
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