vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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"
icc-effect-5.20.5
l10n daemon script 2020-10-09 10:21:35 +02:00
parent 895acfc93e
commit a5ec0bbdc9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kcmkwin/kwinscripts/kwinscripts.desktop
View File

@ -155,7 +155,7 @@ Comment[sr@ijekavianlatin]=Upravljajte KWinovih skriptama
Comment[sr@latin]=Upravljajte KWinovih skriptama
Comment[tr]=KWin betiklerini yönet
Comment[uk]=Керування скриптами KWin
Comment[vi]=Quản lý tập lệnh KWin
Comment[vi]=Quản lí tập lệnh KWin
Comment[x-test]=xxManage KWin scriptsxx
Comment[zh_CN]=管理 KWin 脚本
Comment[zh_TW]=管理 KWin 文稿

2
kwin.notifyrc
View File

@ -57,7 +57,7 @@ Comment[th]=ตัวจัดการหน้าต่าง KWin
Comment[tr]=KWin Pencere Yöneticisi
Comment[ug]=KWin كۆزنەك باشقۇرغۇچ
Comment[uk]=Керування вікнами KWin
Comment[vi]=Trình quản lý cửa sổ KWin
Comment[vi]=Trình quản lí cửa sổ KWin
Comment[wa]=Manaedjeu des fniesses KWin
Comment[x-test]=xxKWin Window Managerxx
Comment[zh_CN]=KWin 窗口管理器