Commit c244ee5e 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 cefc15e5
...@@ -22,6 +22,7 @@ Name[nn]=Skalering ...@@ -22,6 +22,7 @@ Name[nn]=Skalering
Name[pl]=Skala Name[pl]=Skala
Name[pt]=Escala Name[pt]=Escala
Name[pt_BR]=Escala Name[pt_BR]=Escala
Name[sk]=Škálovať Name[sk]=Škálovať
Name[sv]=Skala Name[sv]=Skala
Name[uk]=Масштабування Name[uk]=Масштабування
...@@ -33,6 +33,7 @@ Name[hne]=पेंट देखाव ...@@ -33,6 +33,7 @@ Name[hne]=पेंट देखाव
Name[hr]=Prikaz nedavnih promjena Name[hr]=Prikaz nedavnih promjena
Name[hu]=Megmutatja a kirajzolt területeket Name[hu]=Megmutatja a kirajzolt területeket
Name[ia]=Monstra pictura Name[ia]=Monstra pictura
Name[id]=Show Paint
Name[is]=Sýna teikningu Name[is]=Sýna teikningu
Name[it]=Mostra il ridisegno Name[it]=Mostra il ridisegno
Name[kk]=Бояулау Name[kk]=Бояулау
...@@ -3,10 +3,12 @@ Name=KWin Effect ...@@ -3,10 +3,12 @@ Name=KWin Effect
Name[ca]=Efecte del KWin Name[ca]=Efecte del KWin
Name[ca@valencia]=Efecte del KWin Name[ca@valencia]=Efecte del KWin
Name[es]=Efecto de KWin Name[es]=Efecto de KWin
Name[id]=KWin Effect
Name[it]=Effetto di KWin Name[it]=Effetto di KWin
Name[nl]=KWin-effect Name[nl]=KWin-effect
Name[pt]=Efeito do KWin Name[pt]=Efeito do KWin
Name[pt_BR]=Efeito do KWin Name[pt_BR]=Efeito do KWin
Name[ru]=Эффект диспетчера окон
Name[sv]=Kwin-effekt Name[sv]=Kwin-effekt
Name[uk]=Ефект KWin Name[uk]=Ефект KWin
Name[x-test]=xxKWin Effectxx 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