marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-08-01 01:07:33 +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-02-07 06:52:29 +01:00
parent 4458d7355e
commit 44198d7d5a
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plasma_phone_components.notifyrc
View file

@ -18,6 +18,7 @@ Name[pa]=ਪਲਾਜ਼ਮਾ
Name[pl]=Plazma Name[pl]=Plazma
Name[pt]=Plasma Name[pt]=Plasma
Name[pt_BR]=Plasma Name[pt_BR]=Plasma
Name[ru]=Plasma
Name[sk]=Plasma Name[sk]=Plasma
Name[sl]=Plasma Name[sl]=Plasma
Name[sv]=Plasma Name[sv]=Plasma