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-02-19 01:44:51 +00:00
parent 70ff2fd0e4
commit bf6b44c357

View file

@ -3,6 +3,12 @@
[Desktop Entry]
Name=Virtual Keyboard Toggle
Name[ca]=Commutació del teclat virtual
Name[es]=Conmutación del teclado virtual
Name[hu]=Virtuális billentyűzet kapcsoló
Name[nl]=Omschakeling van virtueel toetsenbord
Name[uk]=Перемикання віртуальної клавіатури
Name[x-test]=xxVirtual Keyboard Togglexx
Icon=input-keyboard-virtual
Type=Service