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 2020-07-13 05:32:17 +02:00
parent 3a309cc72f
commit 58d35ec881
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugins/bigscreen/kdeconnect_bigscreen.json
View file

@ -4,6 +4,7 @@
{ {
"Email": "aix.m@outlook.com", "Email": "aix.m@outlook.com",
"Name": "Aditya Mehra", "Name": "Aditya Mehra",
"Name[ca@valencia]": "Aditya Mehra",
"Name[ca]": "Aditya Mehra", "Name[ca]": "Aditya Mehra",
"Name[cs]": "Aditya Mehra", "Name[cs]": "Aditya Mehra",
"Name[en_GB]": "Aditya Mehra", "Name[en_GB]": "Aditya Mehra",
@ -27,6 +28,7 @@
} }
], ],
"Description": "Bigscreen Plugin", "Description": "Bigscreen Plugin",
"Description[ca@valencia]": "Connector de la Bigscreen",
"Description[ca]": "Connector de la Bigscreen", "Description[ca]": "Connector de la Bigscreen",
"Description[cs]": "Modul pro velkou obrazovku", "Description[cs]": "Modul pro velkou obrazovku",
"Description[en_GB]": "Bigscreen Plugin", "Description[en_GB]": "Bigscreen Plugin",
@ -52,6 +54,7 @@
"Id": "kdeconnect_bigscreen", "Id": "kdeconnect_bigscreen",
"License": "GPL", "License": "GPL",
"Name": "Bigscreen", "Name": "Bigscreen",
"Name[ca@valencia]": "Bigscreen",
"Name[ca]": "Bigscreen", "Name[ca]": "Bigscreen",
"Name[cs]": "Velká obrazovka", "Name[cs]": "Velká obrazovka",
"Name[en_GB]": "Bigscreen", "Name[en_GB]": "Bigscreen",

1
urlhandler/org.kde.kdeconnect.handler.desktop
View file

@ -1,6 +1,7 @@
[Desktop Entry] [Desktop Entry]
Name=KDE Connect URL Handler Name=KDE Connect URL Handler
Name[ca]=Gestor d'URL del KDE Connect Name[ca]=Gestor d'URL del KDE Connect
Name[ca@valencia]=Gestor d'URL del KDE Connect
Name[cs]=Nástroj pro práci s URL v KDE Connect Name[cs]=Nástroj pro práci s URL v KDE Connect
Name[en_GB]=KDE Connect URL Handler Name[en_GB]=KDE Connect URL Handler
Name[es]=Controlador de URL de KDE Connect Name[es]=Controlador de URL de KDE Connect