marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-29 15:03:09 +00:00
Code Issues 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-02-23 01:47:06 +00:00
parent df2eb79559
commit a44977f2fe
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
quicksettings/keyboardtoggle/metadata.desktop
View file

@ -3,6 +3,7 @@
[Desktop Entry]
Name=Virtual Keyboard Toggle
Name[az]=Virtual klaviatura keçidi
Name[ca]=Commutació del teclat virtual
Name[en_GB]=Virtual Keyboard Toggle
Name[es]=Conmutación del teclado virtual