quine-global-labs/mirror-kde-plasma-desktop
1
0
Fork 0
mirror of https://invent.kde.org/plasma/plasma-desktop.git synced 2026-11-03 22:59:45 -09:00
Code Issues Projects Releases Packages Wiki Activity

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 2026-07-19 01:41:19 +00:00
parent 6b755b3d08
commit 3350347453
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
emojier/app/org.kde.plasma.emojier.desktop
View file

@ -37,7 +37,7 @@ Name[nb]=Emoji-velger
Name[nl]=Emoji selectieprogramma
Name[nn]=Emoji-veljar
Name[pa]=ਇਮੋਜ਼ੀ ਚੋਣਕਾਰ
Name[pl]=Wybierak Emoji
Name[pl]=Tablica Emoji
Name[pt]=Selector de Emojis
Name[pt_BR]=Seletor de emoji
Name[ro]=Selector de emoji
@ -80,7 +80,7 @@ GenericName[lv]=Emocijzīmju pārlūkotājs
GenericName[nb]=Emoji-velger
GenericName[nl]=Emoji selectieprogramma
GenericName[nn]=Emoji-veljar
GenericName[pl]=Wybierak Emoji
GenericName[pl]=Tablica Emoji
GenericName[pt]=Selector de Emojis
GenericName[pt_BR]=Seletor de emoji
GenericName[ro]=Selector de emoji

2
kcms/solid_actions/device-actions/solid-device-OpticalDrive.desktop
View file

@ -125,7 +125,7 @@ Name[nds]=Loopwark-Typ
Name[nl]=Apparaattype
Name[nn]=Stasjonstype
Name[pa]=ਡਰਾਇਵ ਕਿਸਮ
Name[pl]=Typ napędu
Name[pl]=Rodzaj napędu
Name[pt]=Tipo de unidade
Name[pt_BR]=Tipo de unidade
Name[ro]=Tip unitate

2
kcms/solid_actions/device-actions/solid-device-StorageDrive.desktop
View file

@ -125,7 +125,7 @@ Name[nds]=Loopwark-Typ
Name[nl]=Apparaattype
Name[nn]=Stasjonstype
Name[pa]=ਡਰਾਇਵ ਕਿਸਮ
Name[pl]=Typ napędu
Name[pl]=Rodzaj napędu
Name[pt]=Tipo de unidade
Name[pt_BR]=Tipo de unidade
Name[ro]=Tip unitate