marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-29 15:03: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 2023-03-27 03:54:14 +00:00
parent fe8537c618
commit 2596778cba
3 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcms/hotspot/kcm_mobile_hotspot.json
View file

@ -7,6 +7,7 @@
"Name[ca@valencia]": "Tobias Fella",
"Name[ca]": "Tobias Fella",
"Name[cs]": "Tobias Fella",
"Name[en_GB]": "Tobias Fella",
"Name[es]": "Tobias Fella",
"Name[fr]": "Tobias Fella",
"Name[ia]": "Tobias Fella",
@ -24,6 +25,7 @@
"Description[ca@valencia]": "Punt d'accés Wi-Fi",
"Description[ca]": "Punt d'accés Wi-Fi",
"Description[cs]": "Hotspot WiFi",
"Description[en_GB]": "Wi-Fi Hotspot",
"Description[es]": "Punto de acceso wifi",
"Description[fr]": "Points d'accès Wifi",
"Description[ia]": "Hotspots de Wi-Fi",

1
kcms/wifi/kcm_mobile_wifi.json
View file

@ -5,6 +5,7 @@
"Description[ca@valencia]": "Configureu la xarxa sense fil",
"Description[ca]": "Configuració de la xarxa sense fil",
"Description[cs]": "Nastavení bezdrátové sítě",
"Description[en_GB]": "Wireless network setting",
"Description[es]": "Preferencias de la red inalámbrica",
"Description[fr]": "Configuration des réseaux sans fil",
"Description[ia]": "Preferentia de rete sin cablos",

2
kwin/mobiletaskswitcher/metadata.json
View file

@ -4,6 +4,7 @@
"Description": "Allows you to switch between running tasks with a mobile interface.",
"Description[ca@valencia]": "Us permet canviar entre les tasques diferents en execució amb una interfície mòbil.",
"Description[ca]": "Us permet canviar entre les tasques diferents en execució amb una interfície mòbil.",
"Description[en_GB]": "Allows you to switch between running tasks with a mobile interface.",
"Description[es]": "Le permite cambiar entre tareas en ejecución con una interfaz móvil.",
"Description[fr]": "Vous permet de basculer entre des tâches en exécution avec une interface pour périphérique mobile.",
"Description[ia]": "Te permitte commutar inter cargas executante con un interfaciemobile.",
@ -20,6 +21,7 @@
"Name": "Mobile Task Switcher",
"Name[ca@valencia]": "Commutador de tasques del mòbil",
"Name[ca]": "Commutador de tasques del mòbil",
"Name[en_GB]": "Mobile Task Switcher",
"Name[es]": "Selector de tareas móvil",
"Name[fr]": "Commutateur de tâches pour périphérique mobile",
"Name[ia]": "Commutator de carga Mobile",