Commit 09d2eb0f 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 989a0cbc
...@@ -25,6 +25,7 @@ Name[mr]=के-रिवर्सी मूलभूत शैली ...@@ -25,6 +25,7 @@ Name[mr]=के-रिवर्सी मूलभूत शैली
Name[nb]=KReversi standardtema Name[nb]=KReversi standardtema
Name[nds]=KReversi-Standardmuster Name[nds]=KReversi-Standardmuster
Name[nl]=Standaardthema van KReversi Name[nl]=Standaardthema van KReversi
Name[nn]=Standardtema for KReversi
Name[pl]=Domyślny wystrój Reversi Name[pl]=Domyślny wystrój Reversi
Name[pt]=Tema Predefinido do KReversi Name[pt]=Tema Predefinido do KReversi
Name[pt_BR]=Tema padrão do KReversi Name[pt_BR]=Tema padrão do KReversi
...@@ -25,6 +25,7 @@ Comment[mr]=के-रिवर्सी खेळ ...@@ -25,6 +25,7 @@ Comment[mr]=के-रिवर्सी खेळ
Comment[nb]=KReversi-spill Comment[nb]=KReversi-spill
Comment[nds]=KReversi-Brettspeel Comment[nds]=KReversi-Brettspeel
Comment[nl]=KReversi-spel Comment[nl]=KReversi-spel
Comment[pl]=Gra planszowa Reversi Comment[pl]=Gra planszowa Reversi
Comment[pt]=Jogo KReversi Comment[pt]=Jogo KReversi
Comment[pt_BR]=Jogo KReversi Comment[pt_BR]=Jogo KReversi
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