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 2023-01-18 01:58:14 +00:00
parent 52e4f4a52a
commit cae02350d8
3 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
containments/homescreens/folio/package/metadata.json
View file

@ -46,6 +46,7 @@
"Description[pa]": "ਮੋਬਾਈਲ ਮੁੱਖ-ਸਕਰੀਨ, ਜੋ ਕਿ ਮਨ ਮੁਤਾਬਕ ਢਾਲਣ ਉੱਤੇ ਕੇਂਦਰਿਤ ਹੈ।",
"Description[pl]": "Przenośny ekran domowy z naciskiem na dostosowywanie.",
"Description[pt]": "Ecrã inicial móvel com um foco na personalização.",
"Description[pt_BR]": "Tela inicial móvel com foco na personalização.",
"Description[ru]": "Начальный экран для мобильных устройств с акцентом на возможностях настройки.",
"Description[sl]": "Mobilni domači zaslon z poudarkom na prilagodljivosti po meri.",
"Description[sv]": "Hemskärm för mobiler fokuserad på anpassningsbarhet.",
@ -67,6 +68,7 @@
"Name[nl]": "Folio",
"Name[pl]": "Folio",
"Name[pt]": "Folio",
"Name[pt_BR]": "Fólio",
"Name[ru]": "Folio",
"Name[sl]": "Folio",
"Name[sv]": "Folio",

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

@ -46,6 +46,7 @@
"Description[pa]": "ਪਲਾਜ਼ਮਾ ਮੋਬਾਈਲ ਲਈ ਸਿਖਰਲਾ ਪੈਨਲ",
"Description[pl]": "Górny panel dla Przenośnej Plazmy",
"Description[pt]": "Painel de topo do Plasma Mobile",
"Description[pt_BR]": "Painel superior do Plasma Mobile",
"Description[ru]": "Верхняя панель Plasma Mobile",
"Description[sl]": "Vrhnja plošča za Plasma Mobile",
"Description[sv]": "Överpanel för Plasma mobil",

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

@ -46,6 +46,7 @@
"Description[pa]": "ਪਲਾਜ਼ਮਾ ਮੋਬਾਈਲ ਲਈ ਨੇਵੀਗੇਸ਼ਨ ਪੈਨਲ",
"Description[pl]": "Panel poruszania się dla Przenośnej Plazmy",
"Description[pt]": "Painel de navegação do Plasma Mobile",
"Description[pt_BR]": "Painel de navegação do Plasma Mobile",
"Description[ru]": "Панель навигации Plasma Mobile",
"Description[sl]": "Krmilna plošča za Plasma Mobile",
"Description[sv]": "Navigeringspanel för Plasma mobil",