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-09-09 01:47:56 +00:00
parent bc6f26184a
commit b51a575bc6
9 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bin/plasma-mobile-dev.desktop.cmake
View file

@ -8,6 +8,7 @@ Name=Plasma Mobile (Development)
Name[az]=Plasma Mobil (Tərtibat)
Name[ca]=Plasma Mobile (Desenvolupament)
Name[ca@valencia]=Plasma Mobile (Desenvolupament)
Name[cs]=Plasma Mobile (Vývojová)
Name[en_GB]=Plasma Mobile (Development)
Name[es]=Plasma Mobile (desarrollo)
Name[eu]=Plasma Mugikorra (Garapena)

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

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

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

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

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

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

1
quicksettings/airplanemode/metadata.json
View file

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

1
quicksettings/bluetooth/metadata.json
View file

@ -32,7 +32,6 @@
"Description[az]": "Bluetooth sürətli ayarı",
"Description[ca@valencia]": "Configuració ràpida de Bluetooth",
"Description[ca]": "Configuració ràpida del Bluetooth",
"Description[cs]": "Rychlé nastavení Bluetooth",
"Description[en_GB]": "Bluetooth quick setting",
"Description[es]": "Ajuste rápido del Bluetooth",
"Description[eu]": "Bluetootharen ezarpen azkarra",

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

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

1
quicksettings/wifi/metadata.json
View file

@ -32,7 +32,6 @@
"Description[az]": "Wi-Fi sürətli ayarı",
"Description[ca@valencia]": "Configuració ràpida de la Wi-Fi",
"Description[ca]": "Configuració ràpida de la Wi-Fi",
"Description[cs]": "Rychlé nastavení WiFi",
"Description[en_GB]": "Wi-Fi quick setting",
"Description[es]": "Ajuste rápido del wifi",
"Description[eu]": "Wi-Fi ezarpen azkarra",

1
shell/metadata.json
View file

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