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
76d3323e8f
commit
8f70d0afcb
1 changed files with 1 additions and 0 deletions
|
|
@ -28,6 +28,7 @@
|
|||
"Name": "Plasma Mobile Autodetect APNs",
|
||||
"Name[ca@valencia]": "Detecció automàtica dels APN de Plasma Mobile",
|
||||
"Name[ca]": "Detecció automàtica dels APN del Plasma Mobile",
|
||||
"Name[cs]": "Automatická detekce APN v Plasma Mobile",
|
||||
"Name[en_GB]": "Plasma Mobile Autodetect APNs",
|
||||
"Name[eo]": "Atomata APN-Ekkono de Plasma-Mobile",
|
||||
"Name[es]": "Detección automática de APN en Plasma Mobile",
|
||||
|
|
|
|||
Loading…
Reference in a new issue