Commit 1785cb8b 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 a196369f
......@@ -28,6 +28,7 @@
"Description": "Upload files to Google Drive",
"Description[ca@valencia]": "Puja els fitxers al Google Drive",
"Description[ca]": "Puja els fitxers al Google Drive",
"Description[cs]": "Odeslat soubory do Google Drive",
"Description[de]": "Dateien zu „Google Drive“ hochladen",
"Description[en_GB]": "Upload files to Google Drive",
"Description[es]": "Subir archivos a Google Drive",
......
Supports Markdown
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