Commit fdef1888 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 90d1ae66
......@@ -2,7 +2,11 @@
Name=Dolphin (Google Drive)
Name[ca]=Dolphin (Google Drive)
Name[ca@valencia]=Dolphin (Google Drive)
Name[cs]=Dolphin (Google Drive)
Name[de]=Dolphin (Google Drive)
Name[en_GB]=Dolphin (Google Drive)
Name[es]=Dolphin (Google Drive)
Name[fr]=Dolphin (Google Drive)
Name[it]=Dolphin (Google Drive)
Name[nl]=Dolphin (Google Drive)
Name[pl]=Dolphin (Dysk Google)
......@@ -11,10 +15,16 @@ Name[sk]=Dolphin (Google Drive)
Name[sv]=Dolphin (Google Drive)
Name[uk]=Dolphin (Google Диск)
Name[x-test]=xxDolphin (Google Drive)xx
Name[zh_CN]=Dolphin (Google Drive)
Name[zh_TW]=Dolphin(Google 雲端硬碟)
GenericName=Google Drive File Manager
GenericName[ca]=Gestor de fitxers amb el Google Drive
GenericName[ca@valencia]=Gestor de fitxers amb el Google Drive
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[fr]=Gestionnaire de fichiers Google Drive
GenericName[it]=Gestione file di Google Drive
GenericName[nl]=Bestandsbeheerder voor Google Drive
GenericName[pl]=Zarządzanie plikami Dysku Google
......@@ -23,6 +33,8 @@ GenericName[sk]=Správca súborov Google Drive
GenericName[sv]=Google Drive-filhanterare
GenericName[uk]=Засіб керування файлами Google Диск
GenericName[x-test]=xxGoogle Drive File Managerxx
GenericName[zh_CN]=Google Drive 文件管理器
GenericName[zh_TW]=Google 雲端硬碟檔案管理員
Exec=dolphin gdrive://
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