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 2021-06-28 01:31:11 +00:00
parent bacfccd323
commit 844be8376e
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.desktop.cmake
View file

@ -25,7 +25,7 @@ Name[lt]=Plasma mobilioji sąsaja
Name[nl]=Plasma-mobiel
Name[nn]=Plasma Mobile
Name[pa]=ਪਲਾਜ਼ਮਾ ਮੋਬਾਈਲ
Name[pl]=Plazma Mobile
Name[pl]=Przenośna Plazma
Name[pt]=Plasma Mobile
Name[pt_BR]=Plasma Mobile
Name[ro]=Plasma Mobile