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-01-17 06:43:41 +01:00
parent 6204b90a51
commit 545f2d7796
1 changed files with 3 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

@ -15,6 +15,7 @@ Name[it]=Plasma
Name[nl]=Plasma
Name[nn]=Plasma
Name[pa]=ਪਲਾਜ਼ਮਾ
Name[pl]=Plazma
Name[pt]=Plasma
Name[pt_BR]=Plasma
Name[sk]=Plasma
@ -37,6 +38,7 @@ Name[it]=Catturato
Name[nl]=Opgenomen
Name[nn]=Opptak
Name[pa]=ਕੈਪਚਰ ਕੀਤਾ
Name[pl]=Przechwycono
Name[pt]=Capturada
Name[pt_BR]=Capturado
Name[sl]=Zajeto
@ -56,6 +58,7 @@ Comment[it]=Catturato
Comment[nl]=Opgenomen
Comment[nn]=Opptak
Comment[pa]=ਕੈਪਚਰ ਕੀਤਾ
Comment[pl]=Przechwycono
Comment[pt]=Capturada
Comment[pt_BR]=Capturado
Comment[sl]=Zajeto