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 2024-03-14 01:15:01 +00:00
parent 5f9f6b2d18
commit a8e6caf7c0
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcms/powermanagement/kcm_mobile_power.json
View file

@ -25,7 +25,7 @@
"Description[pl]": "Ustawienia zarządzania energią",
"Description[pt_BR]": "Configurar as opções do gerenciamento de energia",
"Description[sk]": "Konfigurácia nastavení správy napájania",
"Description[sl]": "Konfiguriraj nastavitve upravljanja z energijo",
"Description[sl]": "Nastavi upravljanje z energijo",
"Description[tr]": "Güç yönetimi ayarlarını yapılandır",
"Description[uk]": "Налаштовування керування живленням",
"Description[x-test]": "xxConfigure power management settingsxx",