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"
This commit is contained in:
parent
b14009afd5
commit
392d287b64
11 changed files with 30 additions and 0 deletions
|
@ -1,6 +1,7 @@
|
|||
[Desktop Entry]
|
||||
Name=KDE Connect
|
||||
Name[ar]=كدي المتّصل
|
||||
Name[ast]=KDE Connect
|
||||
Name[bg]=KDE Connect
|
||||
Name[bs]=Konekcija KDE
|
||||
Name[ca]=KDE Connect
|
||||
|
@ -42,6 +43,7 @@ Name[zh_CN]=KDE Connect
|
|||
Name[zh_TW]=KDE 連線
|
||||
GenericName=Device Synchronization
|
||||
GenericName[ar]=مزامنة الأجهزة
|
||||
GenericName[ast]=Sincronización de preseos
|
||||
GenericName[ca]=Sincronització de dispositius
|
||||
GenericName[ca@valencia]=Sincronització de dispositius
|
||||
GenericName[cs]=Synchronizace zařízení
|
||||
|
@ -80,6 +82,7 @@ GenericName[zh_CN]=设备同步
|
|||
GenericName[zh_TW]=裝置同步
|
||||
Comment=Make all your devices one
|
||||
Comment[ar]=اجعل أجهزتك كلّها واحدًا
|
||||
Comment[ast]=Fai que tolos preseos seyan unu
|
||||
Comment[ca]=Fa que tots els vostres dispositius siguin un
|
||||
Comment[ca@valencia]=Fa que tots els vostres dispositius siguen un
|
||||
Comment[cs]=Sjednoťte svá zařízení
|
||||
|
|
|
@ -10,6 +10,7 @@ Icon=kdeconnect
|
|||
|
||||
Name=KDE Connect
|
||||
Name[ar]=كدي المتّصل
|
||||
Name[ast]=KDE Connect
|
||||
Name[bg]=KDE Connect
|
||||
Name[bs]=Konekcija KDE
|
||||
Name[ca]=KDE Connect
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
[Desktop Entry]
|
||||
Name=KDE Connect Indicator
|
||||
Name[ast]=Indicador de KDE Connnect
|
||||
Name[ca]=Indicador del KDE Connect
|
||||
Name[ca@valencia]=Indicador del KDE Connect
|
||||
Name[cs]=Indikátor KDE Connect
|
||||
|
|
|
@ -12,6 +12,7 @@ X-KDE-System-Settings-Parent-Category=hardware
|
|||
|
||||
Name=KDE Connect
|
||||
Name[ar]=كدي المتّصل
|
||||
Name[ast]=KDE Connect
|
||||
Name[bg]=KDE Connect
|
||||
Name[bs]=Konekcija KDE
|
||||
Name[ca]=KDE Connect
|
||||
|
@ -54,6 +55,7 @@ Name[zh_TW]=KDE 連線
|
|||
|
||||
Comment=Connect and sync your devices
|
||||
Comment[ar]=اتّصل وزامن أجهزتك
|
||||
Comment[ast]=Coneuta y sincroniza preseos
|
||||
Comment[ca]=Connecta i sincronitza els vostres dispositius
|
||||
Comment[ca@valencia]=Connecta i sincronitza els vostres dispositius
|
||||
Comment[cs]=Připojte a synchronizujte svá zařízení
|
||||
|
@ -93,6 +95,7 @@ Comment[zh_TW]=連線並且同步您的裝置
|
|||
|
||||
X-KDE-Keywords=Network,Android,Devices
|
||||
X-KDE-Keywords[ar]=شبكة,أندرويد,اندرويد,جهاز,أجهزة
|
||||
X-KDE-Keywords[ast]=Rede,Android,Preseos
|
||||
X-KDE-Keywords[bg]=Мрежа,Андроид,Устройства
|
||||
X-KDE-Keywords[bs]=Mreža,Android,Uređaji
|
||||
X-KDE-Keywords[ca]=Xarxa,Android,Dispositius
|
||||
|
|
|
@ -5,6 +5,7 @@ Terminal=false
|
|||
Exec=kdeconnect-settings
|
||||
Name=KDE Connect Settings
|
||||
Name[ar]=إعدادات كدي المتّصل
|
||||
Name[ast]=Axustes de KDE Connect
|
||||
Name[ca]=Arranjament del KDE Connect
|
||||
Name[ca@valencia]=Arranjament del KDE Connect
|
||||
Name[cs]=Nastavení KDE Connect
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
[Desktop Entry]
|
||||
Name=KDE Connect
|
||||
Name[ar]=كدي المتّصل
|
||||
Name[ast]=KDE Connect
|
||||
Name[bg]=KDE Connect
|
||||
Name[bs]=Konekcija KDE
|
||||
Name[ca]=KDE Connect
|
||||
|
@ -42,6 +43,7 @@ Name[zh_CN]=KDE Connect
|
|||
Name[zh_TW]=KDE 連線
|
||||
Comment=Show notifications from your devices using KDE Connect
|
||||
Comment[ar]=أظهر الإخطارات من أجهزتك باستخدام «كدي المتّصل»
|
||||
Comment[ast]=Amuesa los avisos de preseos que tean usando KDE Connect
|
||||
Comment[bg]=Показване на уведомления от вашите устройства чрез KDE Connect
|
||||
Comment[bs]=Prikaži obavlještenja sa uređaja koji koriste KDE konekciju
|
||||
Comment[ca]=Mostra les notificacions dels vostres dispositius emprant el KDE Connect
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
IconName=kdeconnect
|
||||
Name=KDE Connect
|
||||
Name[ar]=كدي المتّصل
|
||||
Name[ast]=KDE Connect
|
||||
Name[bg]=KDE Connect
|
||||
Name[bs]=Konekcija KDE
|
||||
Name[ca]=KDE Connect
|
||||
|
@ -86,6 +87,7 @@ Comment[zh_TW]=從您的裝置接收到通知
|
|||
[Event/pairingRequest]
|
||||
Name=Pairing Request
|
||||
Name[ar]=طلب اقتران
|
||||
Name[ast]=Solicitú d'empareyamientu
|
||||
Name[bg]=Заявка за сдвояване
|
||||
Name[bs]=Zahtjev za uparivanje
|
||||
Name[ca]=Sol·licitud d'aparellament
|
||||
|
@ -126,6 +128,7 @@ Name[zh_CN]=配对请求
|
|||
Name[zh_TW]=配對請求
|
||||
Comment=Pairing request received from a device
|
||||
Comment[ar]=استُلم طلب اقتران من جهاز
|
||||
Comment[ast]=Recibióse una solicitú d'empareyamientu d'un preséu
|
||||
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í
|
||||
|
@ -166,6 +169,7 @@ Action=Popup
|
|||
[Event/callReceived]
|
||||
Name=Incoming Call
|
||||
Name[ar]=مكالمة واردة
|
||||
Name[ast]=Llamada entrante
|
||||
Name[bg]=Входящо обаждане
|
||||
Name[ca]=Trucada entrant
|
||||
Name[ca@valencia]=Trucada entrant
|
||||
|
@ -206,6 +210,7 @@ Name[zh_CN]=收到呼叫
|
|||
Name[zh_TW]=電話來電
|
||||
Comment=Someone is calling you
|
||||
Comment[ar]=ثمّة من يتّصل بك
|
||||
Comment[ast]=Daquién ta llamándote
|
||||
Comment[bg]=Някой ви се обажда
|
||||
Comment[bs]=Neko Vas zove
|
||||
Comment[ca]=Algú us està trucant
|
||||
|
@ -250,6 +255,7 @@ Action=Popup
|
|||
[Event/missedCall]
|
||||
Name=Missed Call
|
||||
Name[ar]=مكالمة فائتة
|
||||
Name[ast]=Llamada perdida
|
||||
Name[bg]=Пропуснато обаждане
|
||||
Name[ca]=Trucada perduda
|
||||
Name[ca@valencia]=Trucada perduda
|
||||
|
@ -289,6 +295,7 @@ Name[zh_CN]=错过的呼叫
|
|||
Name[zh_TW]=未接來電
|
||||
Comment=You have a missed call
|
||||
Comment[ar]=لقد فاتتك مكالمة
|
||||
Comment[ast]=Tienes una llamada perdida
|
||||
Comment[bg]=Имате неприето обаждане
|
||||
Comment[bs]=Imate propušten poziv
|
||||
Comment[ca]=Teniu una trucada perduda
|
||||
|
@ -333,6 +340,7 @@ Action=Popup
|
|||
[Event/smsReceived]
|
||||
Name=SMS Received
|
||||
Name[ar]=استُلمت رسالة
|
||||
Name[ast]=SMS recibíu
|
||||
Name[bg]=Получен SMS
|
||||
Name[ca]=S'ha rebut un SMS
|
||||
Name[ca@valencia]=S'ha rebut un SMS
|
||||
|
@ -372,6 +380,7 @@ Name[zh_CN]=收到短信
|
|||
Name[zh_TW]=您有收到短訊
|
||||
Comment=Someone sent you an SMS
|
||||
Comment[ar]=ثمّة من أرسل رسالة إليك
|
||||
Comment[ast]=Daquién unvióte un SMS
|
||||
Comment[bg]=Някой ви изпрати текстово съобщение
|
||||
Comment[bs]=Neko Vam je poslao SMS poruku
|
||||
Comment[ca]=Algú us ha enviat un SMS
|
||||
|
@ -499,6 +508,7 @@ Action=Popup
|
|||
[Event/pingReceived]
|
||||
Name=Ping Received
|
||||
Name[ar]=استُلمت وكزة
|
||||
Name[ast]=Ping recibíu
|
||||
Name[bg]=Пингът е приет
|
||||
Name[ca]=S'ha rebut un ping
|
||||
Name[ca@valencia]=S'ha rebut un ping
|
||||
|
@ -538,6 +548,7 @@ Name[zh_CN]=收到 Ping
|
|||
Name[zh_TW]=收到 Ping 回應
|
||||
Comment=Ping received
|
||||
Comment[ar]=استُلمت وكزة
|
||||
Comment[ast]=Recibióse un ping
|
||||
Comment[bg]=Пингът е приет
|
||||
Comment[bs]=Primili ste ping
|
||||
Comment[ca]=S'ha rebut un ping
|
||||
|
@ -582,6 +593,7 @@ Action=Popup
|
|||
[Event/notification]
|
||||
Name=Generic Notification
|
||||
Name[ar]=إخطار عموميّ
|
||||
Name[ast]=Avisu xenéricu
|
||||
Name[bg]=Общо уведомление
|
||||
Name[ca]=Notificació genèrica
|
||||
Name[ca@valencia]=Notificació genèrica
|
||||
|
@ -705,6 +717,7 @@ Name[zh_CN]=文件传送
|
|||
Name[zh_TW]=檔案傳輸
|
||||
Comment=Incoming file
|
||||
Comment[ar]=ملفّ قادم
|
||||
Comment[ast]=Ficheru entrante
|
||||
Comment[bg]=Входящ файл
|
||||
Comment[ca]=Fitxer entrant
|
||||
Comment[ca@valencia]=Fitxer entrant
|
||||
|
|
|
@ -4,6 +4,7 @@ X-KDE-ServiceType=KdeConnect/Plugin
|
|||
X-KDE-Derived=KPluginInfo
|
||||
Name=KDEConnect Plugin
|
||||
Name[ar]=ملحقة KDEConnect
|
||||
Name[ast]=Plugin KDEConnect
|
||||
Name[bg]=Приставка на KDEConnect
|
||||
Name[bs]=Priključak za KDE konekciju
|
||||
Name[ca]=Connector del KDE Connect
|
||||
|
|
|
@ -5,6 +5,7 @@ Icon=kdeconnect
|
|||
Exec=kdeconnect-sfos
|
||||
Name=KDE Connect
|
||||
Name[ar]=كدي المتّصل
|
||||
Name[ast]=KDE Connect
|
||||
Name[bg]=KDE Connect
|
||||
Name[bs]=Konekcija KDE
|
||||
Name[ca]=KDE Connect
|
||||
|
|
|
@ -9,6 +9,7 @@ NoDisplay=true
|
|||
|
||||
Name=KDEConnect daemon
|
||||
Name[ar]=عفريت KDEConnect
|
||||
Name[ast]=Degorriu KDEConnect
|
||||
Name[bg]=Услуга KDE Connect
|
||||
Name[ca]=Dimoni del KDEConnect
|
||||
Name[ca@valencia]=Dimoni del KDEConnect
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
[Desktop Entry]
|
||||
Name=KDE Connect SMS
|
||||
Name[ast]=SMS de KDE Connect
|
||||
Name[ca]=SMS del KDE Connect
|
||||
Name[ca@valencia]=SMS del KDE Connect
|
||||
Name[cs]=KDE Connect SMS
|
||||
|
@ -27,6 +28,7 @@ Name[x-test]=xxKDE Connect SMSxx
|
|||
Name[zh_CN]=KDE Connect 短信
|
||||
Name[zh_TW]=KDE 連線簡訊
|
||||
GenericName=SMS
|
||||
GenericName[ast]=SMS
|
||||
GenericName[ca]=SMS
|
||||
GenericName[ca@valencia]=SMS
|
||||
GenericName[cs]=SMS
|
||||
|
@ -54,6 +56,7 @@ GenericName[x-test]=xxSMSxx
|
|||
GenericName[zh_CN]=SMS
|
||||
GenericName[zh_TW]=簡訊
|
||||
Comment=Text Messaging
|
||||
Comment[ast]=Mensaxería de testu
|
||||
Comment[ca]=Missatgeria de text
|
||||
Comment[ca@valencia]=Missatgeria de text
|
||||
Comment[cs]=Zprávy
|
||||
|
|
Loading…
Reference in a new issue