Commit d87bb7b4 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 fdef1888
......@@ -6,6 +6,7 @@ Name[cs]=Dolphin (Google Drive)
Name[de]=Dolphin (Google Drive)
Name[en_GB]=Dolphin (Google Drive)
Name[es]=Dolphin (Google Drive)
Name[et]=Dolphin (Google Drive)
Name[fr]=Dolphin (Google Drive)
Name[it]=Dolphin (Google Drive)
Name[nl]=Dolphin (Google Drive)
......@@ -24,6 +25,7 @@ GenericName[cs]=Správce souborů Google Drive
GenericName[de]=„Google Drive“-Dateiverwaltung
GenericName[en_GB]=Google Drive File Manager
GenericName[es]=Gestor de archivos para Google Drive
GenericName[et]=Google Drive'i failihaldur
GenericName[fr]=Gestionnaire de fichiers Google Drive
GenericName[it]=Gestione file di Google Drive
GenericName[nl]=Bestandsbeheerder voor Google Drive
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