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:
l10n daemon script 2022-12-31 01:59:33 +00:00
parent 8e3202a67e
commit dae358cee0
2 changed files with 5 additions and 96 deletions

View file

@ -2,103 +2,8 @@
"Categories": "Qt;KDE;X-KDE-settings-kdeconnect;",
"KPlugin": {
"Description": "Connect and sync your devices",
"Description[ar]": "اتّصل وزامن أجهزتك",
"Description[az]": "Cihazlarınızı qoşmaq və eyniləşdirmək",
"Description[bg]": "Свържете и синхронизирайте вашите устройства",
"Description[ca@valencia]": "Connecta i sincronitza els vostres dispositius",
"Description[ca]": "Connecta i sincronitza els vostres dispositius",
"Description[cs]": "Připojte a synchronizujte svá zařízení",
"Description[da]": "Forbind og synkronisér dine enheder",
"Description[de]": "Verbinden und Abgleichen Ihrer Geräte",
"Description[el]": "Σύνδεση και συγχρονισμός των συσκευών σας",
"Description[en_GB]": "Connect and sync your devices",
"Description[es]": "Conecte y sincronice sus dispositivos",
"Description[et]": "Oma seadmete ühendamine ja sünkroonimine",
"Description[eu]": "Konektatu eta sinkronizatu zure gailuak",
"Description[fi]": "Yhdistä ja synkronoi laitteitasi",
"Description[fr]": "Connectez et synchronisez vos périphériques",
"Description[gl]": "Conecte e sincronice os seus dispositivos.",
"Description[he]": "חבר וסנכרן את ההתקנים שלך",
"Description[hu]": "Csatlakoztassa és szinkronizálja eszközeit",
"Description[ia]": "Connecte e synchronisa tu dispositivos",
"Description[id]": "Koneksikan dan sinkronkan peranti Anda",
"Description[is]": "Tengdu og samstilltu tækin þín",
"Description[it]": "Connette e sincronizza i tuoi dispositivi",
"Description[ja]": "デバイスと接続して同期する",
"Description[ka]": "თქვენი მოწყობილობების მიერთება და სინქრონიზაცია",
"Description[ko]": "내 장치에 연결하고 동기화",
"Description[lt]": "Prijungti ir sinchronizuoti jūsų įrenginius",
"Description[nl]": "Uw apparaten verbinden en synchroniseren",
"Description[nn]": "Kopla til og synkroniser einingar",
"Description[pl]": "Podłącz i zsynchronizuj swoje urządzenia",
"Description[pt]": "Ligue e sincronize os seus dispositivos",
"Description[pt_BR]": "Conecta e sincroniza seus dispositivos",
"Description[ro]": "Conectați-vă și sincronizați-vă dispozitivele",
"Description[ru]": "Подключение и синхронизация с мобильными устройствами",
"Description[sk]": "Pripojenie a synchronizácia vašich zariadení",
"Description[sl]": "Poveži in uskladi vaše naprave",
"Description[sr@ijekavian]": "Повежите и синхронизујте своје уређаје",
"Description[sr@ijekavianlatin]": "Povežite i sinhronizujte svoje uređaje",
"Description[sr@latin]": "Povežite i sinhronizujte svoje uređaje",
"Description[sr]": "Повежите и синхронизујте своје уређаје",
"Description[sv]": "Anslut och synkronisera dina apparater",
"Description[ta]": "உங்கள் சாதனங்களை இணைத்து ஒத்திசையுங்கள்",
"Description[tr]": "Aygıtlarınıza bağlanın ve eşitleyin",
"Description[uk]": "З’єднання і синхронізація ваших пристроїв",
"Description[x-test]": "xxConnect and sync your devicesxx",
"Description[zh_CN]": "连接并同步您的设备",
"Description[zh_TW]": "連線並且同步您的裝置",
"Icon": "preferences-kde-connect",
"Name": "KDE Connect",
"Name[ar]": "كدي المتّصل",
"Name[az]": "KDE Connect",
"Name[bg]": "KDE Connect",
"Name[bs]": "Konekcija KDE",
"Name[ca@valencia]": "KDE Connect",
"Name[ca]": "KDE Connect",
"Name[cs]": "KDE Connect",
"Name[da]": "KDE Connect",
"Name[de]": "KDE Connect",
"Name[el]": "KDE Connect",
"Name[en_GB]": "KDE Connect",
"Name[es]": "KDE Connect",
"Name[et]": "KDE Connect",
"Name[eu]": "KDE Connect",
"Name[fi]": "KDE Connect",
"Name[fr]": "KDE Connect",
"Name[gl]": "KDE Connect",
"Name[he]": "KDE Connect",
"Name[hu]": "KDE Connect",
"Name[ia]": "KDE Connect",
"Name[id]": "KDE Connect",
"Name[ie]": "KDE Connect",
"Name[is]": "KDE Connect",
"Name[it]": "KDE Connect",
"Name[ja]": "KDE Connect",
"Name[ka]": "KDE Connect",
"Name[ko]": "KDE Connect",
"Name[lt]": "KDE Connect",
"Name[ml]": "കെ.ഡി.ഇ കണക്റ്റ്",
"Name[nl]": "KDE Connect",
"Name[nn]": "KDE Connect",
"Name[pl]": "KDE Connect",
"Name[pt]": "KDE Connect",
"Name[pt_BR]": "KDE Connect",
"Name[ro]": "KDE Connect",
"Name[ru]": "KDE Connect",
"Name[sk]": "KDE Connect",
"Name[sl]": "KDE Connect",
"Name[sr@ijekavian]": "КДЕ‑конекција",
"Name[sr@ijekavianlatin]": "KDEkonekcija",
"Name[sr@latin]": "KDEkonekcija",
"Name[sr]": "КДЕ‑конекција",
"Name[sv]": "KDE-anslut",
"Name[ta]": "கே.டீ.யீ. கனெக்ட்",
"Name[tr]": "KDE Connect",
"Name[uk]": "З’єднання KDE",
"Name[x-test]": "xxKDE Connectxx",
"Name[zh_CN]": "KDE Connect",
"Name[zh_TW]": "KDE 連線"
"Name": "KDE Connect"
},
"X-DocPath": "kdeconnect/index.html",
"X-KDE-Keywords": "network,kde connect,connect,phone,sync,mobile,android,ios,send files,share files,transfer files,receive files,devices,device,synchronization,calls,telephone,smartphone,contacts,sms,phone notifications,control volume,system volume,ringtone,play sound,presentation,take picture,take photo,shared clipboard,conectivity monitor,remote input,remote mouse,remote keyboard,mpris,phone integration,commands,lock device,multimedia control,sftp,browse phone,share",

