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-04-27 01:43:28 +00:00
parent 5a06537454
commit 40e7cab454
9 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/battery/kdeconnect_battery.json
View file

@ -10,6 +10,7 @@
"Name[ca@valencia]": "Albert Vaca Cintora",
"Name[ca]": "Albert Vaca Cintora",
"Name[cs]": "Albert Vaca Cintora",
"Name[de]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora",
"Name[es]": "Albert Vaca Cintora",
"Name[fi]": "Albert Vaca Cintora",

1
plugins/clipboard/kdeconnect_clipboard.json
View file

@ -10,6 +10,7 @@
"Name[ca@valencia]": "Albert Vaca Cintora",
"Name[ca]": "Albert Vaca Cintora",
"Name[cs]": "Albert Vaca Cintora",
"Name[de]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora",
"Name[es]": "Albert Vaca Cintora",
"Name[fi]": "Albert Vaca Cintora",

1
plugins/mpriscontrol/kdeconnect_mpriscontrol.json
View file

@ -10,6 +10,7 @@
"Name[ca@valencia]": "Albert Vaca Cintora",
"Name[ca]": "Albert Vaca Cintora",
"Name[cs]": "Albert Vaca Cintora",
"Name[de]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora",
"Name[es]": "Albert Vaca Cintora",
"Name[fi]": "Albert Vaca Cintora",

1
plugins/notifications/kdeconnect_notifications.json
View file

@ -10,6 +10,7 @@
"Name[ca@valencia]": "Albert Vaca Cintora",
"Name[ca]": "Albert Vaca Cintora",
"Name[cs]": "Albert Vaca Cintora",
"Name[de]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora",
"Name[es]": "Albert Vaca Cintora",
"Name[fi]": "Albert Vaca Cintora",

1
plugins/pausemusic/kdeconnect_pausemusic.json
View file

@ -10,6 +10,7 @@
"Name[ca@valencia]": "Albert Vaca Cintora",
"Name[ca]": "Albert Vaca Cintora",
"Name[cs]": "Albert Vaca Cintora",
"Name[de]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora",
"Name[es]": "Albert Vaca Cintora",
"Name[fi]": "Albert Vaca Cintora",

1
plugins/ping/kdeconnect_ping.json
View file

@ -10,6 +10,7 @@
"Name[ca@valencia]": "Albert Vaca Cintora",
"Name[ca]": "Albert Vaca Cintora",
"Name[cs]": "Albert Vaca Cintora",
"Name[de]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora",
"Name[es]": "Albert Vaca Cintora",
"Name[fi]": "Albert Vaca Cintora",

1
plugins/runcommand/kdeconnect_runcommand.json
View file

@ -10,6 +10,7 @@
"Name[ca@valencia]": "Albert Vaca Cintora",
"Name[ca]": "Albert Vaca Cintora",
"Name[cs]": "Albert Vaca Cintora",
"Name[de]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora",
"Name[es]": "Albert Vaca Cintora",
"Name[fi]": "Albert Vaca Cintora",

1
plugins/share/kdeconnect_share.json
View file

@ -10,6 +10,7 @@
"Name[ca@valencia]": "Albert Vaca Cintora",
"Name[ca]": "Albert Vaca Cintora",
"Name[cs]": "Albert Vaca Cintora",
"Name[de]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora",
"Name[es]": "Albert Vaca Cintora",
"Name[fi]": "Albert Vaca Cintora",

1
plugins/telephony/kdeconnect_telephony.json
View file

@ -10,6 +10,7 @@
"Name[ca@valencia]": "Albert Vaca Cintora",
"Name[ca]": "Albert Vaca Cintora",
"Name[cs]": "Albert Vaca Cintora",
"Name[de]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora",
"Name[es]": "Albert Vaca Cintora",
"Name[fi]": "Albert Vaca Cintora",