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-03-03 09:54:08 +00:00
parent 2c88a0ab39
commit c2ff5c5101
3 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
fileitemactionplugin/kdeconnectsendfile.desktop
View file

@ -34,6 +34,7 @@ Name[zh_CN]=通过 KDE Connect 服务发送文件
X-KDE-Library=kdeconnectfiletiemaction X-KDE-Library=kdeconnectfiletiemaction
X-KDE-Submenu=Connect X-KDE-Submenu=Connect
X-KDE-Submenu[ar]=اتّصل,اتصل X-KDE-Submenu[ar]=اتّصل,اتصل
X-KDE-Submenu[ast]=Coneutar
X-KDE-Submenu[bg]=Свързване X-KDE-Submenu[bg]=Свързване
X-KDE-Submenu[bs]=Uspostavi vezu X-KDE-Submenu[bs]=Uspostavi vezu
X-KDE-Submenu[ca]=Connecta X-KDE-Submenu[ca]=Connecta

1
plugins/kdeconnect.notifyrc
View file

@ -99,6 +99,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[ar]=استُلم طلب اقتران من جهاز Comment[ar]=استُلم طلب اقتران من جهاز
Comment[ast]=Solicitú d'empareyamientu recibida d'un preséu
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[ca@valencia]=Les sol·licituds d'aparellament rebudes des d'un dispositiu
Comment[de]=Verbindungsanfrage von einem Gerät erhalten Comment[de]=Verbindungsanfrage von einem Gerät erhalten

1
plugins/notifications/kdeconnect_notifications_config.desktop
View file

@ -7,6 +7,7 @@ X-KDE-ParentComponents=kdeconnect_notifications
Name=Notification synchronization plugin settings Name=Notification synchronization plugin settings
Name[ar]=إعدادات ملحقة مزامنة الإخطارات Name[ar]=إعدادات ملحقة مزامنة الإخطارات
Name[ast]=Axustes del complementu de sincronización d'avisos
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í