yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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"
This commit is contained in:
l10n daemon script 2019-02-06 08:36:52 +01:00
parent c372585623
commit 54e46dbd9f
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcmkwin/kwintabbox/kwintabbox.desktop
View file

@ -108,7 +108,7 @@ Comment[sr@ijekavianlatin]=Kretanje između prozora
Comment[sr@latin]=Kretanje između prozora Comment[sr@latin]=Kretanje između prozora
Comment[sv]=Navigering via fönster Comment[sv]=Navigering via fönster
Comment[tr]=Pencereler Arası Gezinti Comment[tr]=Pencereler Arası Gezinti
Comment[uk]=Навігація ввікнами Comment[uk]=Навігація вікнами
Comment[vi]=Điều hướng qua các cửa sổ Comment[vi]=Điều hướng qua các cửa sổ
Comment[x-test]=xxNavigation Through Windowsxx Comment[x-test]=xxNavigation Through Windowsxx
Comment[zh_CN]=遍历窗口 Comment[zh_CN]=遍历窗口