Commit 2f222f28 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 dd3d661a
......@@ -6,6 +6,7 @@ Name[cs]=Úvodní obrazovky
Name[de]=Startbildschirme
Name[en_GB]=Splash Screens
Name[es]=Pantallas de bienvenida
Name[eu]=Plast pantailak
Name[gl]=Pantallas de benvida
Name[id]=Layar Splash
Name[it]=Schermate iniziali
......
......@@ -17,6 +17,7 @@ Name[ca@valencia]=Renderitzador del Plasma
Name[de]=Plasma-Renderer
Name[en_GB]=Plasma Renderer
Name[es]=Motor de visualización de Plasma
Name[eu]=Plasma errendatzailea
Name[gl]=Renderizador de Plasma
Name[it]=Plasma Renderer
Name[nl]=Plasma-renderer
......
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