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 2017-09-22 05:01:54 +02:00
parent e8664f83b9
commit 0a6bd71f0e
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
effects/eyeonscreen/package/metadata.desktop
View file

@ -74,7 +74,7 @@ Comment[sv]=Sug in fönster i skrivbordet för att visa det senare. Det kanske p
Comment[tr]=İlerisini göstermek için pencereleri masaüstüne topla. Bu size bir şey hatırlatabilir.
Comment[uk]=Втягнути вікна до стільниці, щоб показати останню. Так вам простіше буде щось згадати.
Comment[x-test]=xxSuck windows into desktop to show the latter. This might remind you of something.xx
Comment[zh_CN]=将窗口吸入桌面并显示桌面。这可能会让你想起什么。
Comment[zh_CN]=将窗口吸入桌面并显示桌面。这可能会让您想起什么。
Comment[zh_TW]=將視窗「吸」入桌面。
Type=Service