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-03-05 01:14:33 +00:00
parent d0a6bd3404
commit a33fe84f57
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/plugins/hidecursor/metadata.json
View file

@ -4,6 +4,7 @@
"Description": "Hide mouse cursor on inactivity or keyboard input",
"Description[ca@valencia]": "Oculta el cursor del ratolí per inactivitat o per entrada de teclat",
"Description[ca]": "Oculta el cursor del ratolí per inactivitat o per entrada de teclat",
"Description[eo]": "Kaŝi muskursoron je neaktiveco aŭ klavara enigo",
"Description[es]": "Ocultar el cursor del ratón cuando no haya actividad o al usar el teclado",
"Description[eu]": "Ezkutatu saguaren kurtsorea jarduerarik ez dagoenean edo teklatuaren sarrera dagoenean",
"Description[fr]": "Masquer le pointeur de la souris en l'absence d'activités ou d'évènements de clavier",
@ -25,6 +26,7 @@
"Name": "Hide Cursor",
"Name[ca@valencia]": "Oculta el cursor",
"Name[ca]": "Oculta el cursor",
"Name[eo]": "Kaŝi Kursoron",
"Name[es]": "Ocultar el cursor",
"Name[eu]": "Ezkutatu kurtsorea",
"Name[fr]": "Masquer le pointeur",