tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests 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-10-26 03:24:01 +00:00
parent d5624b4f28
commit d78e4e01a4
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/bigscreen/kdeconnect_bigscreen.json
View file

@ -84,7 +84,7 @@
"Name[ar]": "التحكم الصوتي للشاشة الكبيرة", "Name[ar]": "التحكم الصوتي للشاشة الكبيرة",
"Name[az]": "Böyük Ekran səs ilə idarəetmə", "Name[az]": "Böyük Ekran səs ilə idarəetmə",
"Name[bg]": "Bigscreen управление на гласа", "Name[bg]": "Bigscreen управление на гласа",
"Name[ca@valencia]": "Control de veu de Bigscreen", "Name[ca@valencia]": "Control de veu de la Bigscreen",
"Name[ca]": "Control de veu de la Bigscreen", "Name[ca]": "Control de veu de la Bigscreen",
"Name[cs]": "Hlasové ovládání pro Bigscreen", "Name[cs]": "Hlasové ovládání pro Bigscreen",
"Name[en_GB]": "Bigscreen voice control", "Name[en_GB]": "Bigscreen voice control",