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-05-11 04:19:45 +02:00
parent 3817eddfc6
commit 1d8b61deb4
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,6 +16,7 @@ Name[sv]=Avmätta oemottagliga program
Name[tr]=Yanıt Vermeyen Uygulamaların Yoğunluğunu Kaldır
Name[uk]=Зненасичення вікон, які не відповідають на запити
Name[x-test]=xxDesaturate Unresponsive Applicationsxx
Name[zh_CN]=对未响应应用程序降低饱和度
Name[zh_TW]=淡化無回應的應用程式
Icon=preferences-system-windows-effect-frozenapp
Comment=Desaturate windows of unresponsive (frozen) applications
@ -35,6 +36,7 @@ Comment[sv]=Avmätta fönster för oemottagliga (frysta) program
Comment[tr]=Yanıt vermeyen (donmuş) uygulamaların pencerelerini soldur
Comment[uk]=Зменшення насиченості кольорів вікон програм, які не відповідають на запити (повисли)
Comment[x-test]=xxDesaturate windows of unresponsive (frozen) applicationsxx
Comment[zh_CN]=将未响应 (冻结) 的应用程序窗口的饱和度降低
Comment[zh_TW]=淡化無回應（凍結）的應用程式視窗
Type=Service

1
kcmkwin/kwinscreenedges/kwintouchscreen.desktop
View file

@ -67,4 +67,5 @@ X-KDE-Keywords[sv]=kwin,fönster,hanterare,effekt,kant,gräns,åtgärd,byta,skri
X-KDE-Keywords[tr]=kwin,pencere,yönetici,efekt,kenar,sınır,eylem,geçiş,masaüstü,masaüstü kenarları,ekran kenarları,ekranın yan tarafı,ekran davranışı,dokunmatik ekran
X-KDE-Keywords[uk]=kwin,window,manager,effect,corner,edge,border,action,switch,desktop,desktop edges,screen edges,side of screen,screen behavior,touch screen,вікно,керування,край,кут,межа,сторона,бік,дія,перемикання,стільниця,плитка,край екрана,поведінка екрана,перемикання стільниць,віртуальна стільниця,сенсорна панель
X-KDE-Keywords[x-test]=xxkwinxx,xxwindowxx,xxmanagerxx,xxeffectxx,xxedgexx,xxborderxx,xxactionxx,xxswitchxx,xxdesktopxx,xxdesktop edgesxx,xxscreen edgesxx,xxside of screenxx,xxscreen behaviorxx,xxtouch screenxx
X-KDE-Keywords[zh_CN]=kwin,window,manager,effect,corner,edge,border,action,switch,desktop,kwin screen edges,desktop edges,screen edges,maximize windows,tile windows,side of screen,screen behavior,switch desktop,virtual desktop,screen corners,窗口,管理,特效,角,边缘,动作,切换,桌面,kwin 屏幕边缘,屏幕边缘,桌面边缘,最大化窗口,平铺窗口,屏幕行为,桌面切换,虚拟桌面,屏幕角落
X-KDE-Keywords[zh_TW]=kwin,window,manager,effect,edge,border,action,switch,desktop,desktop edges,screen edges,side of screen,screen behavior,touch screen