marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-08-02 17:54:45 +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-18 01:24:43 +00:00
parent 9dba71945a
commit 70794cd912
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plasma_phone_components.notifyrc
View file

@ -31,6 +31,7 @@ Name[x-test]=xxPlasmaxx
Name=Captured Name=Captured
Name[ca]=Captura Name[ca]=Captura
Name[cs]=Zachyceno Name[cs]=Zachyceno
Name[de]=Aufgenommen
Name[en_GB]=Captured Name[en_GB]=Captured
Name[es]=Capturado Name[es]=Capturado
Name[eu]=Atzemanda Name[eu]=Atzemanda
@ -53,6 +54,7 @@ Name[x-test]=xxCapturedxx
Comment=Captured Comment=Captured
Comment[ca]=Captura Comment[ca]=Captura
Comment[cs]=Zachyceno Comment[cs]=Zachyceno
Comment[de]=Aufgenommen
Comment[en_GB]=Captured Comment[en_GB]=Captured
Comment[es]=Capturado Comment[es]=Capturado
Comment[eu]=Atzemanda Comment[eu]=Atzemanda