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-20 01:43:57 +00:00
parent 084294b566
commit 2a94ef0d96
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

@ -18,6 +18,7 @@
"Name[nl]": "Marco Martin",
"Name[pl]": "Marco Martin",
"Name[pt]": "Marco Martin",
"Name[pt_BR]": "Marco Martin",
"Name[sl]": "Marco Martin",
"Name[sv]": "Marco Martin",
"Name[tr]": "Marco Martin",

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

@ -37,6 +37,7 @@
"Name[nl]": "Devin Lin",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin",

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

@ -18,6 +18,7 @@
"Name[nl]": "Marco Martin",
"Name[pl]": "Marco Martin",
"Name[pt]": "Marco Martin",
"Name[pt_BR]": "Marco Martin",
"Name[sl]": "Marco Martin",
"Name[sv]": "Marco Martin",
"Name[tr]": "Marco Martin",

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

@ -18,6 +18,7 @@
"Name[nl]": "Marco Martin",
"Name[pl]": "Marco Martin",
"Name[pt]": "Marco Martin",
"Name[pt_BR]": "Marco Martin",
"Name[sl]": "Marco Martin",
"Name[sv]": "Marco Martin",
"Name[tr]": "Marco Martin",

2
kcms/mobileshell/kcm_mobileshell.json
View file

@ -18,6 +18,7 @@
"Name[nl]": "Devin Lin",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin",
@ -41,6 +42,7 @@
"Description[nl]": "De systeem-shell configureren",
"Description[pl]": "Ustawienia powłoki systemowej",
"Description[pt]": "Configurar a consola do sistema",
"Description[pt_BR]": "Configurar o shell do sistema",
"Description[sl]": "Konfiguriraj sistemski shell",
"Description[sv]": "Anpassa systemskalet",
"Description[tr]": "Sistem kabuğunu yapılandır",

1
quicksettings/airplanemode/metadata.json
View file

@ -42,6 +42,7 @@
"Name[nl]": "Bhushan Shah",
"Name[pl]": "Bhushan Shah",
"Name[pt]": "Bhushan Shah",
"Name[pt_BR]": "Bhushan Shah",
"Name[sl]": "Bhushan Shah",
"Name[sv]": "Bhushan Shah",
"Name[tr]": "Buşan Şah",

1
quicksettings/audio/metadata.json
View file

@ -42,6 +42,7 @@
"Name[nl]": "Devin Lin",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin",

1
quicksettings/battery/metadata.json
View file

@ -42,6 +42,7 @@
"Name[nl]": "Devin Lin",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin",

1
quicksettings/bluetooth/metadata.json
View file

@ -43,6 +43,7 @@
"Name[nl]": "Devin Lin",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin",

1
quicksettings/caffeine/metadata.json
View file

@ -18,6 +18,7 @@
"Name[nl]": "Devin Lin",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin",

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

@ -42,6 +42,7 @@
"Name[nl]": "Devin Lin",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin",

1
quicksettings/keyboardtoggle/metadata.json
View file

@ -18,6 +18,7 @@
"Name[nl]": "Devin Lin",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin",

1
quicksettings/location/metadata.json
View file

@ -42,6 +42,7 @@
"Name[nl]": "Devin Lin",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin",

1
quicksettings/mobiledata/metadata.json
View file

@ -42,6 +42,7 @@
"Name[nl]": "Devin Lin",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin",

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

@ -18,6 +18,7 @@
"Name[nl]": "Aleix Pol",
"Name[pl]": "Aleix Pol",
"Name[pt]": "Aleix Pol",
"Name[pt_BR]": "Aleix Pol",
"Name[sl]": "Aleix Pol",
"Name[sv]": "Aleix Pol",
"Name[tr]": "Aleix Pol",

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

@ -18,6 +18,7 @@
"Name[nl]": "Devin Lin",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin",

1
quicksettings/record/metadata.json
View file

@ -18,6 +18,7 @@
"Name[nl]": "Aleix Pol i Gonzalez",
"Name[pl]": "Aleix Pol i Gonzalez",
"Name[pt]": "Aleix Pol i Gonzalez",
"Name[pt_BR]": "Aleix Pol i Gonzalez",
"Name[sl]": "Aleix Pol i Gonzalez",
"Name[sv]": "Aleix Pol i Gonzalez",
"Name[tr]": "Aleix Pol i Gonzalez",

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

@ -42,6 +42,7 @@
"Name[nl]": "Devin Lin",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin",

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

@ -42,6 +42,7 @@
"Name[nl]": "Devin Lin",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin",

1
quicksettings/settingsapp/metadata.json
View file

@ -43,6 +43,7 @@
"Name[nl]": "Devin Lin",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin",

1
quicksettings/wifi/metadata.json
View file

@ -44,6 +44,7 @@
"Name[nl]": "Devin Lin",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin",

2
shell/metadata.json
View file

@ -18,6 +18,7 @@
"Name[nl]": "Aaron Seigo",
"Name[pl]": "Aaron Seigo",
"Name[pt]": "Aaron Seigo",
"Name[pt_BR]": "Aaron Seigo",
"Name[sl]": "Aaron Seigo",
"Name[sv]": "Aaron Seigo",
"Name[tr]": "Aaron Seigo",
@ -42,6 +43,7 @@
"Description[nl]": "Plasma-shell voor telefoons",
"Description[pl]": "Powłoka Plazmy dla telefonów",
"Description[pt]": "Consola do Plasma para telemóveis",
"Description[pt_BR]": "Plasma Shell para celulares",
"Description[sl]": "Plasma shell za telefone",
"Description[sv]": "Plasma skal för telefoner",
"Description[tr]": "Telefonlar için Plasma kabuğu",