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
40ea1dd9ff
commit
0e33224079
2 changed files with 4 additions and 0 deletions
|
@ -9,6 +9,7 @@
|
||||||
"Name[en_GB]": "Aditya Mehra",
|
"Name[en_GB]": "Aditya Mehra",
|
||||||
"Name[es]": "Aditya Mehra",
|
"Name[es]": "Aditya Mehra",
|
||||||
"Name[et]": "Aditya Mehra",
|
"Name[et]": "Aditya Mehra",
|
||||||
|
"Name[fi]": "Aditya Mehra",
|
||||||
"Name[fr]": "Aditya Mehra",
|
"Name[fr]": "Aditya Mehra",
|
||||||
"Name[it]": "Aditya Mehra",
|
"Name[it]": "Aditya Mehra",
|
||||||
"Name[lt]": "Aditya Mehra",
|
"Name[lt]": "Aditya Mehra",
|
||||||
|
@ -28,6 +29,7 @@
|
||||||
"Description[en_GB]": "Bigscreen Plugin",
|
"Description[en_GB]": "Bigscreen Plugin",
|
||||||
"Description[es]": "Complemento Bigscreen",
|
"Description[es]": "Complemento Bigscreen",
|
||||||
"Description[et]": "Suurekraani plugin",
|
"Description[et]": "Suurekraani plugin",
|
||||||
|
"Description[fi]": "Bigscreen-liitännäinen",
|
||||||
"Description[fr]": "Module externe « Bigscreen »",
|
"Description[fr]": "Module externe « Bigscreen »",
|
||||||
"Description[it]": "Estensione Bigscreen",
|
"Description[it]": "Estensione Bigscreen",
|
||||||
"Description[lt]": "Bigscreen papildinys",
|
"Description[lt]": "Bigscreen papildinys",
|
||||||
|
@ -49,6 +51,7 @@
|
||||||
"Name[en_GB]": "Bigscreen",
|
"Name[en_GB]": "Bigscreen",
|
||||||
"Name[es]": "Bigscreen",
|
"Name[es]": "Bigscreen",
|
||||||
"Name[et]": "Suurekraan",
|
"Name[et]": "Suurekraan",
|
||||||
|
"Name[fi]": "Bigscreen",
|
||||||
"Name[fr]": "Bigscreen",
|
"Name[fr]": "Bigscreen",
|
||||||
"Name[it]": "Bigscreen",
|
"Name[it]": "Bigscreen",
|
||||||
"Name[lt]": "Bigscreen",
|
"Name[lt]": "Bigscreen",
|
||||||
|
|
|
@ -5,6 +5,7 @@ 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
|
||||||
Name[et]=KDE Connecti URL-ide käitleja
|
Name[et]=KDE Connecti URL-ide käitleja
|
||||||
|
Name[fi]=KDE Connectin verkko-osoitekäsittelijä
|
||||||
Name[fr]=Gestionnaire d'URL de KDE Connect
|
Name[fr]=Gestionnaire d'URL de KDE Connect
|
||||||
Name[it]=Gestore URL di KDE Connect
|
Name[it]=Gestore URL di KDE Connect
|
||||||
Name[lt]=KDE Connect URL doroklė
|
Name[lt]=KDE Connect URL doroklė
|
||||||
|
|
Loading…
Reference in a new issue