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-05-16 01:24:32 +00:00
parent 51c540c1a7
commit eb0ffaf3be
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
look-and-feel/metadata.desktop
View file

@ -57,7 +57,7 @@ Comment[lt]=Plasma darbo sritis, skirta išmaniesiems telefonams
Comment[nl]=Plasma workspace voor smartphones Comment[nl]=Plasma workspace voor smartphones
Comment[nn]=Plasma-arbeidsområde for smarttelefonar Comment[nn]=Plasma-arbeidsområde for smarttelefonar
Comment[pa]=ਸਮਾਰਟ-ਫ਼ੋਨ ਲਈ ਪਲਾਜ਼ਮਾ ਵਰਕਸਪੇਸ Comment[pa]=ਸਮਾਰਟ-ਫ਼ੋਨ ਲਈ ਪਲਾਜ਼ਮਾ ਵਰਕਸਪੇਸ
Comment[pl]=Przestrzeń robocza Plazmy dla smartfonów Comment[pl]=Przestrzeń pracy Plazmy dla smartfonów
Comment[pt]=Área de trabalho Plasma para telemóveis Comment[pt]=Área de trabalho Plasma para telemóveis
Comment[pt_BR]=Espaço de trabalho Plasma para celulares Comment[pt_BR]=Espaço de trabalho Plasma para celulares
Comment[ro]=Spațiu de lucru al Plasma pentru telefoane inteligente Comment[ro]=Spațiu de lucru al Plasma pentru telefoane inteligente