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 2017-11-17 05:09:05 +01:00
parent 00e4e8b232
commit eced967522
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

@ -22,6 +22,7 @@ GenericName[ca@valencia]=Terminal
GenericName[cs]=Terminál GenericName[cs]=Terminál
GenericName[de]=Terminal GenericName[de]=Terminal
GenericName[es]=Terminal GenericName[es]=Terminal
GenericName[fr]=Terminal
GenericName[nl]=Terminal GenericName[nl]=Terminal
GenericName[pl]=Terminal GenericName[pl]=Terminal
GenericName[pt]=Terminal GenericName[pt]=Terminal