summaryrefslogtreecommitdiffstats
path: root/ktalkd
diff options
context:
space:
mode:
authorroman <roman@oscada.org>2020-07-31 12:22:43 +0000
committerroman <roman@oscada.org>2020-07-31 12:22:43 +0000
commit0cf6d999417faa59cba940897b0a62430f2cd685 (patch)
tree3f517b2901b006eab613d8e03323ca7c3d1ad3b6 /ktalkd
parentdfdf36e216921399afab86d0d683ef39b88adeab (diff)
parent767fedec73a3536a0d47ee497d6be0d2e4461108 (diff)
downloadtdenetwork-0cf6d999417faa59cba940897b0a62430f2cd685.tar.gz
tdenetwork-0cf6d999417faa59cba940897b0a62430f2cd685.zip
Merge branch 'master' into bug/3014/krfbbug/3014/krfb
Diffstat (limited to 'ktalkd')
-rw-r--r--ktalkd/CMakeL10n.txt2
-rw-r--r--ktalkd/kcmktalkd/CMakeL10n.txt7
-rw-r--r--ktalkd/kcmktalkd/CMakeLists.txt2
-rw-r--r--ktalkd/kcmktalkd/kcmktalkd.desktop190
-rw-r--r--ktalkd/ktalkd/machines/forwmach.cpp2
-rw-r--r--ktalkd/ktalkd/table.cpp12
-rw-r--r--ktalkd/mail.local/mail.local.c4
7 files changed, 19 insertions, 200 deletions
diff --git a/ktalkd/CMakeL10n.txt b/ktalkd/CMakeL10n.txt
index bf91215a..a775ec04 100644
--- a/ktalkd/CMakeL10n.txt
+++ b/ktalkd/CMakeL10n.txt
@@ -1,3 +1,5 @@
##### create translation templates ##############
tde_l10n_create_template( "kcmktalkd" )
+
+tde_l10n_auto_add_subdirectories()
diff --git a/ktalkd/kcmktalkd/CMakeL10n.txt b/ktalkd/kcmktalkd/CMakeL10n.txt
new file mode 100644
index 00000000..db125e47
--- /dev/null
+++ b/ktalkd/kcmktalkd/CMakeL10n.txt
@@ -0,0 +1,7 @@
+##### create translation templates ##############
+
+tde_l10n_create_template(
+ CATALOG "desktop_files/kcmktalkd.desktop/"
+ SOURCES kcmktalkd.desktop
+ DESTINATION "${CMAKE_SOURCE_DIR}/translations"
+)
diff --git a/ktalkd/kcmktalkd/CMakeLists.txt b/ktalkd/kcmktalkd/CMakeLists.txt
index 52c2681a..28f0e684 100644
--- a/ktalkd/kcmktalkd/CMakeLists.txt
+++ b/ktalkd/kcmktalkd/CMakeLists.txt
@@ -24,7 +24,7 @@ link_directories(
##### other data ################################
tde_install_icons( ktalkd )
-install( FILES kcmktalkd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+tde_create_translated_desktop( kcmktalkd.desktop )
##### kcm_ktalkd (module) #######################
diff --git a/ktalkd/kcmktalkd/kcmktalkd.desktop b/ktalkd/kcmktalkd/kcmktalkd.desktop
index 123b6194..1661e360 100644
--- a/ktalkd/kcmktalkd/kcmktalkd.desktop
+++ b/ktalkd/kcmktalkd/kcmktalkd.desktop
@@ -10,199 +10,9 @@ X-TDE-FactoryName=ktalkd
OnlyShowIn=TDE;
Name=Local Network Chat
-Name[af]=Plaaslike Netwerk Gesels
-Name[ar]=تحادث عبر الشبكة المحلية
-Name[be]=Гутарка па мясцовай сетцы
-Name[bg]=Разговор в локална мрежа
-Name[bn]=স্থানীয় নেটওয়ার্ক চ্যাট
-Name[br]=Flapañ rouedad lec'hel
-Name[bs]=Chat u lokalnoj mreži
-Name[ca]=Xat de la xarxa local
-Name[cs]=Rozhovor v lokální síti
-Name[cy]=Sgwrs Rhwydwaith Lleol
-Name[da]=Lokalt netværk-chat
-Name[de]=Lokaler Netzwerk-Chat
-Name[el]=Συνομιλία στο τοπικό δίκτυο
-Name[eo]=Loka reta Babilejo
-Name[es]= Charla red local
-Name[et]=Kohtvõrgu chat
-Name[eu]=Sare lokaleko elkarrizketa
-Name[fa]=گپ شبکۀ محلی
-Name[fi]=Paikallinen verkkokeskustelu
-Name[fr]=Discussion sur Réseau local
-Name[gl]=Chat na rede local
-Name[he]=שיחות ברשת המקומית
-Name[hi]=स्थानीय नेटवर्क गपशप
-Name[hr]=Razgovor u lokalnoj mreži
-Name[hu]=Csevegés a helyi hálózaton
-Name[is]=Staðarnetsspjall
-Name[it]=Chat rete locale
-Name[ja]=ローカルネットワークチャット
-Name[ka]=ლოკალური ქსელის ჩატი
-Name[kk]=Жергілікті желідегі әңгіме дүкені
-Name[km]=ជជែក​កំសាន្ដ​ក្នុង​បណ្ដាញ​មូលដ្ឋាន
-Name[lt]=Vietinio tinklo pokalbiai
-Name[mk]=Разговор на локална мрежа
-Name[mn]=Дотоод сүлжээнд чалчих
-Name[ms]=Borak Jaringan Setempat
-Name[nb]=Lokalt nettverksprat
-Name[nds]=Lokaalnettwark-Klönen
-Name[ne]=स्थानीय सञ्जाल कुराकानी
-Name[nl]=Gesprek over lokaal netwerk
-Name[nn]=Lokal nettverksprat
-Name[nso]=Poledisano ya Kgokagano ya Selegae
-Name[pa]=ਲੋਕਲ ਨੈੱਟਵਰਕ ਗੱਲਬਾਤ
-Name[pl]=Pogawędka w sieci lokalnej
-Name[pt]=Conversação na Rede Local
-Name[pt_BR]=Bate-papo de Rede Local
-Name[ru]=Чат в локальной сети
-Name[se]=Báikkalaš fierpmádatbuillardeapmi
-Name[sk]=Rozhovor na lokálnej sieti
-Name[sl]=Klepet prek lokalnega omrežja
-Name[sr]=Ћаскање у локалној мрежи
-Name[sr@Latn]=Ćaskanje u lokalnoj mreži
-Name[sv]=Chatt via lokalt nätverk
-Name[ta]=உள்ளக பிணைய அரட்டை
-Name[tg]=Чати Шабакаи Маҳаллӣ
-Name[th]=การสนทนาบนเครือข่ายท้องถิ่น
-Name[tr]=Yerel Ağ Sohbeti
-Name[uk]=Балачка в локальній мережі
-Name[ven]=U davhidzana ha vhukwamani ha tsini
-Name[xh]=Umsebenzi womnatha Wobulali Wokuncokola
-Name[zh_CN]=局域网聊天
-Name[zh_HK]=區域網路聊天
-Name[zh_TW]=區域網路聊天室
-Name[zu]=Oluseduze Uxhumaniso olusakazekile
Comment=Talk daemon configuration
-Comment[af]=Praat bediener opstelling
-Comment[ar]=اعدادات مراقب Talh
-Comment[az]=Talk quraşdırması
-Comment[be]=Настаўленне сервіса гутаркі
-Comment[bg]=Настройване на демона за разговор в локална мрежа
-Comment[bn]=টক(Talk) ডিমন কনফিগারেশন
-Comment[br]=Kefluniadur an diaoul Talk
-Comment[bs]=Podešavanje Talk demona
-Comment[ca]=Configuració del dimoni talk
-Comment[cs]=Nastavení talk démona
-Comment[cy]=Ffurfweddiad daemon sgwrs
-Comment[da]=Talkdæmon-indstilling
-Comment[de]=Einrichtung des Talk-Dienstes
-Comment[el]=Ρύθμιση του δαίμονα talk
-Comment[eo]=Agordo de la "Talk"-demono
-Comment[es]=Configuración del demonio Talk
-Comment[et]=Talk deemoni seadistamine
-Comment[eu]=Elkarrizketa deabruaren konfigurazioa
-Comment[fa]=پیکربندی شبح گفتگو
-Comment[fi]=Talk-palvelimen asetukset
-Comment[fr]=Configuration du démon Talk
-Comment[ga]=Cumraíocht deamhan comhrá
-Comment[gl]=Configuración do demo talk
-Comment[he]=שינוי הגדרות תהליך הרקע Talk
-Comment[hi]=टाक डेमन कॉन्फ़िगरेशन
-Comment[hr]=Postava talk daemona
-Comment[hu]=A Talk szolgáltatás beállításai
-Comment[id]=Konfigurasi daemon Talk
-Comment[is]=Stillingar samtalsþjóns
-Comment[it]=Configurazione demone talk
-Comment[ja]=Talk デーモンの設定
-Comment[ka]=საუბრის დემონის კონფიგურაცია
-Comment[kk]=Talk қызметінің параметрлері
-Comment[km]=ការ​កំណត់​រចនា​សម្ព័ន្ធ​ដេមិន​សន្ទនា
-Comment[ko]=이야기 데몬 설정
-Comment[lt]=Pokalbių tarnybos derinimas
-Comment[mk]=Конфигурација на даемонот за разговарање
-Comment[mn]=Talk демон тохируулга
-Comment[ms]=Penyelarasan daemon Talk
-Comment[mt]=Konfigurazzjoni tad-daemon Talk
-Comment[nb]=Oppsett av Talk-nissen
-Comment[nds]=Talkdämoon instellen
-Comment[ne]=डेइमन कन्फिगरेसन बोल्नुहोस्
-Comment[nl]=Talk-daemon instellen
-Comment[nn]=Oppsett av Talk-nissen
-Comment[nso]=Peakanyo ya daemon ya polelo
-Comment[pa]=ਗੱਲਬਾਤ ਡੈਮਨ ਸੰਰਚਨਾ
-Comment[pl]=Konfiguracja demona talk
-Comment[pt]=Configuração do servidor do talk
-Comment[pt_BR]=Configuração do servidor talk
-Comment[ro]=Configurează demonul "talk"
-Comment[ru]=Параметры службы Talk
-Comment[se]=Heivet talk-duogášprográmma
-Comment[sk]=Nastavenie talk démona
-Comment[sl]=Nastavitev strežnika za talk
-Comment[sr]=Подешавање „Talk“ демона
-Comment[sr@Latn]=Podešavanje „Talk“ demona
-Comment[sv]=Anpassa talk-demon
-Comment[ta]=Talk daemon வடிவமைப்பு
-Comment[tg]=Батанзимдарории азозили Talk
-Comment[th]=ปรับแต่งเซิร์ฟเวอร์ Talk
-Comment[tr]=Talk sunucu programı yapılandırması
-Comment[uk]=Налаштування демону Talk
-Comment[ven]=Nzudzanyo ya daemon yau amba
-Comment[xh]=Uqwalaselo lwenkcoko ye daemon
-Comment[zh_CN]=Talk 守护进程配置
-Comment[zh_HK]=Talk 系統程式設定
-Comment[zh_TW]=Talk 伺服程式組態
-Comment[zu]=Inhlanganiselo lwedaemon yenkulumo
Keywords=talk;announcement;client;sound;answering;mail;caller;banner;forward;destination;
-Keywords[af]=talk;announcement;client;sound;answering;mail;caller;banner;forward;bestemming;
-Keywords[ar]=تحدث;اعلان;عميل;صوت;استجابة;بريد;متصل;شعار;ارسال;اتجاه;
-Keywords[az]=talk;e'lan;alıcı;Səs;cavablama;poçt;çağıran;bayraq;yolla;hədəf;
-Keywords[be]=гутарка;кліент;гук;адказ;прызначэнне;talk;announcement;client;sound;answering;mail;caller;banner;forward;destination;
-Keywords[bg]=разговор; локална; мрежа; чат; клиент; колега; talk; announcement; client; sound; answering; mail; caller; banner; forward; destination;
-Keywords[bs]=talk;announcement;client;sound;answering;mail;caller;banner;forward;destination;zvuk;klijent;odgovor;odredište;
-Keywords[ca]=parlar;notificació;client;so;contestar;correu;qui truca;rètol;enviar;destí;
-Keywords[cs]=Talk;Rozhovor;Oznámení;Klient;Zvuk;Odpovídání;Pošta;Volající;Banner;Předání;Určení;
-Keywords[cy]=siarad;cyhoeddiad;dibynnydd;swn;ateb;ebost;ymwelwr;baner;ymlaen;cyrchfan;
-Keywords[da]=talk;annoncering;klient;lyd;svar;post;opringer;banner;fremad;destination;
-Keywords[de]=Talk;Ankündigung;Client;Sound;Antwort;Mail;Banner;Forward;Weiterleitung;
-Keywords[el]=ομιλία;ανακοίνωση;πελάτης;ήχος;απάντηση;mail;καλών;banner;προώθηση;προορισμός;
-Keywords[eo]=parolo;anonco;babilo;kliento;sonoro;respondo;retpoŝto;alvokanto;flago;plusendo;celo;
-Keywords[es]=hablar;notificación;cliente;sonido;contestar;correo;llamador;rótulo;enviar;destino;
-Keywords[et]=talk;teadaanne;klient;heli;vastamine;meil;helistaja;bänner;edasisuunamine; adressaat;
-Keywords[eu]=elkarrizketa;berri-ematea;bezeroa;soinua;erantzungailu automatikoa;posta;deitzailea;titularra;birbidali;helburua;
-Keywords[fa]=گفتگو، اعلان، کارخواه، صوت، پاسخ، نامه، شمارۀ گیرنده، عنوان‌سازی، پیش‌سو، مقصد;
-Keywords[fi]=talk;julkistus;asiakas;ääni;vastaus;sähköposti;soittaja;mainos;uudelleenohjaa;kohde;
-Keywords[fr]=talk;discussion;annonce;bavardage;client;son;réponse;mail;courrier électronique;message;appel;bannière;envoi;destination;
-Keywords[gl]=talk;anuncio;cliente;son;resposta;correo;
-Keywords[he]=שיחות;הכרזה;לקוח;צליל;תשובה;דואר;מתקשר;כתובית;העברה;יעד;talk;announcement;client;sound;answering;mail;caller;banner;forward;destination;
-Keywords[hi]=टाक;घोषणा;क्लाएंट;ध्वनि;उत्तर;मेल;कालर;ध्वज;फारवर्ड;गंतव्य;
-Keywords[hu]=talk;bejelentés;kliens;hang;válasz;e-mail;hívó;üdvözlő szöveg;továbbítás;cél;
-Keywords[is]=talk;tilkynningar;biðlari;hljóð;svörun;svara;póstur;mail;client;sound;answering;mail;caller;banner;forward;destination;
-Keywords[it]=talk;annuncio;client;suono;risposte;posta;chiamante;messaggio;inoltra;destinazione;
-Keywords[ja]=トーク;アナウンス;クライアント;音;answering;メール;呼出側;バナー;前へ;行き先;
-Keywords[km]=ជជែក​គ្នា;ប្រកាស;ភ្ញៀវ;សំឡេង;ឆ្លើយឆ្លង;សំបុត្រ;អ្នកហៅ;បដា;ទៅ​មុខ;ទិសដៅ;
-Keywords[ko]=talk;announcement;client;sound;answering;mail;caller;banner;forward;destination;이야기;토크;톡;알림;알려줌;클라이언트;소리;답신;댓거리;답신;편지;부른이;콜;깃발;기;배너;전달;포워드;
-Keywords[lt]=talk;announcement;client;sound;answering;mail;caller;banner;forward;destination;kalbėti;kalbėtis;pokalbis;anonsas;pranešimas;paskelbimas;panešti;paskelbti;klientas;garsas;atsakyti;atsakymas;atsiliepti;paštas;laiškas;skambintojas;skydelis;persiųsti;persiuntimas;gavėjas;
-Keywords[lv]=runa;paziņojums;klients;skaņa;atbildēšana;pasts;saucējs;banners;pārsūtīt;adresāts;
-Keywords[mk]=talk;announcement;client;sound;answering;mail;caller;banner;forward;destination;разговарање;објавување;клиент;звук;одговор;пошта;повикувач;банер;препрати;одредиште;
-Keywords[ms]=cakap;pengumuman;klien;bunyi;jawapan;mel;pemanggil;pemidang;destinasi;talk;announcement;client;sound;answering;mail;caller;banner;forward;destination;
-Keywords[mt]=talk;annunzja;announcement;client;sound;answering;mail;caller;banner;forward;destination;
-Keywords[nb]=talk;kunngjøring;klient;lyd;svar;post;oppringing;fane;videresend;mål;
-Keywords[nds]=talk;Mellen;client;Klang;antern;Antermaschien;Nettpost;Anroper;Startnaricht;wiederledden;Teel;
-Keywords[ne]=बोलचाल;घोषणा;क्लाइन्ट;ध्वनि;जवाफ;मेल;कलर;ब्यानर;अगाडि;गन्तब्य;
-Keywords[nl]=talk;aankondiging;client;sound;geluid;beantwoorden;mail;caller;banner;banier;bestemming;forward;doorsturen;destination;antwoordapparaat;
-Keywords[nn]=talk;kunngjering;klient;lyd;svar;post;oppringing;vidaresend;mål;
-Keywords[nso]=polelo;tsebiso;moreki;lesata;araba;poso;mmitsi;banner;pele;mafelelo a leeto;
-Keywords[pl]=rozmowa;ogłoszenie;klient;dźwięk;odpowiadanie;mail;dzwoniący;banner;podaj dalej;cel;
-Keywords[pt]=talk;anúncio;cliente;som;resposta;correio;chamador;mensagem;reenviar;destino;
-Keywords[pt_BR]=talk;anúncio;cliente;som;resposta;e-mail;correio;chamador;banner;repassar; destino;
-Keywords[ro]=convorbire;talk;anunţ;client;sunet;răspuns;apel;mail;apelant;apelat;înaintare;destinatar;
-Keywords[se]=talk;almmuheapmi;klienta;jietna;vástideapmi;boasta;sádde viidáset;ulbmil;
-Keywords[sk]=talk;oznámenie; klient;zvuk;odpoveď;mail;pošta;volajúci;cieľ;predať ďalej;
-Keywords[sl]=talk;govor;objava;odjemalec;zvok;odgovarjanje;pošta;klicatelj;reklama;posredovanje;cilj;
-Keywords[sr]=talk;announcement;client;sound;answering;mail;caller;banner;forward;destination;разговор;објава;клијент;звук;одговор;одговарање;пошта;позивалац;прослеђивање;одредиште;
-Keywords[sr@Latn]=talk;announcement;client;sound;answering;mail;caller;banner;forward;destination;razgovor;objava;klijent;zvuk;odgovor;odgovaranje;pošta;pozivalac;prosleđivanje;odredište;
-Keywords[sv]=talk;annonsering;klient;ljud;svar;e-post;uppringare;rubrik;vidarebefordran;destination;
-Keywords[ta]=பேச்சு; அறிவிப்பு; கிளையன்; ஒலி; பதிலளித்தல்; மின்னஞ்சல்; அழைப்பு; பேனர்; முன்னனுப்பு; சேருமிடம்;
-Keywords[tr]=talk;duyuru;istemci;Ses;cevaplama;posta;çağıran;bayrak;gönder;hedef;
-Keywords[uk]=розмова;оголошення;клієнт;звук;відповідь;пошта;заставка;переслати;talk;призначення;
-Keywords[ven]=amba;divhadza;mushumisani;mubvumo;phindulo;zwamarifhi;muvhidzi;mupandeli;phanda; vhuyo;
-Keywords[xh]=ncokola;isaziso;umxhasi;isandi;iyaphendula;iposi;umbizi;iceba lelaphu elinomyalezo;phambili;indawo ephelela kuyo;
-Keywords[zh_CN]=talk;announcement;client;sound;answering;mail;caller;banner;forward;destination;交谈;通知;客户程序;声音;应答;邮件;提示;呼叫者;转发;目标;
-Keywords[zh_HK]=talk;announcement;client;sound;answering;mail;caller;banner;forward;destination;聊天;公佈;客戶端;聲音;答覆;郵件;呼叫者;目的地;
-Keywords[zh_TW]=talk;announcement;client;sound;answering;mail;caller;banner;forward;destination;聊天;公佈;客戶端;聲音;答覆;郵件;呼叫者;目的地;
-Keywords[zu]=khuluma;isaziso;umthengi;umsindo;iyaphendula;iposi;umbizi;ibhodi elinomyalezo;phambili;indawo ophikekelekuyo;
Categories=Qt;TDE;X-TDE-settings-network;Settings;
diff --git a/ktalkd/ktalkd/machines/forwmach.cpp b/ktalkd/ktalkd/machines/forwmach.cpp
index bbd491eb..5bb5cd0d 100644
--- a/ktalkd/ktalkd/machines/forwmach.cpp
+++ b/ktalkd/ktalkd/machines/forwmach.cpp
@@ -117,7 +117,7 @@ ForwMachine::~ForwMachine()
* @param forward user@host to forward the talk */
int ForwMachine::getNames(char * forward)
{ /* taken from old get_names.c */
- register char *cp;
+ char *cp;
/* strip out the machine name of the target */
for (cp = forward; *cp && !strchr("@:!.", *cp); cp++)
diff --git a/ktalkd/ktalkd/table.cpp b/ktalkd/ktalkd/table.cpp
index 476267e8..8c629cf5 100644
--- a/ktalkd/ktalkd/table.cpp
+++ b/ktalkd/ktalkd/table.cpp
@@ -62,7 +62,7 @@
*/
NEW_CTL_MSG * KTalkdTable::find_match(NEW_CTL_MSG *request)
{
- register TABLE_ENTRY *ptr;
+ TABLE_ENTRY *ptr;
time_t current_time;
(void) gettimeofday(&tp, &txp);
@@ -92,7 +92,7 @@ NEW_CTL_MSG * KTalkdTable::find_match(NEW_CTL_MSG *request)
*/
NEW_CTL_MSG * KTalkdTable::find_request(NEW_CTL_MSG *request)
{
- register TABLE_ENTRY *ptr;
+ TABLE_ENTRY *ptr;
time_t current_time;
(void) gettimeofday(&tp, &txp);
@@ -124,7 +124,7 @@ NEW_CTL_MSG * KTalkdTable::find_request(NEW_CTL_MSG *request)
void KTalkdTable::insert_table(NEW_CTL_MSG *request, NEW_CTL_RESPONSE *response, ForwMachine * fwm)
{
- register TABLE_ENTRY *ptr;
+ TABLE_ENTRY *ptr;
time_t current_time;
gettimeofday(&tp, &txp);
@@ -167,7 +167,7 @@ int KTalkdTable::new_id()
*/
int KTalkdTable::delete_invite(uint32_t id_num)
{
- register TABLE_ENTRY *ptr;
+ TABLE_ENTRY *ptr;
ptr = table;
ktalk_debug("delete_invite(%d)", id_num);
@@ -189,7 +189,7 @@ int KTalkdTable::delete_invite(uint32_t id_num)
/*
* Classic delete from a double-linked list
*/
-void KTalkdTable::delete_entry(register TABLE_ENTRY *ptr)
+void KTalkdTable::delete_entry(TABLE_ENTRY *ptr)
{
if (table == ptr)
table = ptr->next;
@@ -202,7 +202,7 @@ void KTalkdTable::delete_entry(register TABLE_ENTRY *ptr)
KTalkdTable::~KTalkdTable()
{
- register TABLE_ENTRY *ptr;
+ TABLE_ENTRY *ptr;
ptr = table;
ktalk_debug("final_clean()");
for (ptr = table; ptr != 0L; ptr = ptr->next) {
diff --git a/ktalkd/mail.local/mail.local.c b/ktalkd/mail.local/mail.local.c
index c88351dd..fbf91957 100644
--- a/ktalkd/mail.local/mail.local.c
+++ b/ktalkd/mail.local/mail.local.c
@@ -920,10 +920,10 @@ mktemp(path)
static
_gettemp(path, doopen)
char *path;
- register int *doopen;
+ int *doopen;
{
extern int errno;
- register char *start, *trv;
+ char *start, *trv;
struct stat sbuf;
u_int pid;