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 2018-01-19 05:11:15 +01:00
parent 8418d003fa
commit 4fd02993ea
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,7 @@ 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
Comment[ast]=Un panel p'acceder aína a les opciones más importantes
Comment[ca]=Un plafó per accedir ràpidament a les opcions més importants
Comment[ca@valencia]=Un plafó per accedir ràpidament a les opcions més importants
Comment[en_GB]=A panel to quickly access most important settings

2
plasma-mobile.desktop.cmake
View file

@ -4,6 +4,7 @@ Exec=dbus-launch --exit-with-session ${CMAKE_INSTALL_FULL_BINDIR}/startplasmacom
TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasmacompositor
DesktopNames=KDE
Name=Plasma Mobile
Name[ast]=Plasma Mobile
Name[ca]=Plasma Mòbil
Name[ca@valencia]=Plasma Mòbil
Name[en_GB]=Plasma Mobile
@ -16,6 +17,7 @@ Name[sv]=Plasma mobil
Name[uk]=Мобільна Плазма
Name[x-test]=xxPlasma Mobilexx
Comment=Plasma Mobile by KDE
Comment[ast]=Plasma Mobile por KDE
Comment[ca]=Plasma Mòbil, creat per la comunitat KDE
Comment[ca@valencia]=Plasma Mòbil, creat per la comunitat KDE
Comment[en_GB]=Plasma Mobile by KDE

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

@ -1,5 +1,6 @@
[Desktop Entry]
Name=Touch Test
Name[ast]=Prueba táutil
Name[ca]=Prova el tàctil
Name[ca@valencia]=Prova el tàctil
Name[cs]=Test doteku
@ -19,6 +20,7 @@ Categories=Qt;KDE;System;Development;
Exec=touchtest
GenericName=Terminal
GenericName[ast]=Terminal
GenericName[ca]=Terminal
GenericName[ca@valencia]=Terminal
GenericName[cs]=Terminál