Commit 4c1561ff 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 51fb769b
......@@ -139,6 +139,10 @@ Comment[zh_TW]=裝置檢視器
X-KDE-Keywords=device,devices,disk,drive,processor,cpu
X-KDE-Keywords[ca]=dispositiu,dispositius,disc,unitat,processador,cpu
X-KDE-Keywords[es]=dispositivo,dispositivos,disco,unidad,procesador,cpu
X-KDE-Keywords[nl]=apparaat,apparaten,schijf,station,processor,cpu
X-KDE-Keywords[pt]=dispositivo,dispositivos,disco,unidade,processador,cpu
X-KDE-Keywords[pt_BR]=dispositivo,dispositivo,disco,drive,unidade,processador,cpu
X-KDE-Keywords[ru]=device,devices,disk,drive,processor,cpu,устройство,устройства,диск,привод,процессор,цп
X-KDE-Keywords[uk]=device,devices,disk,drive,processor,cpu,пристрій,пристрої,диск,флешка,процесор,цпу
X-KDE-Keywords[x-test]=xxdevicexx,xxdevicesxx,xxdiskxx,xxdrivexx,xxprocessorxx,xxcpuxx
X-KDE-Keywords[zh_TW]=device,devices,disk,drive,processor,cpu,裝置,磁碟,硬碟,磁碟機,硬碟機,裝置,設備,處理器,CPU
......
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