mirror of
https://github.com/KDE/latte-dock.git
synced 2025-01-13 05:17:48 +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
72ebfe1aae
commit
92f717dc06
@ -9,7 +9,7 @@ Name[el]=Προφίλ Latte
|
||||
Name[en_GB]=Latte Layouts
|
||||
Name[es]=Distribuciones de Latte
|
||||
Name[et]=Latte paigutused
|
||||
Name[eu]=Latte diseinuak
|
||||
Name[eu]=Latte antolamenduak
|
||||
Name[fi]=Latte-asettelut
|
||||
Name[gl]=Disposicións de Latte
|
||||
Name[id]=Tataletak Latte
|
||||
|
@ -259,7 +259,7 @@ Name[el]=Εναλλαγή στο προφίλ
|
||||
Name[en_GB]=Switch to layout
|
||||
Name[es]=Cambiar a distribución
|
||||
Name[et]=Paigutusele lülitumine
|
||||
Name[eu]=Aldatu diseinura
|
||||
Name[eu]=Aldatu antolamendura
|
||||
Name[fi]=Vaihda asetteluun
|
||||
Name[gl]=Cambiar á disposición
|
||||
Name[id]=Beralih ke tataletak
|
||||
|
Loading…
Reference in New Issue
Block a user