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 2016-08-11 12:17:31 +00:00
parent 89b61e03f5
commit 3215661fec
3 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/kdeconnect.notifyrc
View file

@ -96,6 +96,7 @@ Comment[ca]=Les sol·licituds d'aparellament rebudes des d'un dispositiu
Comment[ca@valencia]=Les sol·licituds d'aparellament rebudes des d'un dispositiu
Comment[cs]=Požadavek na párování přijat ze zařízení
Comment[en_GB]=Pairing request received from a device
Comment[et]=Seadmelt saadi paardumissoov
Comment[it]=Richiesta di associazione ricevuta da un dispositivo
Comment[nl]=Verzoek om een paar te maken ontvangen van een apparaat
Comment[pl]=Otrzymano żądanie parowania z urządzenia

1
plugins/runcommand/kdeconnect_runcommand_config.desktop
View file

@ -10,6 +10,7 @@ Name[ca]=Ajustaments del connector Executa ordres
Name[ca@valencia]=Ajustaments del connector Executa ordes
Name[cs]=Nastavení modulu Spustit příkaz
Name[en_GB]=Run Command plugin settings
Name[et]=Käsu käivitamise plugina seadistused
Name[fi]=Suorita komento -liitännäisen asetukset
Name[it]=Impostazioni estensione Esegui comando
Name[nl]=Plug-in-instellingen van commando Uitvoeren

1
plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
View file

@ -10,6 +10,7 @@ Name[ca]=Ajustament del connector Sincronitza les notificacions
Name[ca@valencia]=Ajustament del connector Sincronitza les notificacions
Name[cs]=Nastavení modulu synchronizace upozornění
Name[en_GB]=Notification synchronisation plugin settings
Name[et]=Märguande sünkroonimise plugina seaditused
Name[it]=Impostazioni dell'estensione di sincronizzazione delle notifiche
Name[nl]=Instellingen voor meldingen van synchronisatie plug-in
Name[pl]=Ustawienia wtyczki synchronizującej powiadomienia