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-05-21 02:19:12 +00:00
parent 0a8fab71bc
commit 2f53c54157
9 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
initialstart/modules/wifi/package/metadata.json
View file

@ -60,6 +60,7 @@
"License": "GPL-2.0+",
"Name": "WiFi",
"Name[ar]": "الشبكة اللاسلكيّ",
"Name[ast]": "Wi-Fi",
"Name[ca@valencia]": "Wi-Fi",
"Name[ca]": "Wi-Fi",
"Name[de]": "Wi-Fi",

1
kcms/info/kcm_mobile_info.json
View file

@ -31,6 +31,7 @@
"Icon": "dialog-information",
"Name": "Information",
"Name[ar]": "معلومات",
"Name[ast]": "Información",
"Name[ca@valencia]": "Informació",
"Name[ca]": "Informació",
"Name[cs]": "Informace",

1
kcms/mobileshell/kcm_mobileshell.json
View file

@ -76,6 +76,7 @@
"License": "GPL",
"Name": "Shell",
"Name[ar]": "الصدَفة",
"Name[ast]": "Shell",
"Name[az]": "Örtük",
"Name[ca@valencia]": "Intèrpret d'ordres",
"Name[ca]": "Intèrpret d'ordres",

1
kcms/time/kcm_mobile_time.json
View file

@ -31,6 +31,7 @@
"Icon": "preferences-system-time",
"Name": "Time and Date",
"Name[ar]": "الوقت والتّاريخ",
"Name[ast]": "Hora ya data",
"Name[ca@valencia]": "Hora i data",
"Name[ca]": "Hora i data",
"Name[cs]": "Datum a čas",

1
kcms/wifi/kcm_mobile_wifi.json
View file

@ -32,6 +32,7 @@
"Icon": "network-wireless-symbolic",
"Name": "Wi-Fi",
"Name[ar]": "واي فاي",
"Name[ast]": "Wi-Fi",
"Name[az]": "Wi-Fi",
"Name[ca@valencia]": "Wi-Fi",
"Name[ca]": "Wi-Fi",

1
quicksettings/bluetooth/metadata.json
View file

@ -66,6 +66,7 @@
"License": "GPL-2.0+",
"Name": "Bluetooth",
"Name[ar]": "بلوتوث",
"Name[ast]": "Bluetooth",
"Name[az]": "Bluetooth",
"Name[ca@valencia]": "Bluetooth",
"Name[ca]": "Bluetooth",

1
quicksettings/settingsapp/metadata.json
View file

@ -67,6 +67,7 @@
"License": "GPL-2.0+",
"Name": "Settings",
"Name[ar]": "الإعدادات",
"Name[ast]": "Configuración",
"Name[az]": "Ayarlar",
"Name[ca@valencia]": "Configuració",
"Name[ca]": "Configuració",

1
quicksettings/wifi/metadata.json
View file

@ -67,6 +67,7 @@
"License": "GPL-2.0+",
"Name": "Wi-Fi",
"Name[ar]": "واي فاي",
"Name[ast]": "Wi-Fi",
"Name[az]": "Wi-Fi",
"Name[ca@valencia]": "Wi-Fi",
"Name[ca]": "Wi-Fi",

1
shell/metadata.json
View file

@ -66,6 +66,7 @@
"License": "GPLv2+",
"Name": "Plasma Mobile",
"Name[ar]": "بلازما الجوال",
"Name[ast]": "Plasma Mobile",
"Name[ca@valencia]": "Plasma Mobile",
"Name[ca]": "Plasma Mobile",
"Name[cs]": "Plasma Mobile",