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
bbce00e005
commit
78fa88db0a
3 changed files with 3 additions and 2 deletions
|
@ -40,7 +40,7 @@
|
|||
}
|
||||
],
|
||||
"Description": "Use a connected device to take a photo",
|
||||
"Description[ast]": "Usa un preséu coneutáu pa facer una semeya",
|
||||
"Description[ast]": "Usa un preséu conectáu pa facer una semeya",
|
||||
"Description[az]": "Qoşulmuş cihazla şəkil çəkmək",
|
||||
"Description[ca@valencia]": "Usa un dispositiu connectat per a prendre una fotografia",
|
||||
"Description[ca]": "Usa un dispositiu connectat per a prendre una fotografia",
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
}
|
||||
],
|
||||
"Description": "Control the volume of the connected device",
|
||||
"Description[ast]": "Controla'l volume del preséu coneutáu",
|
||||
"Description[ast]": "Controla'l volume del preséu conectáu",
|
||||
"Description[az]": "Qoşulmuş cihazın səs səviyyəsini idarə etmək",
|
||||
"Description[ca@valencia]": "Controla el volum del dispositiu connectat",
|
||||
"Description[ca]": "Controla el volum del dispositiu connectat",
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
[Desktop Entry]
|
||||
Name=KDE Connect URL Handler
|
||||
Name[ast]=Remanador d'URLs de KDE Connect
|
||||
Name[az]=KDE Connect URL işləyicisi
|
||||
Name[ca]=Gestor d'URL del KDE Connect
|
||||
Name[ca@valencia]=Gestor d'URL del KDE Connect
|
||||
|
|
Loading…
Reference in a new issue