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 2020-12-21 06:46:30 +01:00
parent 7c6cabf4a1
commit fa2121b08e
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

@ -6,6 +6,7 @@ Name[ca]=Plasma
Name[cs]=Plasma
Name[en_GB]=Plasma
Name[es]=Plasma
Name[fi]=Plasma
Name[hu]=Plasma
Name[ia]=Plasma
Name[it]=Plasma
@ -25,6 +26,7 @@ Name=Captured
Name[ca]=Captura
Name[en_GB]=Captured
Name[es]=Capturado
Name[fi]=Kaapattu
Name[hu]=Rögzítve
Name[ia]=Capturate
Name[it]=Catturato
@ -41,6 +43,7 @@ Comment=Captured
Comment[ca]=Captura
Comment[en_GB]=Captured
Comment[es]=Capturado
Comment[fi]=Kaapattu
Comment[hu]=Rögzítve
Comment[ia]=Capturate
Comment[it]=Catturato