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
6e6a888b23
commit
16ff80d6b5
1 changed files with 1 additions and 1 deletions
|
|
@ -56,7 +56,7 @@ Name[zh_TW]=設定手電筒亮度
|
|||
Description=Allow set brightness on led device
|
||||
Description[ar]=تسمح بضبط السطوع على جهاز led
|
||||
Description[ca]=Permet establir la lluminositat del dispositiu LED
|
||||
Description[ca@valencia]=Permet establir la lluminositat del dispositiu LED
|
||||
Description[ca@valencia]=Permet establir la brillantor del dispositiu LED
|
||||
Description[es]=Permitir ajustar el brillo del led del dispositivo
|
||||
Description[eu]=LED-gailuaren distira ezartzeko aukera eskaintzen du
|
||||
Description[fi]=Salli LED-laitteen kirkkauden asettaminen
|
||||
|
|
|
|||
Loading…
Reference in a new issue