marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23: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 2020-12-15 06:27:59 +01:00
parent 417279e9c7
commit 3922350d20
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plasma_phone_components.notifyrc
View file

@ -1,6 +1,7 @@
[Global]
IconName=preferences-system-windows-effect-screenshot
Name=Plasma
Name[ast]=Plasma
Name[ca]=Plasma
Name[cs]=Plasma
Name[en_GB]=Plasma