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-03-03 01:16:49 +00:00
parent 04715ca0ee
commit 1799b03c02
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

@ -8,6 +8,7 @@
"Description[eu]": "Plasma Mugikorrean APN mugikorren hautemate automatikoa", "Description[eu]": "Plasma Mugikorrean APN mugikorren hautemate automatikoa",
"Description[fr]": "Détecter automatiquement les APN cellulaires dans Plasma Mobile", "Description[fr]": "Détecter automatiquement les APN cellulaires dans Plasma Mobile",
"Description[gl]": "Detectar APN celulares automaticamente en Plasma Mobile.", "Description[gl]": "Detectar APN celulares automaticamente en Plasma Mobile.",
"Description[hu]": "APN-ek automatikus észlelése a Plasma Mobile-ban",
"Description[ia]": "Auto releva APNs de cellular in Plasma Mobile", "Description[ia]": "Auto releva APNs de cellular in Plasma Mobile",
"Description[it]": "Rileva automaticamente gli APN cellulari in Plasma Mobile", "Description[it]": "Rileva automaticamente gli APN cellulari in Plasma Mobile",
"Description[ka]": "ფიჭური APN-ების ავტომატური დადგენა Plasma Mobile-ში", "Description[ka]": "ფიჭური APN-ების ავტომატური დადგენა Plasma Mobile-ში",
@ -27,6 +28,7 @@
"Name[eu]": "Plasma Mugikorrean APN hautemate automatikoa", "Name[eu]": "Plasma Mugikorrean APN hautemate automatikoa",
"Name[fr]": "Auto-détection des APN de Plasma Mobile", "Name[fr]": "Auto-détection des APN de Plasma Mobile",
"Name[gl]": "Detección de APN", "Name[gl]": "Detección de APN",
"Name[hu]": "Plasma Mobile automatikus APN észlelés",
"Name[ia]": "Autorelevation de APNs de Plasma Mobile", "Name[ia]": "Autorelevation de APNs de Plasma Mobile",
"Name[it]": "Rilevamento automatico APN di Plasma Mobile", "Name[it]": "Rilevamento automatico APN di Plasma Mobile",
"Name[ka]": "Plasma Mobile-ის APN-ების ავტომატური დადგენა", "Name[ka]": "Plasma Mobile-ის APN-ების ავტომატური დადგენა",