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
05d7e6085a
commit
71d375d0d9
1 changed files with 1 additions and 0 deletions
|
|
@ -26,6 +26,7 @@ Comment=Plasma shell for phones
|
|||
Comment[ca]=Espai de treball Plasma per a telèfons
|
||||
Comment[ca@valencia]=Espai de treball Plasma per a telèfons
|
||||
Comment[es]=Interfaz de Plasma para teléfonos
|
||||
Comment[fr]=Terminal Plasma pour smartphones
|
||||
Comment[gl]=Intérprete de ordes de Plasma para móbiles
|
||||
Comment[it]=Shell di Plasma per telefoni
|
||||
Comment[ko]=휴대폰용 Plasma 셸
|
||||
|
|
|
|||
Loading…
Reference in a new issue