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 2020-03-26 06:24:43 +01:00
parent 48a8fdbdc7
commit 7fc05f1cf6
3 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,6 +17,7 @@ Name[ru]=Втягивание окон в центр экрана
Name[sv]=Ögat på skärmen
Name[uk]=Око на екрані
Name[x-test]=xxEye on Screenxx
Name[zh_CN]=关注屏幕
Name[zh_TW]=螢幕之眼
Icon=preferences-system-windows-effect-eyeonscreen
Comment=Suck windows into the desktop
@ -36,6 +37,7 @@ Comment[ru]=Втягивание окон в центр рабочего сто
Comment[sv]=Sug in fönster i skrivbordet
Comment[uk]=Засмоктування вікон до стільниці
Comment[x-test]=xxSuck windows into the desktopxx
Comment[zh_CN]=将窗口吸收到桌面
Comment[zh_TW]=將視窗吸進桌面
Type=Service

1
effects/windowaperture/package/metadata.desktop
View file

@ -59,6 +59,7 @@ Comment[ru]=Перемещение окон в углы экрана
Comment[sv]=Flytta fönster till skärmhörn
Comment[uk]=Пересування вікон до кутів екрана
Comment[x-test]=xxMove windows into screen cornersxx
Comment[zh_CN]=将窗口移动到屏幕角
Comment[zh_TW]=將視窗移至螢幕角落
Type=Service

1
kcmkwin/kwincompositing/kwincompositing.desktop
View file

@ -124,4 +124,5 @@ X-KDE-Keywords[ru]=kwin,window,manager,compositing,effect,3D effects,2D effects,
X-KDE-Keywords[sv]=kwin,fönster,hantering,sammansättning,effekt,3D effekter,2D effekter,OpenGL,XRender,videoinställningar,grafiska effekter,skrivbordseffekter
X-KDE-Keywords[uk]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects,вікно,керування,композитне,композиція,ефект,просторовий,ефекти,плоскі,параметри відео,графічні ефекти,ефекти стільниці
X-KDE-Keywords[x-test]=xxkwinxx,xxwindowxx,xxmanagerxx,xxcompositingxx,xxeffectxx,xx3D effectsxx,xx2D effectsxx,xxOpenGLxx,xxXRenderxx,xxvideo settingsxx,xxgraphical effectsxx,xxdesktop effectsxx
X-KDE-Keywords[zh_CN]=kwin,窗口,管理器,混成,特效,3D 特效,2D 特效,OpenGL,XRender,视频设置,图形特效,桌面特效
X-KDE-Keywords[zh_TW]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects,桌面特效,圖形特效,視訊設定,特效,3D,2D,合成,視窗,管理器