Commit 9499a088 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 dfa2ac9e
Pipeline #34227 skipped
......@@ -5,6 +5,7 @@ Name[ca@valencia]=Proveïdors de correu electrònic
Name[cs]=Poskytovatelé e-mailu
Name[da]=E-mailudbydere
Name[de]=E-Mail-Anbieter
Name[el]=Πάροχοι αλληλογραφίας
Name[en_GB]=Email Providers
Name[es]=Proveedores de correo
Name[et]=E-posti teenuse pakkujad
......
......@@ -6,6 +6,7 @@ Name[ca@valencia]=Assistent de comptes
Name[cs]=Průvodce nastavením účtu
Name[da]=Guide til konti
Name[de]=Zugangsassistent
Name[el]=Βοηθός λογαριασμών
Name[en_GB]=Account Wizard
Name[es]=Asistente de cuentas
Name[et]=Kontonõustaja
......
......@@ -6,6 +6,7 @@ Name[ca@valencia]=Servidor de treball en grup Tine 2.0
Name[cs]=Groupware Server Tine 2.0
Name[da]=Tine 2.0 groupware-server
Name[de]=Tine 2.0 Groupware-Server
Name[el]=Εξυπηρετητής Tine 2.0 Groupware
Name[en_GB]=Tine 2.0 Groupware Server
Name[es]=Servidor de colaboración Tine 2.0
Name[et]=Tine 2.0 grupitöö server
......@@ -41,6 +42,7 @@ Comment[ca@valencia]=Servidor de treball en grup Tine 2.0
Comment[cs]=Groupware Server Tine 2.0
Comment[da]=Tine 2.0 groupware-server
Comment[de]=Tine 2.0 Groupware-Server
Comment[el]=Εξυπηρετητής Tine 2.0 Groupware
Comment[en_GB]=Tine 2.0 Groupware Server
Comment[es]=Servidor de colaboración Tine 2.0
Comment[et]=Tine 2.0 grupitöö server
......
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