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 2022-12-17 12:16:25 +00:00
parent 71ebe1dac4
commit 3ea6ed0b60
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/kcmkwin/kwinxwayland/kcm_kwinxwayland.json
View file

@ -6,6 +6,7 @@
"Description[ca@valencia]": "Seleccioneu les tecles que estaran disponibles globalment a les aplicacions X11 antigues",
"Description[ca]": "Seleccioneu les tecles que seran disponibles globalment a les aplicacions X11 antigues",
"Description[es]": "Seleccionar las teclas que estarán disponibles globalmente para las aplicaciones X11 heredadas",
"Description[eu]": "Hautatu ze tekla egongo diren X11 ondare aplikazioetarako globalki erabilgarri",
"Description[nl]": "Selecteer welke toetsen globaal beschikbaar zijn aan verouderde X11 apps",
"Description[tr]": "Eski X11 uygulamalarına hangi düğmelerin global olarak kullanılabilir olacağını seç",
"Description[uk]": "Вибір клавіш, які будуть доступні на загальному рівні програмам X11",
@ -15,6 +16,7 @@
"Name[ca@valencia]": "Implementació de les aplicacions X11 antigues",
"Name[ca]": "Implementació de les aplicacions X11 antigues",
"Name[es]": "Compatibilidad de aplicaciones X11 heredadas",
"Name[eu]": "X11 ondare aplikazioen euskarria",
"Name[nl]": "Verouderde ondersteuning voor X11 App",
"Name[tr]": "Eski X11 Uygulamaları Desteği",
"Name[uk]": "Підтримка застарілих програм X11",