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 2020-12-22 06:28:16 +01:00
parent fa2121b08e
commit f6f77d3e65
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plasma_phone_components.notifyrc
View file

@ -6,7 +6,9 @@ Name[ca]=Plasma
Name[cs]=Plasma Name[cs]=Plasma
Name[en_GB]=Plasma Name[en_GB]=Plasma
Name[es]=Plasma Name[es]=Plasma
Name[eu]=Plasma
Name[fi]=Plasma Name[fi]=Plasma
Name[fr]=Plasma
Name[hu]=Plasma Name[hu]=Plasma
Name[ia]=Plasma Name[ia]=Plasma
Name[it]=Plasma Name[it]=Plasma
@ -26,7 +28,9 @@ Name=Captured
Name[ca]=Captura Name[ca]=Captura
Name[en_GB]=Captured Name[en_GB]=Captured
Name[es]=Capturado Name[es]=Capturado
Name[eu]=Atzemanda
Name[fi]=Kaapattu Name[fi]=Kaapattu
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
@ -43,7 +47,9 @@ Comment=Captured
Comment[ca]=Captura Comment[ca]=Captura
Comment[en_GB]=Captured Comment[en_GB]=Captured
Comment[es]=Capturado Comment[es]=Capturado
Comment[eu]=Atzemanda
Comment[fi]=Kaapattu Comment[fi]=Kaapattu
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