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
e168b2bdb6
commit
d7b7290451
1 changed files with 1 additions and 0 deletions
|
|
@ -5,6 +5,7 @@ Name[cs]=Režim v Letadle
|
|||
Name[en_GB]=Airplane Mode
|
||||
Name[es]=Modo avión
|
||||
Name[eu]=Hegaldi modua
|
||||
Name[fi]=Lentokonetila
|
||||
Name[fr]=Mode Avion
|
||||
Name[hu]=Repülős üzemmód
|
||||
Name[ia]=Modo aeroplano
|
||||
|
|
|
|||
Loading…
Reference in a new issue