From c8a151d4f169255618ad1eb769b866151b8dd225 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 27 Apr 2022 01:44:50 +0000 Subject: [PATCH] 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" --- src/effects/startupfeedback/metadata.json | 4 ++-- src/kcmkwin/kwineffects/kcm_kwin_effects.desktop | 2 +- src/kcmkwin/kwinscripts/kwinscripts.json | 6 ++++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/effects/startupfeedback/metadata.json b/src/effects/startupfeedback/metadata.json index f59f616ff2..19b9971523 100644 --- a/src/effects/startupfeedback/metadata.json +++ b/src/effects/startupfeedback/metadata.json @@ -32,7 +32,7 @@ "Description[uk]": "Допоміжний ефект перегляду повідомлень, що надсилаються програмою під час запуску", "Description[vi]": "Hiệu ứng trợ giúp cho phản hồi khởi động", "Description[x-test]": "xxHelper effect for startup feedbackxx", - "Description[zh_CN]": "程序启动反馈辅助效果", + "Description[zh_CN]": "程序启动动效反馈辅助效果", "EnabledByDefault": true, "Id": "startupfeedback", "License": "GPL", @@ -66,7 +66,7 @@ "Name[uk]": "Повідомлення під час запуску", "Name[vi]": "Phản hồi khởi động", "Name[x-test]": "xxStartup Feedbackxx", - "Name[zh_CN]": "程序启动反馈" + "Name[zh_CN]": "程序启动动效" }, "org.kde.kwin.effect": { "internal": true diff --git a/src/kcmkwin/kwineffects/kcm_kwin_effects.desktop b/src/kcmkwin/kwineffects/kcm_kwin_effects.desktop index 2e727630aa..21854a78b6 100644 --- a/src/kcmkwin/kwineffects/kcm_kwin_effects.desktop +++ b/src/kcmkwin/kwineffects/kcm_kwin_effects.desktop @@ -122,4 +122,4 @@ X-KDE-Keywords[tr]=kwin,pencere,yönetici,efekt,3D efektler,2D efektler,grafikse X-KDE-Keywords[uk]=kwin,window,manager,effect,3D effects,2D effects,graphical effects,desktop effects,animations,various animations,window management effects,window switching effect,desktop switching effect,animations,desktop animations,drivers,driver settings,rendering,render,invert effect,looking glass effect,magnifier effect,snap helper effect,track mouse effect,zoom effect,blur effect,fade effect,fade desktop effect,fall apart effect,glide effect,highlight window effect,login effect,logout effect,magic lamp effect,minimize animation effect,mouse mark effect,scale in effect,screenshot effect,sheet effect,slide effect,sliding popups effect,taskbar thumbnails effect,thumbnail aside effect,translucency,translucency effect,transparency,window geometry effect,wobbly windows effect,startup feedback effect,dialog parent effect,dim inactive effect,dim screen effect,slide back effect,eye candy,candy,show FPS effect,show paint effect,box switch effect,cover switch effect,desktop cube effect,desktop cube animation effect,desktop grid effect,flip switch effect,outline effect,present windows effect,resize window effect,bling,fading,movement,motion,overview windows effect,accessibility,вікно,керування вікнами,менеджер вікон,ефект,просторовий,плоский,параметри відео,графічні ефекти,анімації,анімація,перемикання вікон,драйвери,параметри драйверів,показ,відтворення,інвертування,інверсія,збільшувальне скло,збільшення,прилипання,шлейф за вказівником,шлейф,масштабування,масштаб,зміна розмірів,розмивання,панель,згасання,поява,ковзання,підсвічування,підсвічування вікон,вихід,магічна лампа,чарівна лампа,джин,аркуші,стос,знімок екрана,мініатюри панелі задач,мініатюри,прозорість,ефект прозорості,желе,желейні вікна,супровід запуску,стрибунець,притлумлення,сірість,прикраси,показ частоти,малювання,обкладинки,стрибання,контур,поточні вікна,зміна розмірів,блимання,тьмянішати,тьмяніння,притлумлення,притлумити,рух,пересування,ефект огляду вікон,доступність X-KDE-Keywords[vi]=cửa sổ,trình quản lí,hiệu ứng,hiệu ứng 3D,hiệu ứng 2D,hiệu ứng đồ hoạ,hiệu ứng bàn làm việc,hiệu ứng động,nhiều hiệu ứng động,hiệu ứng quản lí cửa sổ,hiệu ứng chuyển cửa sổ,hiệu ứng chuyển bàn làm việc,hiệu ứng động bàn làm việc,trình điều khiển,thiết lập trình điều khiển,kết xuất,hiệu ứng đảo,hiệu ứng kính lúp,hiệu ứng phóng to,hiệu ứng trợ giúp nhanh,hiệu ứng theo dõi chuột,hiệu ứng thu phóng,hiệu ứng mờ,hiệu ứng làm mờ dần,hiệu ứng làm mờ dần bàn làm việc,hiệu ứng tan vỡ,hiệu ứng lướt,hiệu ứng tô sáng cửa sổ,hiệu ứng đăng nhập,hiệu ứng đăng xuất,hiệu ứng đèn thần,hiệu ứng động thu nhỏ,hiệu ứng vết chuột,hiệu ứng đổi cỡ,hiệu ứng ảnh chụp màn hình,hiệu ứng tấm mỏng,hiệu ứng trượt,hiệu ứng ô bật lên dạng trượt,hiệu ứng hình nhỏ ở cạnh,độ trong mờ,hiệu ứng độ trong mờ,độ trong suốt,hiệu ứng hình dạng của cửa sổ,hiệu ứng cửa sổ lắc lư,hiệu ứng phản hồi khởi động,hiệu ứng cha hộp thoại,hiệu ứng làm tối bất hoạt,hiệu ứng làm tối màn hình,hiệu ứng trượt lùi,đẹp mắt,hiệu ứng hiện FPS,hiệu ứng hiện sơn,hiệu ứng chuyển kiểu trang bìa,hiệu ứng khối hộp bàn làm việc,hiệu ứng động khối hộp bàn làm việc,hiệu ứng lưới bàn làm việc,hiệu ứng chuyển kiểu lật,hiệu ứng các cửa sổ hiện thời,hiệu ứng đổi cỡ cửa sổ,hiệu ứng tương phản nền,nhấp nháy,ngả màu,chuyển động,cử động,hiệu ứng tổng quan cửa sổ,hỗ trợ truy cập X-KDE-Keywords[x-test]=xxkwinxx,xxwindowxx,xxmanagerxx,xxeffectxx,xx3D effectsxx,xx2D effectsxx,xxgraphical effectsxx,xxdesktop effectsxx,xxanimationsxx,xxvarious animationsxx,xxwindow management effectsxx,xxwindow switching effectxx,xxdesktop switching effectxx,xxanimationsxx,xxdesktop animationsxx,xxdriversxx,xxdriver settingsxx,xxrenderingxx,xxrenderxx,xxinvert effectxx,xxlooking glass effectxx,xxmagnifier effectxx,xxsnap helper effectxx,xxtrack mouse effectxx,xxzoom effectxx,xxblur effectxx,xxfade effectxx,xxfade desktop effectxx,xxfall apart effectxx,xxglide effectxx,xxhighlight window effectxx,xxlogin effectxx,xxlogout effectxx,xxmagic lamp effectxx,xxminimize animation effectxx,xxmouse mark effectxx,xxscale effectxx,xxscreenshot effectxx,xxsheet effectxx,xxslide effectxx,xxsliding popups effectxx,xxthumbnail aside effectxx,xxtranslucencyxx,xxtranslucency effectxx,xxtransparencyxx,xxwindow geometry effectxx,xxwobbly windows effectxx,xxstartup feedback effectxx,xxdialog parent effectxx,xxdim inactive effectxx,xxdim screen effectxx,xxslide back effectxx,xxeye candyxx,xxcandyxx,xxshow FPS effectxx,xxshow paint effectxx,xxcover switch effectxx,xxdesktop cube effectxx,xxdesktop cube animation effectxx,xxdesktop grid effectxx,xxflip switch effectxx,xxpresent windows effectxx,xxresize window effectxx,xxbackground contrast effectxx,xxblingxx,xxfadingxx,xxmovementxx,xxmotionxx,xxoverview windows effectxx,xxaccessibilityxx -X-KDE-Keywords[zh_CN]=kwin,window,manager,effect,3D effects,2D effects,graphical effects,desktop effects,animations,various animations,window management effects,window switching effect,desktop switching effect,animations,desktop animations,drivers,driver settings,rendering,render,invert effect,looking glass effect,magnifier effect,snap helper effect,track mouse effect,zoom effect,blur effect,explosion effect,fade effect,fade desktop effect,fall apart effect,glide effect,highlight window kwin,window,manager,effect,3D effects,2D effects,graphical effects,desktop effects,animations,various animations,window management effects,window switching effect,desktop switching effect,animations,desktop animations,drivers,driver settings,rendering,render,invert effect,looking glass effect,magnifier effect,snap helper effect,track mouse effect,zoom effect,blur effect,fade effect,fade desktop effect,fall apart effect,glide effect,highlight window effect,login effect,logout effect,magic lamp effect,minimize animation effect,mouse mark effect,scale effect,screenshot effect,sheet effect,slide effect,sliding popups effect,thumbnail aside effect,translucency,translucency effect,transparency,window geometry effect,wobbly windows effect,startup feedback effect,dialog parent effect,dim inactive effect,dim screen effect,slide back effect,eye candy,candy,show FPS effect,show paint effect,cover switch effect,desktop cube effect,desktop cube animation effect,desktop grid effect,flip switch effect,present windows effect,resize window effect,background contrast effect,窗口,管理,特效,3D 特效,2D 特效,图形特效,桌面特效,动画,窗口管理特效,窗口切换特效,桌面切换特效,桌面动画,驱动,去掉设置,渲染,反色,放大镜特效,鼠标跟踪,缩放特效,模糊特效,渐变特效,破碎特效,滑动特效,高亮窗口,登录特效,注销特效,神灯特效,最小化动画,鼠标标记,截屏,飘落,滑动弹出窗口,缩略图置边,透明特效,摇摆窗口,启动反馈特效,黯淡对话框特效,黯淡屏幕特效,视觉效果,显示 FPS 特效,显示绘制区域特效,封面切换特效,桌面立方体特效,桌面立方体动画特效,翻转切换特效,展示窗口特效,调整窗口大小特效,背景对比特效,闪光,闪耀,闪动,消失,渐变,渐入,渐出,动态,总览,概览,窗口概览特效,无障碍,辅助功能,无障碍辅助 +X-KDE-Keywords[zh_CN]=kwin,window,manager,effect,3D effects,2D effects,graphical effects,desktop effects,animations,various animations,window management effects,window switching effect,desktop switching effect,animations,desktop animations,drivers,driver settings,rendering,render,invert effect,looking glass effect,magnifier effect,snap helper effect,track mouse effect,zoom effect,blur effect,explosion effect,fade effect,fade desktop effect,fall apart effect,glide effect,highlight window kwin,window,manager,effect,3D effects,2D effects,graphical effects,desktop effects,animations,various animations,window management effects,window switching effect,desktop switching effect,animations,desktop animations,drivers,driver settings,rendering,render,invert effect,looking glass effect,magnifier effect,snap helper effect,track mouse effect,zoom effect,blur effect,fade effect,fade desktop effect,fall apart effect,glide effect,highlight window effect,login effect,logout effect,magic lamp effect,minimize animation effect,mouse mark effect,scale effect,screenshot effect,sheet effect,slide effect,sliding popups effect,thumbnail aside effect,translucency,translucency effect,transparency,window geometry effect,wobbly windows effect,startup feedback effect,dialog parent effect,dim inactive effect,dim screen effect,slide back effect,eye candy,candy,show FPS effect,show paint effect,cover switch effect,desktop cube effect,desktop cube animation effect,desktop grid effect,flip switch effect,present windows effect,resize window effect,background contrast effect,窗口,管理,特效,3D 特效,2D 特效,图形特效,桌面特效,动画,窗口管理特效,窗口切换特效,桌面切换特效,桌面动画,驱动,去掉设置,渲染,反色,放大镜特效,鼠标跟踪,缩放特效,模糊特效,渐变特效,破碎特效,滑动特效,高亮窗口,登录特效,注销特效,神灯特效,最小化动画,鼠标标记,截屏,飘落,滑动弹出窗口,缩略图置边,透明特效,摇摆窗口,启动反馈特效,程序启动动效,黯淡对话框特效,黯淡屏幕特效,视觉效果,显示 FPS 特效,显示绘制区域特效,封面切换特效,桌面立方体特效,桌面立方体动画特效,翻转切换特效,展示窗口特效,调整窗口大小特效,背景对比特效,闪光,闪耀,闪动,消失,渐变,渐入,渐出,动态,总览,概览,窗口概览特效,无障碍,辅助功能,无障碍辅助 diff --git a/src/kcmkwin/kwinscripts/kwinscripts.json b/src/kcmkwin/kwinscripts/kwinscripts.json index a8d287d665..022fa0ee60 100644 --- a/src/kcmkwin/kwinscripts/kwinscripts.json +++ b/src/kcmkwin/kwinscripts/kwinscripts.json @@ -3,16 +3,22 @@ "Description": "Manage KWin scripts", "Description[ca]": "Gestiona els scripts del KWin", "Description[es]": "Gestión de guiones de KWin", + "Description[fr]": "Gérer les scripts pour KWin", "Description[nl]": "KWin-scripts beheren", "Description[pl]": "Zarządzanie skryptami KWin", + "Description[sv]": "Hantera Kwin-skript", + "Description[tr]": "KWin Betiklerini Yönet", "Description[uk]": "Керування скриптами KWin", "Description[x-test]": "xxManage KWin scriptsxx", "Icon": "preferences-system-windows-actions", "Name": "KWin Scripts", "Name[ca]": "Scripts del KWin", "Name[es]": "Guiones de KWin", + "Name[fr]": "Scripts pour KWin", "Name[nl]": "KWin-scripts", "Name[pl]": "Skrypty KWin", + "Name[sv]": "Kwin-skript", + "Name[tr]": "KWin Betikleri", "Name[uk]": "Скрипти KWin", "Name[x-test]": "xxKWin Scriptsxx", "ServiceTypes": [