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 2022-10-20 02:06:33 +00:00
parent 312cd8cfea
commit 68dfdefbda
10 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bin/plasma-mobile-dev.desktop.cmake
View file

@ -31,7 +31,6 @@ Name[uk]=Мобільна Плазма (версія у розробці)
Name[x-test]=xxPlasma Mobile (Development)xx
Name[zh_CN]=Plasma Mobile (开发)
Comment=Plasma Mobile by KDE
Comment[ast]=Plasma Mobile, por KDE
Comment[az]=KDE Plasma Mobil
Comment[ca]=Plasma Mobile, creat per la comunitat KDE
Comment[ca@valencia]=Plasma Mobile, creat per la comunitat KDE

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

@ -6,7 +6,6 @@ Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/plasma-dbus-run-session-if-needed ${CMAKE_I
TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasmamobile
DesktopNames=KDE
Name=Plasma Mobile
Name[ast]=Plasma Mobile
Name[az]=Plasma Mobil
Name[ca]=Plasma Mobile
Name[ca@valencia]=Plasma Mobile
@ -46,7 +45,6 @@ Name[x-test]=xxPlasma Mobilexx
Name[zh_CN]=Plasma Mobile
Name[zh_TW]=Plasma 行動
Comment=Plasma Mobile by KDE
Comment[ast]=Plasma Mobile, por KDE
Comment[az]=KDE Plasma Mobil
Comment[ca]=Plasma Mobile, creat per la comunitat KDE
Comment[ca@valencia]=Plasma Mobile, creat per la comunitat KDE

1
containments/panel/package/metadata.json
View file

@ -53,7 +53,6 @@
"Id": "org.kde.phone.panel",
"License": "GPLv2+",
"Name": "Phone Panel",
"Name[ast]": "Panel del teléfonu",
"Name[az]": "Telefon paneli",
"Name[ca@valencia]": "Quadro del telèfon",
"Name[ca]": "Plafó del telèfon",

1
containments/taskpanel/package/metadata.json
View file

@ -53,7 +53,6 @@
"Id": "org.kde.phone.taskpanel",
"License": "GPLv2+",
"Name": "Phone Task panel",
"Name[ast]": "Panel de xeres del teléfonu",
"Name[az]": "Telefon tapşırıq paneli",
"Name[ca@valencia]": "Quadro de tasques del telèfon",
"Name[ca]": "Plafó de tasques del telèfon",

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

@ -3,7 +3,6 @@
[Desktop Entry]
Name=Plasma Mobile
Name[ast]=Plasma Mobile
Name[az]=Plasma Mobil
Name[ca]=Plasma Mobile
Name[ca@valencia]=Plasma Mobile
@ -43,7 +42,6 @@ Name[x-test]=xxPlasma Mobilexx
Name[zh_CN]=Plasma Mobile
Name[zh_TW]=Plasma 行動
Comment=Plasma workspace for smartphones
Comment[ast]=La estaya de trabayu de Plasma pa teléfonos intelixentes
Comment[az]=Smartfonlar üçün Plasma iş sahəsi
Comment[ca]=Espai de treball del Plasma per a telèfons intel·ligents
Comment[ca@valencia]=Espai de treball Plasma per a telèfons intel·ligents
@ -82,7 +80,6 @@ Comment[x-test]=xxPlasma workspace for smartphonesxx
Comment[zh_CN]=专为手机定制的 Plasma 工作空间
Comment[zh_TW]=智慧型手機的 Plasma 工作空間
Keywords=Phone, Workspace, Look and Feel
Keywords[ast]=Teléfonu, estilu y aspeutu, y estaya de trabayu
Keywords[az]=Telefon, İş sahəsi, Xarici görünüş
Keywords[ca]=Telèfon, Espai de treball, Aspecte i comportament
Keywords[ca@valencia]=Telèfon, Espai de treball, Aspecte i comportament

1
plasma_phone_components.notifyrc
View file

@ -4,7 +4,6 @@
[Global]
IconName=preferences-system-windows-effect-screenshot
Name=Plasma
Name[ast]=Plasma
Name[az]=Plasma
Name[ca]=Plasma
Name[ca@valencia]=Plasma

1
quicksettings/donotdisturb/metadata.json
View file

@ -64,6 +64,7 @@
"Name[nl]": "Niet storen",
"Name[pl]": "Nie przeszkadzać",
"Name[pt]": "Não Incomodar",
"Name[pt_BR]": "Não perturbe",
"Name[ru]": "Не беспокоить",
"Name[sl]": "Ne moti",
"Name[sv]": "Stör ej",

1
quicksettings/record/package/contents/metadata.json
View file

@ -64,6 +64,7 @@
"Name[nl]": "Scherm opnemen",
"Name[pl]": "Nagraj ekran",
"Name[pt]": "Gravar o Ecrã",
"Name[pt_BR]": "Gravar tela",
"Name[ru]": "Запись экрана",
"Name[sl]": "Posnemi zaslon",
"Name[sv]": "Spela in bildskärm",

1
quicksettings/screenrotation/package/metadata.json
View file

@ -44,6 +44,7 @@
"Description[nl]": "Snelle instelling van schermrotatie",
"Description[pl]": "Szybkie ustawienie obracania ekranu",
"Description[pt]": "Configuração rápida da rotação do ecrã",
"Description[pt_BR]": "Configurações rápidas de rotação da tela",
"Description[ru]": "Быстрая настройка поворота экрана",
"Description[sl]": "Hitre nastavitve sukanja zaslona",
"Description[sv]": "Snabbinställning av skärmrotation",

1
shell/metadata.json
View file

@ -58,7 +58,6 @@
"Id": "org.kde.plasma.phoneshell",
"License": "GPLv2+",
"Name": "Phone",
"Name[ast]": "Teléfonu",
"Name[az]": "Telefon",
"Name[ca@valencia]": "Telèfon",
"Name[ca]": "Telèfon",