Commit f31fc214 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 c3cc72b1
......@@ -2,6 +2,7 @@
Name=Dolphin (Google Drive)
Name[ca]=Dolphin (Google Drive)
Name[ca@valencia]=Dolphin (Google Drive)
Name[de]=Dolphin (Google Drive)
Name[it]=Dolphin (Google Drive)
Name[nl]=Dolphin (Google Drive)
Name[pl]=Dolphin (Dysk Google)
......@@ -13,6 +14,7 @@ Name[x-test]=xxDolphin (Google Drive)xx
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[de]=„Google Drive“-Dateiverwaltung
GenericName[it]=Gestione file di Google Drive
GenericName[nl]=Bestandsbeheerder voor Google Drive
GenericName[pl]=Zarządzanie plikami Dysku 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