mirror of
https://github.com/KDE/latte-dock.git
synced 2025-03-06 16:58:17 +03: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
352cb64321
commit
1dfabeac2a
@ -25,6 +25,7 @@ Comment[pl]=Wskaźnik Latte
|
||||
Comment[pt]=Indicador do Latte
|
||||
Comment[pt_BR]=Indicador do Latte
|
||||
Comment[ru]=Индикатор Latte
|
||||
Comment[sk]=Latte indicator
|
||||
Comment[sl]=Kazalnik Latte
|
||||
Comment[sv]=Latte indikator
|
||||
Comment[uk]=Індикатор Латте
|
||||
|
@ -19,6 +19,7 @@ Name[nn]=Faner i Plasma-stil
|
||||
Name[pl]=Wygląd karty Plazmy
|
||||
Name[pt]=Estilo de Páginas do Plasma
|
||||
Name[pt_BR]=Estilo de abas do Plasma
|
||||
Name[sk]=Plasma štýl kariet
|
||||
Name[sl]=Slog Plasma zavihkov
|
||||
Name[sv]=Plasma flikstil
|
||||
Name[uk]=Стиль вкладок Плазми
|
||||
|
@ -25,6 +25,7 @@ Name[pl]=Powłoka Latte
|
||||
Name[pt]=Consola do Latte
|
||||
Name[pt_BR]=Latte Shell
|
||||
Name[ru]=Оболочка Latte
|
||||
Name[sk]=Latte Shell
|
||||
Name[sl]=Shell Latte
|
||||
Name[sv]=Latte skal
|
||||
Name[uk]=Оболонка Латте
|
||||
|
@ -25,6 +25,7 @@ Name[pl]=Powłoka Latte
|
||||
Name[pt]=Consola do Latte
|
||||
Name[pt_BR]=Latte Shell
|
||||
Name[ru]=Оболочка Latte
|
||||
Name[sk]=Latte Shell
|
||||
Name[sl]=Shell Latte
|
||||
Name[sv]=Latte skal
|
||||
Name[uk]=Оболонка Латте
|
||||
|
Loading…
x
Reference in New Issue
Block a user