mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-29 15:03:09 +00:00
SVN_SILENT made messages (.desktop file) - always resolve ours
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:
parent
441936186a
commit
44a7f0d3cb
1 changed files with 8 additions and 0 deletions
|
|
@ -1,5 +1,13 @@
|
|||
[Desktop Entry]
|
||||
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
|
||||
|
||||
Type=Service
|
||||
|
|
|
|||
Loading…
Reference in a new issue