marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +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 2024-05-25 01:18:52 +00:00
parent 6520d131f1
commit 1c16c32303
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kded/autodetectapn/kded_plasma_mobile_autodetectapn.json
View file

@ -3,6 +3,7 @@
"Description": "Autodetect cellular APNs in Plasma Mobile",
"Description[ca@valencia]": "Detecta automàticament els APN mòbils en Plasma Mobile",
"Description[ca]": "Detecta automàticament els APN mòbils en el Plasma Mobile",
"Description[en_GB]": "Autodetect cellular APNs in 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",
@ -27,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[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",
"Name[eu]": "Plasma Mugikorrean APN hautemate automatikoa",