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 2023-02-04 02:10:12 +00:00
parent 0dca298cd6
commit 9f420519b1
17 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
containments/homescreens/halcyon/package/metadata.json
View file

@ -7,6 +7,7 @@
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[cs]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",

1
kcms/mobileshell/kcm_mobileshell.json
View file

@ -7,6 +7,7 @@
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[cs]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",

1
quicksettings/audio/metadata.json
View file

@ -7,6 +7,7 @@
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[cs]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",

1
quicksettings/battery/metadata.json
View file

@ -7,6 +7,7 @@
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[cs]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",

1
quicksettings/bluetooth/metadata.json
View file

@ -7,6 +7,7 @@
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[cs]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",

1
quicksettings/caffeine/metadata.json
View file

@ -7,6 +7,7 @@
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[cs]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",

2
quicksettings/donotdisturb/metadata.json
View file

@ -7,6 +7,7 @@
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[cs]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
@ -54,6 +55,7 @@
"Name": "Do Not Disturb",
"Name[ca@valencia]": "No destorbar",
"Name[ca]": "No destorbar",
"Name[cs]": "Nerušit",
"Name[en_GB]": "Do Not Disturb",
"Name[es]": "No molestar",
"Name[eu]": "Zatarik ez",

1
quicksettings/flashlight/package/metadata.json
View file

@ -7,6 +7,7 @@
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[cs]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",

1
quicksettings/keyboardtoggle/metadata.json
View file

@ -7,6 +7,7 @@
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[cs]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",

1
quicksettings/mobiledata/metadata.json
View file

@ -7,6 +7,7 @@
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[cs]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",

1
quicksettings/powermenu/package/metadata.json
View file

@ -7,6 +7,7 @@
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[cs]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",

2
quicksettings/record/package/metadata.json
View file

@ -7,6 +7,7 @@
"Name[az]": "Aleix Pol i Gonzalez",
"Name[ca@valencia]": "Aleix Pol i Gonzalez",
"Name[ca]": "Aleix Pol i Gonzalez",
"Name[cs]": "Aleix Pol i Gonzalez",
"Name[de]": "Aleix Pol i Gonzalez",
"Name[en_GB]": "Aleix Pol i Gonzalez",
"Name[es]": "Aleix Pol i Gonzalez",
@ -53,6 +54,7 @@
"Name": "Record Screen",
"Name[ca@valencia]": "Grava la pantalla",
"Name[ca]": "Enregistra la pantalla",
"Name[cs]": "Nahrávat obrazovku",
"Name[en_GB]": "Record Screen",
"Name[es]": "Grabar la pantalla",
"Name[eu]": "Grabatu pantaila",

1
quicksettings/screenrotation/package/metadata.json
View file

@ -7,6 +7,7 @@
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[cs]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",

1
quicksettings/screenshot/package/metadata.json
View file

@ -7,6 +7,7 @@
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[cs]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",

2
quicksettings/settingsapp/metadata.json
View file

@ -7,6 +7,7 @@
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[cs]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
@ -34,6 +35,7 @@
"Description": "Settings application quick setting for Plasma Mobile",
"Description[ca@valencia]": "Configuració ràpida de la configuració general per a Plasma Mobile",
"Description[ca]": "Configuració ràpida de la configuració general per al Plasma Mobile",
"Description[cs]": "Rychlá nastavení aplikací pro Plasma Mobile",
"Description[es]": "Ajuste rápido de la aplicación de preferencias para Plasma Mobile",
"Description[eu]": "Ezarpen-aplikazioaren ezarpen azkarra Plasma Mugikorrerako",
"Description[fr]": "Configuration rapide de la configuration d'une application pour Plasma Mobile",

2
quicksettings/wifi/metadata.json
View file

@ -7,6 +7,7 @@
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[cs]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
@ -34,6 +35,7 @@
"Description": "Wi-Fi quick setting for Plasma Mobile",
"Description[ca@valencia]": "Configuració ràpida de la Wi-Fi per a Plasma Mobile",
"Description[ca]": "Configuració ràpida de la Wi-Fi per al Plasma Mobile",
"Description[cs]": "Rychlé nastavení WiFi pro mobilní telefony",
"Description[es]": "Ajuste rápido del wifi para Plasma Mobile",
"Description[eu]": "Wi-Fi ezarpen azkarra Plasma Mugikorrerako",
"Description[fr]": "Configuration rapide du Wifi pour Plasma Mobile",

2
shell/metadata.json
View file

@ -7,6 +7,7 @@
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[cs]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
@ -35,6 +36,7 @@
"Description": "Plasma shell for mobile devices",
"Description[ca@valencia]": "Espai de treball Plasma per a dispositius mòbils",
"Description[ca]": "Espai de treball Plasma per a dispositius mòbils",
"Description[cs]": "Prostředí Plasma pro mobilní telefony",
"Description[es]": "Intérprete de órdenes de Plasma para dispositivos móviles",
"Description[eu]": "Plasma oskola gailu mugikorretarako",
"Description[fr]": "Plasmashell pour périphériques mobiles",