mirror of
https://github.com/KDE/latte-dock.git
synced 2025-03-07 08: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
31a6135fd9
commit
a46fe062cf
@ -4,7 +4,7 @@ Name[ar]=مخطّطات لاتيه
|
||||
Name[az]=Latte Maketləri
|
||||
Name[ca]=Disposicions del Latte
|
||||
Name[ca@valencia]=Disposicions de Latte
|
||||
Name[cs]=Rozložení Latte
|
||||
Name[cs]=Rozvržení Latte
|
||||
Name[de]=Latte-Profile
|
||||
Name[el]=Προφίλ Latte
|
||||
Name[en_GB]=Latte Layouts
|
||||
|
@ -321,7 +321,7 @@ Name[ar]=بدل إلى تخطيط
|
||||
Name[az]=Maketi Keçmək
|
||||
Name[ca]=Commuta a la disposició
|
||||
Name[ca@valencia]=Canvia a la disposició
|
||||
Name[cs]=Přepnout na rozložení
|
||||
Name[cs]=Přepnout na rozvržení
|
||||
Name[da]=Skift til layout
|
||||
Name[de]=Wechsel zu Profil
|
||||
Name[el]=Εναλλαγή στο προφίλ
|
||||
|
Loading…
x
Reference in New Issue
Block a user