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-06-27 05:41:57 +02:00
parent e5c6003399
commit 588c01eb0f
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

@ -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[eu]": "Aditya Mehra",
"Name[fi]": "Aditya Mehra", "Name[fi]": "Aditya Mehra",
"Name[fr]": "Aditya Mehra", "Name[fr]": "Aditya Mehra",
"Name[it]": "Aditya Mehra", "Name[it]": "Aditya Mehra",
@ -30,6 +31,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[eu]": "Bigscreen plugina",
"Description[fi]": "Bigscreen-liitännäinen", "Description[fi]": "Bigscreen-liitännäinen",
"Description[fr]": "Module externe « Bigscreen »", "Description[fr]": "Module externe « Bigscreen »",
"Description[it]": "Estensione Bigscreen", "Description[it]": "Estensione Bigscreen",
@ -53,6 +55,7 @@
"Name[en_GB]": "Bigscreen", "Name[en_GB]": "Bigscreen",
"Name[es]": "Bigscreen", "Name[es]": "Bigscreen",
"Name[et]": "Suurekraan", "Name[et]": "Suurekraan",
"Name[eu]": "Bigscreen",
"Name[fi]": "Bigscreen", "Name[fi]": "Bigscreen",
"Name[fr]": "Bigscreen", "Name[fr]": "Bigscreen",
"Name[it]": "Bigscreen", "Name[it]": "Bigscreen",

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

@ -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[eu]=KDE Connect-en URL maneiatzailea
Name[fi]=KDE Connectin verkko-osoitekäsittelijä 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