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 2022-08-11 01:44:52 +00:00
parent 74b61890f2
commit b9fbb2da57
22 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,7 @@
"Name[en_GB]": "Marco Martin",
"Name[es]": "Marco Martin",
"Name[eu]": "Marco Martin",
"Name[fi]": "Marco Martin",
"Name[fr]": "Marco Martin",
"Name[it]": "Marco Martin",
"Name[nl]": "Marco Martin",

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

@ -30,6 +30,7 @@
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fi]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",

1
containments/panel/package/metadata.json
View file

@ -11,6 +11,7 @@
"Name[en_GB]": "Marco Martin",
"Name[es]": "Marco Martin",
"Name[eu]": "Marco Martin",
"Name[fi]": "Marco Martin",
"Name[fr]": "Marco Martin",
"Name[it]": "Marco Martin",
"Name[nl]": "Marco Martin",

1
containments/taskpanel/package/metadata.json
View file

@ -11,6 +11,7 @@
"Name[en_GB]": "Marco Martin",
"Name[es]": "Marco Martin",
"Name[eu]": "Marco Martin",
"Name[fi]": "Marco Martin",
"Name[fr]": "Marco Martin",
"Name[it]": "Marco Martin",
"Name[nl]": "Marco Martin",

2
kcms/mobileshell/kcm_mobileshell.json
View file

@ -11,6 +11,7 @@
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fi]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",
@ -32,6 +33,7 @@
"Description[en_GB]": "Configure the system shell",
"Description[es]": "Configurar el intérprete de órdenes del sistema",
"Description[eu]": "Konfiguratu sistemaren oskola",
"Description[fi]": "Aseta järjestelmän komentotulkki",
"Description[fr]": "Configurer le shell du système",
"Description[it]": "Configura la shell di sistema",
"Description[nl]": "De systeem-shell configureren",

1
quicksettings/airplanemode/metadata.json
View file

@ -35,6 +35,7 @@
"Name[en_GB]": "Bhushan Shah",
"Name[es]": "Bhushan Shah",
"Name[eu]": "Bhushan Shah",
"Name[fi]": "Bhushan Shah",
"Name[fr]": "Bhushan Shah",
"Name[it]": "Bhushan Shah",
"Name[nl]": "Bhushan Shah",

1
quicksettings/audio/metadata.json
View file

@ -35,6 +35,7 @@
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fi]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",

1
quicksettings/battery/metadata.json
View file

@ -35,6 +35,7 @@
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fi]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",

1
quicksettings/bluetooth/metadata.json
View file

@ -36,6 +36,7 @@
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fi]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",

1
quicksettings/caffeine/metadata.json
View file

@ -11,6 +11,7 @@
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fi]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",

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

@ -35,6 +35,7 @@
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fi]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",

1
quicksettings/keyboardtoggle/metadata.json
View file

@ -11,6 +11,7 @@
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fi]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",

1
quicksettings/location/metadata.json
View file

@ -35,6 +35,7 @@
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fi]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",

1
quicksettings/mobiledata/metadata.json
View file

@ -35,6 +35,7 @@
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fi]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",

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

@ -11,6 +11,7 @@
"Name[en_GB]": "Aleix Pol",
"Name[es]": "Aleix Pol",
"Name[eu]": "Aleix Pol",
"Name[fi]": "Aleix Pol",
"Name[fr]": "Aleix Pol",
"Name[it]": "Aleix Pol",
"Name[nl]": "Aleix Pol",

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

@ -11,6 +11,7 @@
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fi]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",

1
quicksettings/record/metadata.json
View file

@ -11,6 +11,7 @@
"Name[en_GB]": "Aleix Pol i Gonzalez",
"Name[es]": "Aleix Pol i Gonzalez",
"Name[eu]": "Aleix Pol i Gonzalez",
"Name[fi]": "Aleix Pol i Gonzalez",
"Name[fr]": "Aleix Pol i Gonzalez",
"Name[it]": "Aleix Pol i Gonzalez",
"Name[nl]": "Aleix Pol i Gonzalez",

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

@ -35,6 +35,7 @@
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fi]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",

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

@ -35,6 +35,7 @@
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fi]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",

1
quicksettings/settingsapp/metadata.json
View file

@ -36,6 +36,7 @@
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fi]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",

1
quicksettings/wifi/metadata.json
View file

@ -37,6 +37,7 @@
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[eu]": "Devin Lin",
"Name[fi]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",

2
shell/metadata.json
View file

@ -11,6 +11,7 @@
"Name[en_GB]": "Aaron Seigo",
"Name[es]": "Aaron Seigo",
"Name[eu]": "Aaron Seigo",
"Name[fi]": "Aaron Seigo",
"Name[fr]": "Aaron Seigo",
"Name[it]": "Aaron Seigo",
"Name[nl]": "Aaron Seigo",
@ -33,6 +34,7 @@
"Description[en_GB]": "Plasma shell for phones",
"Description[es]": "Intérprete de órdenes de Plasma para teléfonos",
"Description[eu]": "Telefonoetarako Plasma oskola",
"Description[fi]": "Puhelinten Plasma-käyttöliittymä",
"Description[fr]": "Shell Plasma pour téléphones",
"Description[it]": "Shell di Plasma per telefoni",
"Description[nl]": "Plasma-shell voor telefoons",