marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-08-02 01:34:46 +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-07-23 01:15:30 +00:00
parent 441936186a
commit 44a7f0d3cb
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
quicksettings/nightcolor/metadata.desktop
View file

@ -1,5 +1,13 @@
[Desktop Entry] [Desktop Entry]
Name=Night Color Name=Night Color
Name[ca]=Color de nit
Name[es]=Color nocturno
Name[nl]=Nachtkleur
Name[pt]=Cor Nocturna
Name[pt_BR]=Cor noturna
Name[sv]=Nattfärg
Name[uk]=Нічні кольори
Name[x-test]=xxNight Colorxx
Icon=redshift-status-on Icon=redshift-status-on
Type=Service Type=Service