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 2025-07-30 01:34:16 +00:00
parent 542813c1f5
commit 4389406655
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kcms/waydroidintegration/kcm_waydroidintegration.json
View file

@ -16,6 +16,7 @@
"Name[ko]": "Florian RICHER",
"Name[nl]": "Florian RICHER",
"Name[sl]": "Florian RICHER",
"Name[sv]": "Florian RICHER",
"Name[tr]": "Florian RICHER",
"Name[uk]": "Florian RICHER",
"Name[x-test]": "xxFlorian RICHERxx",
@ -36,6 +37,7 @@
"Description[ko]": "Waydroid 설정",
"Description[nl]": "Waydroid-configuratie",
"Description[sl]": "Konfiguracija Waydroid",
"Description[sv]": "Inställning av Waydroid",
"Description[tr]": "Waydroid yapılandırması",
"Description[uk]": "Налаштовування Waydroid",
"Description[x-test]": "xxWaydroid configurationxx",
@ -62,6 +64,7 @@
"Name[ko]": "Waydroid 통합",
"Name[nl]": "Waydroid-integratie",
"Name[sl]": "Integracija Waydroid",
"Name[sv]": "Integrering av Waydroid",
"Name[tr]": "Waydroid Tümleştirmesi",
"Name[uk]": "Інтеграція з Waydroid",
"Name[x-test]": "xxWaydroid Integrationxx",
@ -81,6 +84,7 @@
"X-KDE-Keywords[ko]": "waydroid",
"X-KDE-Keywords[nl]": "waydroid",
"X-KDE-Keywords[sl]": "waydroid",
"X-KDE-Keywords[sv]": "waydroid",
"X-KDE-Keywords[tr]": "waydroid",
"X-KDE-Keywords[uk]": "waydroid",
"X-KDE-Keywords[x-test]": "xxwaydroidxx",

3
quicksettings/waydroid/metadata.json
View file

@ -17,6 +17,7 @@
"Name[ko]": "Florian RICHER",
"Name[nl]": "Florian RICHER",
"Name[sl]": "Florian RICHER",
"Name[sv]": "Florian RICHER",
"Name[tr]": "Florian RICHER",
"Name[uk]": "Florian RICHER",
"Name[x-test]": "xxFlorian RICHERxx",
@ -36,6 +37,7 @@
"Description[ko]": "Plasma 모바일의 Waydroid 빠른 설정",
"Description[nl]": "Waydroid snelle instelling van audio voor Plasma Mobile",
"Description[sl]": "Hitre nastavitve za Plasma Mobile",
"Description[sv]": "Snabbinställning av Waydroid för Plasma mobil",
"Description[tr]": "Plasma Cep Waydroid tez ayarı",
"Description[uk]": "Швидке налаштовування Waydroid для Мобільної Плазми",
"Description[x-test]": "xxWaydroid quick setting for Plasma Mobilexx",
@ -56,6 +58,7 @@
"Name[ko]": "Waydroid",
"Name[nl]": "Waydroid",
"Name[sl]": "Waydroid",
"Name[sv]": "Waydroid",
"Name[tr]": "Waydroid",
"Name[uk]": "Waydroid",
"Name[x-test]": "xxWaydroidxx",