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-09-25 09:56:00 +02:00
parent c021a47ed7
commit e140dfd935
5 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
fileitemactionplugin/kdeconnectsendfile.json
View file

@ -42,6 +42,7 @@
"Name[ca]": "Envia el fitxer a través del KDE Connect", "Name[ca]": "Envia el fitxer a través del KDE Connect",
"Name[cs]": "Poslat soubor přes KDE Connect", "Name[cs]": "Poslat soubor přes KDE Connect",
"Name[da]": "Send fil via KDE Connect", "Name[da]": "Send fil via KDE Connect",
"Name[de]": "Datei mit KDE Connect versenden",
"Name[en_GB]": "Send file via KDE Connect", "Name[en_GB]": "Send file via KDE Connect",
"Name[es]": "Enviar archivo con KDE Connect", "Name[es]": "Enviar archivo con KDE Connect",
"Name[et]": "Faili saatmine KDE Connecti kaudu", "Name[et]": "Faili saatmine KDE Connecti kaudu",

1
plugins/bigscreen/kdeconnect_bigscreen.json
View file

@ -9,6 +9,7 @@
"Name[ca]": "Aditya Mehra", "Name[ca]": "Aditya Mehra",
"Name[cs]": "Aditya Mehra", "Name[cs]": "Aditya Mehra",
"Name[da]": "Aditya Mehra", "Name[da]": "Aditya Mehra",
"Name[de]": "Aditya Mehra",
"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",

2
settings/org.kde.kdeconnect.settings.desktop
View file

@ -11,7 +11,7 @@ Name[ca]=Arranjament del KDE Connect
Name[ca@valencia]=Arranjament del KDE Connect Name[ca@valencia]=Arranjament del KDE Connect
Name[cs]=Nastavení KDE Connect Name[cs]=Nastavení KDE Connect
Name[da]=Indstilling af KDE Connect Name[da]=Indstilling af KDE Connect
Name[de]=KDE-Connect-Einstellungen Name[de]=KDE Connect-Einstellungen
Name[el]=Ρυθμίσεις KDE Connect Name[el]=Ρυθμίσεις KDE Connect
Name[en_GB]=KDE Connect Settings Name[en_GB]=KDE Connect Settings
Name[es]=Ajustes de KDE Connect Name[es]=Ajustes de KDE Connect

2
smsapp/org.kde.kdeconnect.sms.desktop
View file

@ -6,7 +6,7 @@ Name[ca]=SMS del KDE Connect
Name[ca@valencia]=SMS del KDE Connect Name[ca@valencia]=SMS del KDE Connect
Name[cs]=KDE Connect SMS Name[cs]=KDE Connect SMS
Name[da]=KDE Connect SMS Name[da]=KDE Connect SMS
Name[de]=KDE-Connect-SMS Name[de]=KDE Connect-SMS
Name[en_GB]=KDE Connect SMS Name[en_GB]=KDE Connect SMS
Name[es]=SMS de KDE Connect Name[es]=SMS de KDE Connect
Name[et]=KDE Connecti SMS Name[et]=KDE Connecti SMS

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

@ -5,6 +5,7 @@ Name[ca]=Gestor d'URL del KDE Connect
Name[ca@valencia]=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[da]=URL-håndtering til KDE Connect Name[da]=URL-håndtering til KDE Connect
Name[de]=KDE Connect-SMS-Dienstprogramm für URLs (Adressen)
Name[es]=Controlador de URL de KDE Connect Name[es]=Controlador de URL de KDE Connect
Name[eu]=KDE Connect-eko URL maneiatzailea Name[eu]=KDE Connect-eko URL maneiatzailea
Name[fi]=KDE Connectin verkko-osoitekäsittelijä Name[fi]=KDE Connectin verkko-osoitekäsittelijä