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 2018-01-06 04:52:05 +01:00
parent 43831d9181
commit 8418d003fa
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
touchscreentest/org.kde.touchtest.desktop
View file

@ -34,6 +34,7 @@ GenericName[sv]=Terminal
GenericName[tr]=Uçbirim GenericName[tr]=Uçbirim
GenericName[uk]=Термінал GenericName[uk]=Термінал
GenericName[x-test]=xxTerminalxx GenericName[x-test]=xxTerminalxx
GenericName[zh_CN]=终端
GenericName[zh_TW]=終端機 GenericName[zh_TW]=終端機
Icon=input-touchpad Icon=input-touchpad
MimeType= MimeType=