Commit 0856c297 authored by Script Kiddy's avatar Script Kiddy

SVN_SILENT made messages (.desktop file) - always resolve ours

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"
parent fe6f1b79
......@@ -464,6 +464,7 @@ Name[zh_CN]=电池电量低
Name[zh_TW]=電池低電量
Comment=Your battery is in low state
Comment[ar]=بطّاريّتك في الحالة الضعيفة
Comment[ast]=La batería tien poca carga
Comment[bg]=Батерията ви е с нисък заряд
Comment[bs]=Vaša baterija je gotovo prazna
Comment[ca]=La bateria està baixa
......@@ -633,6 +634,7 @@ Name[zh_CN]=一般通知
Name[zh_TW]=通用通知
Comment=Notification received
Comment[ar]=استُلم إخطار
Comment[ast]=Recibióse un avisu
Comment[bg]=Уведомлението е прието
Comment[bs]=Primjeno obavještenje
Comment[ca]=Notificació rebuda
......@@ -677,6 +679,7 @@ Action=Popup
[Event/transferReceived]
Name=File Transfer
Name[ar]=نقل الملفّات
Name[ast]=Tresferencia de ficheros
Name[bg]=Прехвърляне на файл
Name[ca]=Transferència de fitxers
Name[ca@valencia]=Transferència de fitxers
......
......@@ -81,6 +81,7 @@
"Name[pt_BR]": "Foto",
"Name[sk]": "Fotka",
"Name[sv]": "Foto",
"Name[tg]": "Сурат",
"Name[uk]": "Фото",
"Name[x-test]": "xxPhotoxx",
"Name[zh_CN]": "照片",
......
......@@ -118,6 +118,7 @@
"Name[sr@latin]": "Ping",
"Name[sr]": "Пинг",
"Name[sv]": "Pinga",
"Name[tg]": "Садо додан",
"Name[tr]": "Ping",
"Name[uk]": "Луна-імпульс",
"Name[x-test]": "xxPingxx",
......
......@@ -159,6 +159,7 @@
"Name[sr@latin]": "Izvrši naredbe",
"Name[sr]": "Изврши наредбе",
"Name[sv]": "Kör kommandon",
"Name[tg]": "Иҷро кардани фармонҳо",
"Name[tr]": "Komut çalıştır",
"Name[uk]": "Виконання команд",
"Name[x-test]": "xxRun commandsxx",
......
......@@ -7,6 +7,7 @@ X-KDE-ParentComponents=kdeconnect_runcommand
Name=Run Command plugin settings
Name[ar]=إعدادات ملحقة تشغيل الأوامر
Name[ast]=Axustes del comandu Execución de comandos
Name[ca]=Ajustaments del connector Executa ordres
Name[ca@valencia]=Ajustaments del connector Executa ordres
Name[cs]=Nastavení modulu Spustit příkaz
......
......@@ -87,6 +87,7 @@
"Name[pt_BR]": "SMS",
"Name[sk]": "SMS",
"Name[sv]": "SMS",
"Name[tg]": "СМС",
"Name[uk]": "SMS",
"Name[x-test]": "xxSMSxx",
"Name[zh_CN]": "短信",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment