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
71d375d0d9
commit
9d8b2f8daf
1 changed files with 1 additions and 0 deletions
|
|
@ -31,6 +31,7 @@ Comment[gl]=Intérprete de ordes de Plasma para móbiles
|
||||||
Comment[it]=Shell di Plasma per telefoni
|
Comment[it]=Shell di Plasma per telefoni
|
||||||
Comment[ko]=휴대폰용 Plasma 셸
|
Comment[ko]=휴대폰용 Plasma 셸
|
||||||
Comment[nl]=Plasma-shell voor telefoons
|
Comment[nl]=Plasma-shell voor telefoons
|
||||||
|
Comment[pl]=Powłoka Plazmy dla telefonów
|
||||||
Comment[pt]=Área de trabalho Plasma para telemóveis
|
Comment[pt]=Área de trabalho Plasma para telemóveis
|
||||||
Comment[sv]=Plasma skal för telefoner
|
Comment[sv]=Plasma skal för telefoner
|
||||||
Comment[uk]=Оболонка Плазми для телефонів
|
Comment[uk]=Оболонка Плазми для телефонів
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue