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 2022-03-14 01:45:26 +00:00
parent 6be4fae2c7
commit 25194c1d23
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kcms/mobileshell/package/metadata.desktop
View file

@ -7,6 +7,7 @@ Name[az]=Örtük
Name[ca]=Intèrpret d'ordres
Name[ca@valencia]=Intèrpret d'ordres
Name[cs]=Shell
Name[de]=Shell
Name[en_GB]=Shell
Name[es]=Intérprete de órdenes
Name[eu]=Oskola