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 2021-08-31 01:29:49 +00:00
parent 5dd617f289
commit 1da2432dec
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plasma_phone_components.notifyrc
View file

@ -48,6 +48,7 @@ Name[pa]=ਕੈਪਚਰ ਕੀਤਾ
Name[pl]=Przechwycono
Name[pt]=Capturada
Name[pt_BR]=Capturado
Name[sk]=Zachytené
Name[sl]=Zajeto
Name[sv]=Lagrad
Name[uk]=Захоплено
@ -72,6 +73,7 @@ Comment[pa]=ਕੈਪਚਰ ਕੀਤਾ
Comment[pl]=Przechwycono
Comment[pt]=Capturada
Comment[pt_BR]=Capturado
Comment[sk]=Zachytené
Comment[sl]=Zajeto
Comment[sv]=Lagrad
Comment[uk]=Захоплено

1
quicksettings/nightcolor/metadata.desktop
View file

@ -13,6 +13,7 @@ Name[nl]=Nachtkleur
Name[pl]=Barwy nocne
Name[pt]=Cor Nocturna
Name[pt_BR]=Cor noturna
Name[sk]=Nočná farba
Name[sl]=Nočna barva
Name[sv]=Nattfärg
Name[uk]=Нічні кольори