SVN_SILENT made messages (.desktop file) - always resolve ours
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:
parent
3a309cc72f
commit
58d35ec881
2 changed files with 4 additions and 0 deletions
|
@ -4,6 +4,7 @@
|
|||
{
|
||||
"Email": "aix.m@outlook.com",
|
||||
"Name": "Aditya Mehra",
|
||||
"Name[ca@valencia]": "Aditya Mehra",
|
||||
"Name[ca]": "Aditya Mehra",
|
||||
"Name[cs]": "Aditya Mehra",
|
||||
"Name[en_GB]": "Aditya Mehra",
|
||||
|
@ -27,6 +28,7 @@
|
|||
}
|
||||
],
|
||||
"Description": "Bigscreen Plugin",
|
||||
"Description[ca@valencia]": "Connector de la Bigscreen",
|
||||
"Description[ca]": "Connector de la Bigscreen",
|
||||
"Description[cs]": "Modul pro velkou obrazovku",
|
||||
"Description[en_GB]": "Bigscreen Plugin",
|
||||
|
@ -52,6 +54,7 @@
|
|||
"Id": "kdeconnect_bigscreen",
|
||||
"License": "GPL",
|
||||
"Name": "Bigscreen",
|
||||
"Name[ca@valencia]": "Bigscreen",
|
||||
"Name[ca]": "Bigscreen",
|
||||
"Name[cs]": "Velká obrazovka",
|
||||
"Name[en_GB]": "Bigscreen",
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
[Desktop Entry]
|
||||
Name=KDE Connect URL Handler
|
||||
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[en_GB]=KDE Connect URL Handler
|
||||
Name[es]=Controlador de URL de KDE Connect
|
||||
|
|
Loading…
Reference in a new issue