Commit e8c11fa2 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 3bfcb0d0
......@@ -3,6 +3,7 @@ Name=Snap login action
Name[ca]=Accions de connexió de l'Snap
Name[ca@valencia]=Accions de connexió de l'Snap
Name[da]=Snap login-handling
Name[de]=Anmeldungsaktion für Snap
Name[el]=Ενέργεια εισόδου snap
Name[en_GB]=Snap login action
Name[es]=Acciones de inicio de sesión en Snap
......@@ -30,6 +31,7 @@ Description=Allows snap front-ends to log in
Description[ca]=Permet que els frontals de l'Snap es connectin
Description[ca@valencia]=Permet que els frontals de l'Snap es connecten
Description[da]=Tillader snap-frontends at logge ind
Description[de]=Ermöglicht die Anmeldung von Snap-Front-Ends
Description[el]=Επιτρέπεται η σύνδεση στα περιβάλλοντα διεπαφής snap
Description[en_GB]=Allows snap front-ends to log in
Description[es]=Permite que las interfaces de Snap inicien sesión
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