Commit d6e4096d 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 1c6927f6
......@@ -48,8 +48,10 @@ Name[nl]=Intekening tonen
Name[pa]=ਪੇਂਟ ਵੇਖੋ
Name[pl]=Pokaż rysowane
Name[pt]=Mostrar a Pintura
Name[pt_BR]=Mostrar pintura
Name[ro]=Afișează desenele
Name[ru]=Подсвечивать отрисовку
Name[se]=Čájet málema
Name[si]=ඇඳීම් පෙන්වන්න
Name[sk]=Zobraziť kresbu
......@@ -6,6 +6,7 @@ Name[es]=Efecto de KWin
Name[it]=Effetto di KWin
Name[pt]=Efeito do KWin
Name[pt_BR]=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