mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-26 14:23: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
622d96d50a
commit
66411f24e6
1 changed files with 1 additions and 0 deletions
|
|
@ -12,6 +12,7 @@ Name[pt_BR]=Cor noturna
|
|||
Name[sv]=Nattfärg
|
||||
Name[uk]=Нічні кольори
|
||||
Name[x-test]=xxNight Colorxx
|
||||
Name[zh_CN]=夜间颜色
|
||||
Icon=redshift-status-on
|
||||
|
||||
Type=Service
|
||||
|
|
|
|||
Loading…
Reference in a new issue