Commit 2ef89887 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 e8033ebc
[KNewStuff3] [KNewStuff3]
Name=Login Screen Name=Login Screen
Name[ca]=Pantalla d'inici de sessió Name[ca]=Pantalla d'inici de sessió
Name[ca@valencia]=Pantalla d'inici de sessió
Name[fr]=Écran de connexion Name[fr]=Écran de connexion
Name[id]=Login Screen
Name[nl]=Aanmeldscherm Name[nl]=Aanmeldscherm
Name[nn]=Innloggingsbilete Name[nn]=Innloggingsbilete
Name[pt]=Ecrã de Autenticação Name[pt]=Ecrã de Autenticação
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