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"
This commit is contained in:
l10n daemon script 2022-04-27 01:44:50 +00:00
parent 5730dc624b
commit c8a151d4f1
3 changed files with 9 additions and 3 deletions

View file

@ -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

View file

@ -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]=ca s,trình qun lí,hiu ng,hiu ng 3D,hiu ng 2D,hiu ng đ ho,hiu ng bàn làm vic,hiu ng đng,nhiu hiu ng đng,hiu ng qun lí ca s,hiu ng chuyn ca s,hiu ng chuyn bàn làm vic,hiu ng đng bàn làm vic,trình điu khin,thiết lp trình điu khin,kết xut,hiu ng đo,hiu ng kính lúp,hiu ng phóng to,hiu ng tr giúp nhanh,hiu ng theo dõi chut,hiu ng thu phóng,hiu ng m,hiu ng làm m dn,hiu ng làm m dn bàn làm vic,hiu ng tan v,hiu ng lưt,hiu ng tô sáng ca s,hiu ng đăng nhp,hiu ng đăng xut,hiu ng đèn thn,hiu ng đng thu nh,hiu ng vết chut,hiu ng đi c,hiu ng nh chp màn hình,hiu ng tm mng,hiu ng trưt,hiu ng ô bt lên dng trưt,hiu ng hình nh cnh,đ trong m,hiu ng đ trong m,đ trong sut,hiu ng hình dng ca ca s,hiu ng ca s lc lư,hiu ng phn hi khi đng,hiu ng cha hp thoi,hiu ng làm ti bt hot,hiu ng làm ti màn hình,hiu ng trưt lùi,đp mt,hiu ng hin FPS,hiu ng hin sơn,hiu ng chuyn kiu trang bìa,hiu ng khi hp bàn làm vic,hiu ng đng khi hp bàn làm vic,hiu ng lưi bàn làm vic,hiu ng chuyn kiu lt,hiu ng các ca s hin thi,hiu ng đi c ca s,hiu ng tương phn nn,nhp nháy,ng màu,chuyn đng,c đng,hiu ng tng quan ca s,h tr truy cp
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 ,,,,,,,,,,耀,,,,,,,,,,,,

View file

@ -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": [