Commit d5025e76 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 d87bb7b4
......@@ -12,6 +12,7 @@ Name[it]=Dolphin (Google Drive)
Name[nl]=Dolphin (Google Drive)
Name[pl]=Dolphin (Dysk Google)
Name[pt]=Dolphin (Google Drive)
Name[pt_BR]=Dolphin (Google Drive)
Name[sk]=Dolphin (Google Drive)
Name[sv]=Dolphin (Google Drive)
Name[uk]=Dolphin (Google Диск)
......@@ -31,6 +32,7 @@ GenericName[it]=Gestione file di Google Drive
GenericName[nl]=Bestandsbeheerder voor Google Drive
GenericName[pl]=Zarządzanie plikami Dysku Google
GenericName[pt]=Gestor de Ficheiros do Google Drive
GenericName[pt_BR]=Gerenciador de arquivos do Google Drive
GenericName[sk]=Správca súborov Google Drive
GenericName[sv]=Google Drive-filhanterare
GenericName[uk]=Засіб керування файлами Google Диск
......
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