Commit 2887cc9b 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 2b13d27d
......@@ -4,6 +4,7 @@ Name[ca]=Cerca l'assumpte al web
Name[ca@valencia]=Cerca l'assumpte al web
Name[de]=Thema im Internet suchen
Name[es]=Buscar asunto en la web
Name[fi]=Hae aiheesta verkosta
Name[gl]=Buscar o asunto en internet
Name[it]=Cerca oggetto nel web
Name[nl]=Onderwerp op het Web zoeken
......@@ -27,6 +28,7 @@ Description[ca]=Cerca l'assumpte al web
Description[ca@valencia]=Cerca l'assumpte al web
Description[de]=Thema im Internet suchen
Description[es]=Buscar asunto en la web
Description[fi]=Hae aiheesta verkosta
Description[gl]=Buscar o asunto en internet.
Description[it]=Cerca l'oggetto nel web
Description[nl]=Onderwerp op het Web zoeken
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