Commit 288fcb90 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 9a925513
......@@ -74,6 +74,7 @@ X-KDE-Keywords[es]=tema, aspecto, visual
X-KDE-Keywords[fi]=teema, ulkoasu, tuntuma
X-KDE-Keywords[fr]=thème, apparence, comportement, graphique
X-KDE-Keywords[gl]=tema, aparencia, estilo, comportamento
X-KDE-Keywords[it]=tema, aspetto
X-KDE-Keywords[ko]=theme, look, feel, 테마, 모습과 느낌, 외형, 외관
X-KDE-Keywords[nl]=thema, uiterlijk, gedrag
X-KDE-Keywords[pl]=wystrój, wygląd, odczucia, wrażenia
......
......@@ -72,6 +72,7 @@ X-KDE-Keywords[es]=tema, aspecto, visual
X-KDE-Keywords[fi]=teema, ulkoasu, tuntuma
X-KDE-Keywords[fr]=thème, apparence, comportement, graphique
X-KDE-Keywords[gl]=tema, aparencia, estilo, comportamento
X-KDE-Keywords[it]=tema, aspetto
X-KDE-Keywords[ko]=theme, look, feel, 테마, 모습과 느낌, 외형, 외관
X-KDE-Keywords[nl]=thema, uiterlijk, gedrag
X-KDE-Keywords[pl]=wystrój, wygląd, odczucia, wrażenia
......
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