Commit df583357 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 2b69cae6
...@@ -52,6 +52,7 @@ Name[de]=Authentifizierungssystem ...@@ -52,6 +52,7 @@ Name[de]=Authentifizierungssystem
Name[el]=Σύστημα ταυτοποίησης Name[el]=Σύστημα ταυτοποίησης
Name[en_GB]=Authentication System Name[en_GB]=Authentication System
Name[es]=Sistema de autenticación Name[es]=Sistema de autenticación
Name[eu]=Autentifikazio sistema Name[eu]=Autentifikazio sistema
Name[fi]=Tunnistautumisjärjestelmä Name[fi]=Tunnistautumisjärjestelmä
Name[fr]=Système d'authentification Name[fr]=Système d'authentification
...@@ -78,6 +79,7 @@ Name[de]=Authentifizieren ...@@ -78,6 +79,7 @@ Name[de]=Authentifizieren
Name[el]=Ταυτοποίηση Name[el]=Ταυτοποίηση
Name[en_GB]=Authenticate Name[en_GB]=Authenticate
Name[es]=Autenticar Name[es]=Autenticar
Name[eu]=Autentifikatu Name[eu]=Autentifikatu
Name[fi]=Tunnistaudu Name[fi]=Tunnistaudu
Name[fr]=S'authentifier Name[fr]=S'authentifier
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