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 2021-05-17 01:35:01 +00:00
parent eb0ffaf3be
commit 9dba71945a
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

@ -13,6 +13,7 @@ Name[fr]=Plasma
Name[hu]=Plasma Name[hu]=Plasma
Name[ia]=Plasma Name[ia]=Plasma
Name[it]=Plasma Name[it]=Plasma
Name[ko]=Plasma
Name[nl]=Plasma Name[nl]=Plasma
Name[nn]=Plasma Name[nn]=Plasma
Name[pa]=ਪਲਾਜ਼ਮਾ Name[pa]=ਪਲਾਜ਼ਮਾ
@ -38,6 +39,7 @@ Name[fr]=Capturé
Name[hu]=Rögzítve Name[hu]=Rögzítve
Name[ia]=Capturate Name[ia]=Capturate
Name[it]=Catturato Name[it]=Catturato
Name[ko]=캡처됨
Name[nl]=Opgenomen Name[nl]=Opgenomen
Name[nn]=Opptak Name[nn]=Opptak
Name[pa]=ਕੈਪਚਰ ਕੀਤਾ Name[pa]=ਕੈਪਚਰ ਕੀਤਾ
@ -59,6 +61,7 @@ Comment[fr]=Capturé
Comment[hu]=Rögzítve Comment[hu]=Rögzítve
Comment[ia]=Capturate Comment[ia]=Capturate
Comment[it]=Catturato Comment[it]=Catturato
Comment[ko]=캡처됨
Comment[nl]=Opgenomen Comment[nl]=Opgenomen
Comment[nn]=Opptak Comment[nn]=Opptak
Comment[pa]=ਕੈਪਚਰ ਕੀਤਾ Comment[pa]=ਕੈਪਚਰ ਕੀਤਾ