Commit 3cde719b 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 659fe0a7
......@@ -181,5 +181,5 @@ X-KDE-Keywords[uk]=емоційка,емоційки,смайлик,смайли
X-KDE-Keywords[vi]=Hình biểu cảm
X-KDE-Keywords[wa]=Xhinêyes
X-KDE-Keywords[x-test]=xxEmoticonsxx
X-KDE-Keywords[zh_CN]=表情符号
X-KDE-Keywords[zh_CN]=Emoticons,表情符号
X-KDE-Keywords[zh_TW]=Emoticons
......@@ -127,7 +127,7 @@ X-KDE-Keywords[sk]=ksmserver,sedenie,odhlásenie,potvrdenie,uložiť,obnoviť,ef
X-KDE-Keywords[sv]=ksmserver,session,utloggning,bekräftelse,spara,återställ,efi,uefi,bios
X-KDE-Keywords[uk]=ksmserver,session,logout,confirmation,save,restore,efi,uefi,bios,сеанс,вихід,підтвердження,зберегти,збереження,відновити,відновлення,іфі,іфай,уіфі,уіфай,юіфай,біос
X-KDE-Keywords[x-test]=xxksmserverxx,xxsessionxx,xxlogoutxx,xxconfirmationxx,xxsavexx,xxrestorexx,xxefixx,xxuefixx,xxbiosxx
X-KDE-Keywords[zh_CN]=ksmserver,会话,登出,确认,保存,恢复,efi,uefi,bios
X-KDE-Keywords[zh_CN]=ksmserver,session,logout,confirmation,save,restore,会话,注销,登出,确认,保存,恢复,efi,uefi,bios
X-KDE-Keywords[zh_TW]=ksmserver,session,logout,confirmation,save,restore,efi,uefi,bios,工作階段,會話,階段,登出,確認,儲存,恢復,還原,復原
Categories=Qt;KDE;X-KDE-settings-components;
......@@ -124,6 +124,6 @@ X-KDE-Keywords[sv]=startskärm,starttema,start
X-KDE-Keywords[tr]=açılış ekranı,açılış ekranı teması,açılış
X-KDE-Keywords[uk]=splash screen,splash theme,startup,вікно,вітання,тема,запуск
X-KDE-Keywords[x-test]=xxsplash screenxx,xxsplash themexx,xxstartupxx
X-KDE-Keywords[zh_CN]=splash screen,splash theme,startup,飞溅屏幕,启动画面,启动画面主题,飞溅屏幕主题,启动
X-KDE-Keywords[zh_CN]=splash screen,splash theme,startup,飞溅屏幕,启动画面,启动画面主题,飞溅屏幕主题,启动,启动屏幕,开机画面,开机屏幕
X-KDE-Keywords[zh_TW]=splash screen,splash theme,startup
Categories=Qt;KDE;X-KDE-settings-looknfeel;
......@@ -113,5 +113,5 @@ X-KDE-Keywords[sv]=Sök, Fil, Baloo, Körprogram, Kör program
X-KDE-Keywords[tr]=Arama, Dosya, Baloo, Çalıştırıcı, krunner
X-KDE-Keywords[uk]=пошук,файли,файл,балу,запуск,search,file,Baloo,Runner,krunner
X-KDE-Keywords[x-test]=xxSearchxx,xx Filexx,xx Balooxx,xx Runnerxx,xx krunnerxx
X-KDE-Keywords[zh_CN]=Search, File, Baloo, Runner, krunner,搜索,文件
X-KDE-Keywords[zh_CN]=Search, File, Baloo, Runner, krunner, 搜索, 文件, 运行
X-KDE-Keywords[zh_TW]=Search, File, Baloo, Runner, krunner
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