Commit 6a03bf67 authored by Script Kiddy's avatar Script Kiddy

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 8cfa4aca
......@@ -4,7 +4,6 @@ URL=audiocd:/
Icon=media-optical-audio
Name=Audio CD Browser
Name[ar]=مستعرض الأقراص الصوتية
Name[ast]=Restolador de CD d'audiu
Name[bg]=Преглед на звукови дискове
Name[bs]=Pregledač Audio CDova
Name[ca]=Navegador de CD d'àudio
......
......@@ -9,7 +9,6 @@ Exec=kioclient exec audiocd:/?device=%d
Icon=system-file-manager
Name=Open with File Manager
Name[ar]=افتح بمدير الملفات
Name[ast]=Abrir col xestor de ficheros
Name[bg]=Отваряне с файлов мениджър
Name[bs]=Otvori menadžerom datoteka
Name[ca]=Obre amb el gestor de fitxers
......
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