marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-29 15:03:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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:
l10n daemon script 2017-09-04 04:45:43 +02:00
parent 69d9780315
commit 2833c07797
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applets/quicksettings/package/metadata.desktop
View file

@ -5,6 +5,7 @@ Name[ca]=Opcions ràpides
Name[cs]=Rychlé nastavení
Name[es]=Ajustes rápidos
Name[nl]=Snelle instellingen
Name[pl]=Szybkie ustawienia
Name[pt]=Configuração Rápida
Name[sv]=Snabbinställningar
Name[uk]=Швидке налаштовування
@ -14,6 +15,7 @@ Comment=A panel to quickly access most important settings
Comment[ca]=Un plafó per accedir ràpidament a les opcions més importants
Comment[es]=Un panel para acceder rápidamente a los ajustes más importantes
Comment[nl]=Een paneel voor snelle toegang tot de meest belangrijke instellingen
Comment[pl]=Panel szybkiego dostępu do najważniejszych ustawień
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]=Панель для пришвидшення доступу до найважливіших параметрів