Commit 880d3a74 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 dc704535
......@@ -103,3 +103,10 @@ Comment[x-test]=xxLocation for Personal Filesxx
Comment[zh_CN]=个人文件位置
Comment[zh_TW]=個人檔案的路徑
X-KDE-Keywords=konqueror,dolphin,files,filemanager,path, paths,desktop,directories,downloads,music,documents,movies,pictures
X-KDE-Keywords[ca]=konqueror,dolphin,fitxers,gestor de fitxers,camí,camins,escriptori,directoris,baixades,música,documents,pel·lícules,imatges
X-KDE-Keywords[nl]=konqueror,dolphin,bestanden,bestandsbeheerder,pad,paden,bureaublad,mappen,downloads,muziek,documenten,films,afbeeldingen
X-KDE-Keywords[nn]=konqueror,dolphin,filer,filhandsamar,stig,stigar,sti,stiar,skrivebord,mapper,nedlastingar,musikk,dokument,filmar,video,bilete
X-KDE-Keywords[pt]=konqueror,dolphin,ficheiros,gestor de ficheiros,localização,localizações,ecrã,pastas,arranque,transferências,música,documentos,filmes,imagens
X-KDE-Keywords[sv]=konqueror,dolphin,filer,filhanterare,sökväg,sökvägar,skrivbord,kataloger,nerladdningar,musik,dokument,filmer,bilder
X-KDE-Keywords[uk]=konqueror,dolphin,files,filemanager,paths,desktop,directories,downloads,music,documents,movies,pictures,файл,дельфін,керування,менеджер,шляхи,стільниця,каталог,каталоги,отримання,завантаження,музика,документи,фільми,відео,зображення,знімки,фотографії
X-KDE-Keywords[x-test]=xxkonquerorxx,xxdolphinxx,xxfilesxx,xxfilemanagerxx,xxpathxx,xx pathsxx,xxdesktopxx,xxdirectoriesxx,xxdownloadsxx,xxmusicxx,xxdocumentsxx,xxmoviesxx,xxpicturesxx
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