Commit 6204b543 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 4be279ab
[Desktop Entry]
Name=KSquares
Name[ast]=KSquares
Name[be]=KSquares
Name[bs]=KSquares
Name[ca]=KSquares
......@@ -57,6 +58,7 @@ Icon=ksquares
Type=Application
X-DocPath=ksquares/index.html
GenericName=Connect the dots to create squares
GenericName[ast]=Coneuta los puntos pa crear cuadraos
GenericName[bs]=Poveži tačke da napraviš kvadrat
GenericName[ca]=Connecteu els punts per crear quadrats
GenericName[ca@valencia]=Connecteu els punts per crear quadrats
......
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