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
f7ed3ac9f7
commit
0898ee2e80
3 changed files with 5 additions and 0 deletions
|
|
@ -8,6 +8,7 @@ Name[ast]=Plasma
|
|||
Name[ca]=Plasma
|
||||
Name[ca@valencia]=Plasma
|
||||
Name[cs]=Plasma
|
||||
Name[da]=Plasma
|
||||
Name[de]=Plasma
|
||||
Name[en_GB]=Plasma
|
||||
Name[es]=Plasma
|
||||
|
|
@ -38,6 +39,7 @@ Name=Captured
|
|||
Name[ca]=Capturat
|
||||
Name[ca@valencia]=Capturat
|
||||
Name[cs]=Zachyceno
|
||||
Name[da]=Indfanget
|
||||
Name[de]=Aufgenommen
|
||||
Name[en_GB]=Captured
|
||||
Name[es]=Capturado
|
||||
|
|
@ -65,6 +67,7 @@ Comment=Captured
|
|||
Comment[ca]=Capturat
|
||||
Comment[ca@valencia]=Capturat
|
||||
Comment[cs]=Zachyceno
|
||||
Comment[da]=Indfanget
|
||||
Comment[de]=Aufgenommen
|
||||
Comment[en_GB]=Captured
|
||||
Comment[es]=Capturado
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ Name=Airplane Mode
|
|||
Name[ca]=Mode avió
|
||||
Name[ca@valencia]=Mode avió
|
||||
Name[cs]=Režim v Letadle
|
||||
Name[da]=Flytilstand
|
||||
Name[de]=Flugzeug-Modus
|
||||
Name[en_GB]=Airplane Mode
|
||||
Name[es]=Modo avión
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ Name=Night Color
|
|||
Name[ca]=Color de nit
|
||||
Name[ca@valencia]=Color de nit
|
||||
Name[cs]=Noční barva
|
||||
Name[da]=Natfarver
|
||||
Name[de]=Nachtfarben
|
||||
Name[en_GB]=Night Colour
|
||||
Name[es]=Color nocturno
|
||||
|
|
|
|||
Loading…
Reference in a new issue