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 2024-01-04 02:08:46 +00:00
parent 53d4d572ea
commit 236794aad9
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/kcms/tabbox/kwinswitcher.knsrc
View file

@ -43,7 +43,7 @@ Name[sr@ijekavianlatin]=Rasporedi prebacivanja menadžera prozora
Name[sr@latin]=Rasporedi prebacivanja menadžera prozora
Name[sv]=Fönsterbyteslayouter
Name[ta]=சாளர மாற்றியின் தளவமைப்பு
Name[tr]=Pencere Yöneticisi Geçiş Düzenleri
Name[tr]=Pencere Yöneticisi Geçiş Yerleşimleri
Name[uk]=Компонування засобу перемикання вікон
Name[vi]=Bố cục chuyển đổi của trình quản lí cửa sổ
Name[x-test]=xxWindow Manager Switching Layoutsxx

2
src/plugins/synchronizeskipswitcher/package/metadata.json
View file

@ -92,7 +92,7 @@
"Name[cs]": "Synchronizovat přepínač přeskakování s pruhem úloh",
"Name[de]": "Fensterwechsler mit Fensterleiste abgleichen",
"Name[en_GB]": "Synchronise Skip Switcher with Taskbar",
"Name[eo]": "Sinkronigi Skip Switcher kun Taskbaro",
"Name[eo]": "Sinkronigi Skip Switcher kun Taskbreto",
"Name[es]": "Sincronizar «Omitir selector» con la barra de tareas",
"Name[et]": "Vahelejätmise lülitaja sünkroonimine tegumiribaga",
"Name[eu]": "Ataza-barrarekin kommutadorea saihestu sinkronizatzea",