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-08 11:56:08 +00:00
parent fa1233b051
commit 2058cbc1af
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

@ -93,6 +93,7 @@ Name[x-test]=xxPairing Requestxx
Name[zh_CN]=配对请求 Name[zh_CN]=配对请求
Comment=Pairing request received from a device Comment=Pairing request received from a device
Comment[ca]=Les sol·licituds d'aparellament rebudes des d'un dispositiu 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[en_GB]=Pairing request received from a device Comment[en_GB]=Pairing request received from a device
Comment[it]=Richiesta di associazione ricevuta da un dispositivo Comment[it]=Richiesta di associazione ricevuta da un dispositivo
Comment[nl]=Verzoek om een paar te maken ontvangen van een apparaat Comment[nl]=Verzoek om een paar te maken ontvangen van een apparaat

1
plugins/runcommand/kdeconnect_runcommand_config.desktop
View file

@ -7,6 +7,7 @@ X-KDE-ParentComponents=kdeconnect_runcommand
Name=Run Command plugin settings Name=Run Command plugin settings
Name[ca]=Ajustaments del connector Executa ordres Name[ca]=Ajustaments del connector Executa ordres
Name[ca@valencia]=Ajustaments del connector Executa ordes
Name[en_GB]=Run Command plugin settings Name[en_GB]=Run Command plugin settings
Name[fi]=Suorita komento -liitännäisen asetukset Name[fi]=Suorita komento -liitännäisen asetukset
Name[it]=Impostazioni estensione Esegui comando Name[it]=Impostazioni estensione Esegui comando

1
plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
View file

@ -7,6 +7,7 @@ X-KDE-ParentComponents=kdeconnect_sendnotifications
Name=Notification synchronization plugin settings Name=Notification synchronization plugin settings
Name[ca]=Ajustament del connector Sincronitza les notificacions Name[ca]=Ajustament del connector Sincronitza les notificacions
Name[ca@valencia]=Ajustament del connector Sincronitza les notificacions
Name[en_GB]=Notification synchronisation plugin settings Name[en_GB]=Notification synchronisation plugin settings
Name[it]=Impostazioni dell'estensione di sincronizzazione delle notifiche Name[it]=Impostazioni dell'estensione di sincronizzazione delle notifiche
Name[nl]=Instellingen voor meldingen van synchronisatie plug-in Name[nl]=Instellingen voor meldingen van synchronisatie plug-in