mirror of
https://github.com/KDE/latte-dock.git
synced 2024-12-23 13:33:50 +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
a3e747188f
commit
4b74474157
@ -28,6 +28,7 @@ Name[zh_TW]=標準的 Latte 選單
|
||||
Comment=The latte menu that normally shows on right-click
|
||||
Comment[ca]=El menú Latte que es mostra normalment amb un clic del botó dret
|
||||
Comment[ca@valencia]=El menú Latte que es mostra normalment amb un clic del botó dret
|
||||
Comment[cs]=Nabídka Latte, jenž se běžně zobrazuje při kliknutí pravým tlačítkem
|
||||
Comment[de]=Das Latte-Menü, das normalerweise mit der rechten Maustaste angezeigt wird
|
||||
Comment[el]=Το προκαθορισμένο μενού του Latte που εμφανίζεται με δεξί κλικ
|
||||
Comment[en_GB]=The latte menu that normally shows on right-click
|
||||
|
Loading…
Reference in New Issue
Block a user