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-04 01:43:59 +00:00
parent f4ca3b96c7
commit 0cef797eb3
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
quicksettings/nightcolor/package/metadata.desktop
View file

@ -20,7 +20,7 @@ Name[ia]=Color de Nocte
Name[it]=Colore notturno
Name[ko]=야간 색상
Name[nl]=Nachtkleur
Name[nn]=Nattfargar
Name[nn]=Kvelds­fargar
Name[pa]=ਰਾਤ ਦੇ ਰੰਗ
Name[pl]=Barwy nocne
Name[pt]=Cor Nocturna