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 2025-05-29 01:33:33 +00:00
parent dd32a2c864
commit a45395491b
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,7 +9,7 @@ Name=Plasma Mobile (Development)
Name[ar]=بلازما الجوال (التطوير) Name[ar]=بلازما الجوال (التطوير)
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[ca@valencia]=Plasma Mobile (desenvolupament)
Name[cs]=Plasma Mobile (Vývojová) Name[cs]=Plasma Mobile (Vývojová)
Name[de]=Plasma Mobile (Entwicklung) Name[de]=Plasma Mobile (Entwicklung)
Name[en_GB]=Plasma Mobile (Development) Name[en_GB]=Plasma Mobile (Development)