marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-08-02 09:48:50 +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-08-04 01:16:00 +00:00
parent 5ab4624f19
commit 7ef6c9c7c9
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
quicksettings/nightcolor/metadata.desktop
View file

@ -11,6 +11,7 @@ Name[nl]=Nachtkleur
Name[pl]=Barwy nocne Name[pl]=Barwy nocne
Name[pt]=Cor Nocturna Name[pt]=Cor Nocturna
Name[pt_BR]=Cor noturna Name[pt_BR]=Cor noturna
Name[sl]=Nočna barva
Name[sv]=Nattfärg Name[sv]=Nattfärg
Name[uk]=Нічні кольори Name[uk]=Нічні кольори
Name[x-test]=xxNight Colorxx Name[x-test]=xxNight Colorxx