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
a8cad70400
commit
47c5847877
1 changed files with 6 additions and 0 deletions
|
|
@ -4,7 +4,10 @@
|
|||
"Description[ca]": "Detecta automàticament els APN mòbils en el Plasma Mobile",
|
||||
"Description[eo]": "Aŭtomate detekti ĉelretajn APN en Plasma-Mobile",
|
||||
"Description[es]": "Detección automática de APN móviles en Plasma Mobile",
|
||||
"Description[eu]": "Plasma Mugikorrean APN mugikorren hautemate automatikoa",
|
||||
"Description[fr]": "Détecter automatiquement les APN cellulaires dans Plasma Mobile",
|
||||
"Description[gl]": "Detectar APN celulares automaticamente en Plasma Mobile.",
|
||||
"Description[ia]": "Auto releva APNs de cellular in Plasma Mobile",
|
||||
"Description[ka]": "ფიჭური APN-ების ავტომატური დადგენა Plasma Mobile-ში",
|
||||
"Description[ko]": "Plasma 모바일에서 셀룰러 APN 자동 감지",
|
||||
"Description[nl]": "Cellulaire APN's automatisch in Plasma Mobile detecteren",
|
||||
|
|
@ -17,7 +20,10 @@
|
|||
"Name[ca]": "Detecció automàtica dels APN del Plasma Mobile",
|
||||
"Name[eo]": "Atomata APN-Ekkono de Plasma-Mobile",
|
||||
"Name[es]": "Detección automática de APN en Plasma Mobile",
|
||||
"Name[eu]": "Plasma Mugikorrean APN hautemate automatikoa",
|
||||
"Name[fr]": "Auto-détection des APN de Plasma Mobile",
|
||||
"Name[gl]": "Detección de APN",
|
||||
"Name[ia]": "Autorelevation de APNs de Plasma Mobile",
|
||||
"Name[ka]": "Plasma Mobile-ის APN-ების ავტომატური დადგენა",
|
||||
"Name[ko]": "Plasma 모바일 APN 자동 감지",
|
||||
"Name[nl]": "Plasma Mobile automatisch APN's detecteren",
|
||||
|
|
|
|||
Loading…
Reference in a new issue