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-07-02 02:04:13 +00:00
parent d230cb7a0b
commit 9a913e1783
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bin/plasma-mobile-dev.desktop.cmake
View file

@ -7,6 +7,7 @@ DesktopNames=KDE
Name=Plasma Mobile (Development) Name=Plasma Mobile (Development)
Name[az]=Plasma Mobil (Tərtibat) Name[az]=Plasma Mobil (Tərtibat)
Name[ca]=Plasma Mobile (Desenvolupament) Name[ca]=Plasma Mobile (Desenvolupament)
Name[ca@valencia]=Plasma Mobile (Desenvolupament)
Name[es]=Plasma Mobile (desarrollo) Name[es]=Plasma Mobile (desarrollo)
Name[fr]=Plasma Mobile (Développement) Name[fr]=Plasma Mobile (Développement)
Name[ia]=Plasma Mobile (Disveloppamento) Name[ia]=Plasma Mobile (Disveloppamento)