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 2020-07-31 05:43:20 +02:00
parent c81eaee352
commit 6677d9a887
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/plasma-mobile.desktop.cmake
View file

@ -3,7 +3,7 @@ Exec=dbus-run-session ${CMAKE_INSTALL_FULL_BINDIR}/kwinwrapper
TryExec=${CMAKE_INSTALL_FULL_BINDIR}/kwinwrapper
DesktopNames=KDE
Name=Plasma Mobile
Name[ca]=Plasma Mòbil
Name[ca]=Plasma mòbil
Name[ca@valencia]=Plasma Mòbil
Name[cs]=Plasma Mobile
Name[da]=Plasma Mobile
@ -35,7 +35,7 @@ Name[x-test]=xxPlasma Mobilexx
Name[zh_CN]=Plasma Mobile
Name[zh_TW]=Plasma 行動
Comment=Plasma Mobile by KDE
Comment[ca]=Plasma Mòbil, creat per la comunitat KDE
Comment[ca]=Plasma mòbil, creat per la comunitat KDE
Comment[ca@valencia]=Plasma Mòbil, creat per la comunitat KDE
Comment[cs]=Plasma Mobile od KDE
Comment[da]=Plasma Mobile fra KDE

2
look-and-feel/metadata.desktop
View file

@ -31,7 +31,7 @@ Name[x-test]=xxPlasma Phonexx
Name[zh_CN]=Plasma Phone
Name[zh_TW]=Plasma 電話
Comment=Plasma workspace for smartphones
Comment[ca]=Espai de treball del plasma per a telèfons intel·ligents
Comment[ca]=Espai de treball del Plasma per a telèfons intel·ligents
Comment[ca@valencia]=Espai de treball del plasma per a telèfons intel·ligents
Comment[da]=Plasma arbejdsområde til smartphones
Comment[de]=Plasma-Arbeitsbereich für Smartphones