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
9bd4f0b747
commit
452b9102c6
5 changed files with 8 additions and 4 deletions
|
|
@ -6,6 +6,7 @@ Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/plasma-dbus-run-session-if-needed @CMAKE_IN
|
|||
Type=Application
|
||||
DesktopNames=KDE
|
||||
Name=Plasma Mobile (Development)
|
||||
Name[ar]=بلازما الجوال (التطوير)
|
||||
Name[az]=Plasma Mobil (Tərtibat)
|
||||
Name[ca]=Plasma Mobile (Desenvolupament)
|
||||
Name[ca@valencia]=Plasma Mobile (Desenvolupament)
|
||||
|
|
@ -44,6 +45,7 @@ Name[x-test]=xxPlasma Mobile (Development)xx
|
|||
Name[zh_CN]=Plasma Mobile (开发)
|
||||
Name[zh_TW]=Plasma 行動(開發)
|
||||
Comment=Plasma Mobile by KDE
|
||||
Comment[ar]=بلازما الجوال من كيدي
|
||||
Comment[az]=KDE Plasma Mobil
|
||||
Comment[ca]=Plasma Mobile, creat per la comunitat KDE
|
||||
Comment[ca@valencia]=Plasma Mobile, creat per la comunitat KDE
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@ Name[x-test]=xxPlasma Mobilexx
|
|||
Name[zh_CN]=Plasma Mobile
|
||||
Name[zh_TW]=Plasma 行動
|
||||
Comment=Plasma Mobile by KDE
|
||||
Comment[ar]=بلازما الجوال من كيدي
|
||||
Comment[az]=KDE Plasma Mobil
|
||||
Comment[ca]=Plasma Mobile, creat per la comunitat KDE
|
||||
Comment[ca@valencia]=Plasma Mobile, creat per la comunitat KDE
|
||||
|
|
|
|||
|
|
@ -4,17 +4,14 @@
|
|||
"Authors": [
|
||||
{
|
||||
"Email": "stanleymicah@proton.me",
|
||||
"Name": "Micah Stanley",
|
||||
"Name[x-test]": "xxMicah Stanleyxx"
|
||||
"Name": "Micah Stanley"
|
||||
}
|
||||
],
|
||||
"Description": "Auto Hide Panels quick setting for Plasma Mobile",
|
||||
"Description[x-test]": "xxAuto Hide Panels quick setting for Plasma Mobilexx",
|
||||
"Icon": "view-fullscreen",
|
||||
"Id": "org.kde.plasma.quicksetting.autohidepanels",
|
||||
"License": "GPL-2.0+",
|
||||
"Name": "Auto Hide Panels",
|
||||
"Name[x-test]": "xxAuto Hide Panelsxx",
|
||||
"Website": "https://kde.org"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,6 +49,7 @@ Name[zh_TW]=Plasma
|
|||
|
||||
[Event/captured]
|
||||
Name=Captured
|
||||
Name[ar]=الملتقط
|
||||
Name[az]=Şəkli çəkildi
|
||||
Name[ca]=Capturat
|
||||
Name[ca@valencia]=Capturat
|
||||
|
|
@ -90,6 +91,7 @@ Name[x-test]=xxCapturedxx
|
|||
Name[zh_CN]=已捕获
|
||||
Name[zh_TW]=已擷取
|
||||
Comment=Captured
|
||||
Comment[ar]=الملتقط
|
||||
Comment[az]=Şəkli çəkildi
|
||||
Comment[ca]=Capturat
|
||||
Comment[ca@valencia]=Capturat
|
||||
|
|
|
|||
|
|
@ -49,6 +49,7 @@ Name[zh_TW]=Plasma
|
|||
|
||||
[Event/captured]
|
||||
Name=Captured
|
||||
Name[ar]=الملتقط
|
||||
Name[az]=Şəkli çəkildi
|
||||
Name[ca]=Capturat
|
||||
Name[ca@valencia]=Capturat
|
||||
|
|
@ -90,6 +91,7 @@ Name[x-test]=xxCapturedxx
|
|||
Name[zh_CN]=已捕获
|
||||
Name[zh_TW]=已擷取
|
||||
Comment=Captured
|
||||
Comment[ar]=الملتقط
|
||||
Comment[az]=Şəkli çəkildi
|
||||
Comment[ca]=Capturat
|
||||
Comment[ca@valencia]=Capturat
|
||||
|
|
|
|||
Loading…
Reference in a new issue