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-02-06 09:47:03 +00:00
parent 5eb9a54bcc
commit 4b57abd556
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plugins/kdeconnect.notifyrc
View file

@ -95,6 +95,14 @@ Name[uk]=Запит щодо пов’язування
Name[x-test]=xxPairing Requestxx 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[de]=Verbindungsanfrage von einem Gerät erhalten
Comment[nl]=Verzoek om een paar te maken ontvangen van apparaten
Comment[pl]=Otrzymano żądanie parowania z urządzenia
Comment[pt]=Pedido de emparelhamento recebido de um dispositivo
Comment[pt_BR]=Solicitação de emparelhamento recebida de um dispositivo
Comment[uk]=Від пристрою отримано запит щодо пов’язування
Comment[x-test]=xxPairing request received from a devicexx
Action=Popup Action=Popup
[Event/callReceived] [Event/callReceived]

1
plugins/notifications/kdeconnect_notifications_config.desktop
View file

@ -9,6 +9,7 @@ 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[ca@valencia]=Ajustament del connector Sincronitza les notificacions
Name[cs]=Nastavení modulu synchronizace upozornění Name[cs]=Nastavení modulu synchronizace upozornění
Name[de]=Einstellungen für Benachrichtigungsabgleich-Modul
Name[el]=Ρυθμίσεις πρόσθετου συγχρονισμού ειδοποιήσεων Name[el]=Ρυθμίσεις πρόσθετου συγχρονισμού ειδοποιήσεων
Name[en_GB]=Notification synchronisation plugin settings Name[en_GB]=Notification synchronisation plugin settings
Name[es]=Preferencias del complemento de sincronización de notificaciones Name[es]=Preferencias del complemento de sincronización de notificaciones