View file

@ -5,10 +5,12 @@
"Email": "bhyoram@protonmail.com",
"Name": "Yoram Bar-Haim",
"Name[ca]": "Yoram Bar-Haim",
"Name[eu]": "Yoram Bar-Haim",
"Name[ka]": "Yoram Bar-Haim",
"Name[nl]": "Yoram Bar-Haim",
"Name[pl]": "Yoram Bar-Haim",
"Name[pt]": "Yoram Bar-Haim",
"Name[tr]": "Yoram Bar-Haim",
"Name[uk]": "Йорам Бар-Хаїм",
"Name[x-test]": "xxYoram Bar-Haimxx"
}
@ -60,10 +62,12 @@
"License": "GPL",
"Name": "ModemManager Telephony integration",
"Name[ca]": "Integració amb la telefonia del ModemManager",
"Name[eu]": "«ModemManager» telefonia bateratzea",
"Name[ka]": "ModemManager -ის ტელეფონის ინტეგრაცია",
"Name[nl]": "Modembeheerder telefoonintegratie",
"Name[pl]": "Integracja z telefonią zarządzania modemem",
"Name[pt]": "Integração telefónica com o ModemManager",
"Name[tr]": "ModemManager Telefon tümleştirmesi",
"Name[uk]": "Інтеграція телефонії ModemManager",
"Name[x-test]": "xxModemManager Telephony integrationxx",
"ServiceTypes": [