marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23: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-27 09:12:08 +02:00
parent 4c3d5bcb7f
commit 812c61c5ff
2 changed files with 4 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

@ -14,6 +14,7 @@ Name[pt]=Configuração Rápida
Name[sv]=Snabbinställningar
Name[uk]=Швидке налаштовування
Name[x-test]=xxQuick Settingsxx
Name[zh_TW]=快速設定
Comment=A panel to quickly access most important settings
Comment[ast]=Un panel p'acceder rápidamente a les opciones más importantes
@ -27,6 +28,7 @@ Comment[pt]=Um painel para aceder rapidamente às configurações mais important
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
Comment[zh_TW]=快速存取重要設定的面板
Icon=systemsettings
Type=Service

2
touchscreentest/org.kde.touchtest.desktop
View file

@ -7,6 +7,7 @@ Name[pt]=Teste de Toque
Name[sv]=Beröringsprov
Name[uk]=Тестування дотику
Name[x-test]=xxTouch Testxx
Name[zh_TW]=觸控測試
Categories=Qt;KDE;System;Development;
@ -20,6 +21,7 @@ GenericName[pt]=Terminal
GenericName[sv]=Terminal
GenericName[uk]=Термінал
GenericName[x-test]=xxTerminalxx
GenericName[zh_TW]=終端機
Icon=input-touchpad
MimeType=