Commit 4bcd8096 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 972108e5
......@@ -47,6 +47,7 @@ Name[ne]=रङ देखाउनुहोस्
Name[nl]=Intekening tonen
Name[pa]=ਪੇਂਟ ਵੇਖੋ
Name[pl]=Pokaż rysowane
Name[pt]=Mostrar a Pintura
Name[ro]=Afișează desenele
Name[ru]=Подсвечивать отрисовку
Name[si]=ඇඳීම් පෙන්වන්න
......@@ -4,6 +4,7 @@ Name[ca]=Efecte del KWin
Name[ca@valencia]=Efecte del KWin
Name[es]=Efecto de KWin
Name[pt]=Efeito do KWin
Name[uk]=Ефект KWin
Name[x-test]=xxKWin Effectxx
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