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
edcf70c263
commit
60f48d729c
1 changed files with 1 additions and 0 deletions
|
|
@ -5,6 +5,7 @@ Name[cs]=Noční barva
|
|||
Name[en_GB]=Night Colour
|
||||
Name[es]=Color nocturno
|
||||
Name[eu]=Gaueko kolorea
|
||||
Name[fi]=Yöväri
|
||||
Name[fr]=Couleur de nuit
|
||||
Name[it]=Colore notturno
|
||||
Name[ko]=야간 색상
|
||||
|
|
|
|||
Loading…
Reference in a new issue