mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-26 14:23:09 +00:00
SVN_SILENT made messages (.desktop file) - always resolve ours
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:
parent
b34862e469
commit
e2e6d4cc13
1 changed files with 18 additions and 0 deletions
|
|
@ -1,8 +1,26 @@
|
|||
[Global]
|
||||
IconName=preferences-system-windows-effect-screenshot
|
||||
Name=Plasma
|
||||
Name[ca]=Plasma
|
||||
Name[nl]=Plasma
|
||||
Name[pt]=Plasma
|
||||
Name[sv]=Plasma
|
||||
Name[uk]=Плазма
|
||||
Name[x-test]=xxPlasmaxx
|
||||
|
||||
[Event/captured]
|
||||
Name=Captured
|
||||
Name[ca]=Captura
|
||||
Name[nl]=Opgenomen
|
||||
Name[pt]=Capturada
|
||||
Name[sv]=Lagrad
|
||||
Name[uk]=Захоплено
|
||||
Name[x-test]=xxCapturedxx
|
||||
Comment=Captured
|
||||
Comment[ca]=Captura
|
||||
Comment[nl]=Opgenomen
|
||||
Comment[pt]=Capturada
|
||||
Comment[sv]=Lagrad
|
||||
Comment[uk]=Захоплено
|
||||
Comment[x-test]=xxCapturedxx
|
||||
Action=Popup
|
||||
|
|
|
|||
Loading…
Reference in a new issue