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
e20569d1fd
commit
894d498940
1 changed files with 13 additions and 0 deletions
|
|
@ -1,8 +1,21 @@
|
|||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
Name=Quick Settings
|
||||
Name[ca]=Opcions ràpides
|
||||
Name[cs]=Rychlé nastavení
|
||||
Name[nl]=Snelle instellingen
|
||||
Name[pt]=Configuração Rápida
|
||||
Name[sv]=Snabbinställningar
|
||||
Name[uk]=Швидке налаштовування
|
||||
Name[x-test]=xxQuick Settingsxx
|
||||
|
||||
Comment=A panel to quickly access most important settings
|
||||
Comment[ca]=Un plafó per accedir ràpidament a les opcions més importants
|
||||
Comment[nl]=Een paneel voor snelle toegang tot de meest belangrijke instellingen
|
||||
Comment[pt]=Um painel para aceder rapidamente às configurações mais importantes
|
||||
Comment[sv]=En panel för att snabbt komma åt de viktigaste inställningarna
|
||||
Comment[uk]=Панель для пришвидшення доступу до найважливіших параметрів
|
||||
Comment[x-test]=xxA panel to quickly access most important settingsxx
|
||||
|
||||
Icon=systemsettings
|
||||
Type=Service
|
||||
|
|
|
|||
Loading…
Reference in a new issue