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 2022-02-05 01:46:06 +00:00
parent 8c22f48e59
commit f7ed3ac9f7
3 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plasma_phone_components.notifyrc
View file

@ -24,6 +24,7 @@ Name[pa]=ਪਲਾਜ਼ਮਾ
Name[pl]=Plazma
Name[pt]=Plasma
Name[pt_BR]=Plasma
Name[ro]=Plasma
Name[ru]=Plasma
Name[sk]=Plasma
Name[sl]=Plasma
@ -53,6 +54,7 @@ Name[pa]=ਕੈਪਚਰ ਕੀਤਾ
Name[pl]=Przechwycono
Name[pt]=Capturada
Name[pt_BR]=Capturado
Name[ro]=Capturat
Name[sk]=Zachytené
Name[sl]=Zajeto
Name[sv]=Lagrad
@ -79,6 +81,7 @@ Comment[pa]=ਕੈਪਚਰ ਕੀਤਾ
Comment[pl]=Przechwycono
Comment[pt]=Capturada
Comment[pt_BR]=Capturado
Comment[ro]=Capturat
Comment[sk]=Zachytené
Comment[sl]=Zajeto
Comment[sv]=Lagrad

1
quicksettings/airplanemode/metadata.desktop
View file

@ -22,6 +22,7 @@ Name[pa]=ਏਅਰਪਲੇਨ ਮੋਡ
Name[pl]=Tryb samolotowy
Name[pt]=Modo de Avião
Name[pt_BR]=Modo avião
Name[ro]=Regim de avion
Name[ru]=Режим полёта
Name[sl]=Letalski način
Name[sv]=Flygplansläge

1
quicksettings/nightcolor/package/metadata.desktop
View file

@ -22,6 +22,7 @@ Name[pa]=ਰਾਤ ਦੇ ਰੰਗ
Name[pl]=Barwy nocne
Name[pt]=Cor Nocturna
Name[pt_BR]=Cor noturna
Name[ro]=Culoare nocturnă
Name[ru]=Ночная цветовая схема
Name[sk]=Nočná farba
Name[sl]=Nočna barva