diff options
| author | Lubos Dolezel <lubos@dolezel.info> | 2015-06-04 22:18:12 +0200 |
|---|---|---|
| committer | Lubos Dolezel <lubos@dolezel.info> | 2015-06-04 22:18:12 +0200 |
| commit | bcbbdf0b79d52c5ef40d11615954de35eda184e3 (patch) | |
| tree | 05283199f05ff204a26b9b6138fe0907cebd5db3 | |
| parent | 85a753d68eb8900ba94ce89f9638269858645e19 (diff) | |
| download | twinkle-bcbbdf0b79d52c5ef40d11615954de35eda184e3.tar twinkle-bcbbdf0b79d52c5ef40d11615954de35eda184e3.tar.gz twinkle-bcbbdf0b79d52c5ef40d11615954de35eda184e3.tar.lz twinkle-bcbbdf0b79d52c5ef40d11615954de35eda184e3.tar.xz twinkle-bcbbdf0b79d52c5ef40d11615954de35eda184e3.zip | |
Qt 5 now supported
| -rw-r--r-- | CMakeLists.txt | 26 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/gui/CMakeLists.txt | 79 | ||||
| -rw-r--r-- | src/gui/buddylistview.cpp | 11 | ||||
| -rw-r--r-- | src/gui/lang/twinkle_cs.ts | 253 | ||||
| -rw-r--r-- | src/gui/lang/twinkle_de.ts | 249 | ||||
| -rw-r--r-- | src/gui/lang/twinkle_fr.ts | 249 | ||||
| -rw-r--r-- | src/gui/lang/twinkle_nl.ts | 231 | ||||
| -rw-r--r-- | src/gui/lang/twinkle_ru.ts | 264 | ||||
| -rw-r--r-- | src/gui/lang/twinkle_sv.ts | 267 | ||||
| -rw-r--r-- | src/gui/lang/twinkle_xx.ts | 365 | ||||
| -rw-r--r-- | src/gui/main.cpp | 64 | ||||
| -rw-r--r-- | src/gui/messageform.cpp | 20 | ||||
| -rw-r--r-- | src/gui/messageform.h | 5 | ||||
| -rw-r--r-- | src/gui/messageform.ui | 6 | ||||
| -rw-r--r-- | src/gui/mphoneform.cpp | 4 | ||||
| -rw-r--r-- | src/gui/mphoneform.ui | 56 | ||||
| -rw-r--r-- | src/gui/redirectform.h | 28 | ||||
| -rw-r--r-- | src/gui/srvredirectform.h | 2 | ||||
| -rw-r--r-- | src/gui/textbrowsernoautolink.cpp | 18 | ||||
| -rw-r--r-- | src/gui/textbrowsernoautolink.h | 9 |
21 files changed, 1264 insertions, 946 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f77b0e..769c440 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,11 +11,17 @@ OPTION(WITH_SPEEX "Enable the Speex codec" OFF) OPTION(WITH_ILBC "Enable the iLBC codec" OFF) OPTION(WITH_ALSA "Enable ALSA support" ON) OPTION(WITH_DIAMONDCARD "Enable Diamondcard integration" OFF) +OPTION(WITH_QT4 "Enable Qt 4 GUI" OFF) +OPTION(WITH_QT5 "Enable Qt 5 GUI" OFF) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") +if (WITH_QT4 AND WITH_QT5) + message(FATAL_ERROR "Qt 4 and Qt 5 cannot be enabled at the same time!") +endif (WITH_QT4 AND WITH_QT5) + include (CheckIncludeFile) -find_package(Qt4 REQUIRED COMPONENTS QTGUI) + find_package(LibXml2 REQUIRED) find_package(LibMagic REQUIRED) find_package(LibSndfile REQUIRED) @@ -23,13 +29,25 @@ find_package(Readline REQUIRED) find_package(BISON REQUIRED) find_package(FLEX REQUIRED) find_package(Boost REQUIRED COMPONENTS regex) - find_package(Commoncpp REQUIRED) find_package(Ccrtp REQUIRED) find_package(Ucommon REQUIRED) -include_directories(${LIBXML2_INCLUDE_DIR} ${QT_QT3SUPPORT_INCLUDE_DIR} - ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_INCLUDE_DIR}) +if (WITH_QT4) + find_package(Qt4 REQUIRED COMPONENTS QTGUI) + include_directories(${QT_QT3SUPPORT_INCLUDE_DIR} + ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_INCLUDE_DIR}) + +elseif (WITH_QT5) + + find_package(Qt5Widgets REQUIRED) + find_package(Qt5LinguistTools REQUIRED) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") + include_directories(${Qt5Widgets_INCLUDES}) + add_definitions(${Qt5Widgets_DEFINITIONS}) +endif (WITH_QT4) + +include_directories(${LIBXML2_INCLUDE_DIR}) if (WITH_ALSA) find_package(ALSA) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a3c939f..abcc39d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -72,7 +72,9 @@ add_executable(twinkle-console $<TARGET_OBJECTS:libtwinkle-utils> ) -add_subdirectory(gui) +if (WITH_QT4 OR WITH_QT5) + add_subdirectory(gui) +endif (WITH_QT4 OR WITH_QT5) target_link_libraries(twinkle-console -lpthread -lresolv ${LibMagic_LIBRARY} ${LIBXML2_LIBRARIES} ${Readline_LIBRARY} ${ILBC_LIBRARIES} ${SPEEX_LIBRARIES} ${ZRTPCPP_LIBRARIES} diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index fea57d5..fdb3697 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -3,8 +3,7 @@ project(twinkle-gui) include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -qt4_wrap_ui( - twinkle_UIS +set(twinkle_ui_SRC addresscardform.ui authenticationform.ui buddyform.ui @@ -32,9 +31,7 @@ qt4_wrap_ui( wizardform.ui ) -qt4_add_resources(twinkle_QRC icons.qrc) - -qt4_add_translation(twinkle_LANG +set (twinkle_lang_SRC lang/twinkle_cs.ts lang/twinkle_de.ts lang/twinkle_fr.ts @@ -43,46 +40,38 @@ qt4_add_translation(twinkle_LANG lang/twinkle_sv.ts ) -qt4_wrap_cpp(twinkle_MOC - gui.h - dtmfform.h - deregisterform.h - logviewform.h - numberconversionform.h - getprofilenameform.h - address_finder.h - qt_translator.h - core_strings.h - addresstablemodel.h - yesnodialog.h - command_args.h - messageformview.h - buddylistview.h - textbrowsernoautolink.h - twinkleapplication.h - - mphoneform.h - inviteform.h - getaddressform.h - termcapform.h - redirectform.h - messageform.h - srvredirectform.h - userprofileform.h - transferform.h - syssettingsform.h - historyform.h - selectuserform.h - selectprofileform.h - buddyform.h - diamondcardprofileform.h - addresscardform.h - authenticationform.h - selectnicform.h - sendfileform.h - wizardform.h +if (WITH_QT4) +qt4_wrap_ui( + twinkle_UIS + ${twinkle_ui_SRC} +) + +qt4_add_resources(twinkle_QRC icons.qrc) + +qt4_add_translation(twinkle_LANG + ${twinkle_lang_SRC} +) + +set(qt_LIBS Qt4::QtGui) + +elseif (WITH_QT5) + +qt5_wrap_ui( + twinkle_UIS + ${twinkle_ui_SRC} ) +qt5_add_resources(twinkle_QRC icons.qrc) + +qt5_add_translation(twinkle_LANG + ${twinkle_lang_SRC} +) + +set(qt_LIBS Qt5::Widgets) +endif (WITH_QT4) + +set(CMAKE_AUTOMOC ON) + set(TWINKLE_GUI-SRCS mphoneform.cpp inviteform.cpp @@ -118,6 +107,7 @@ set(TWINKLE_GUI-SRCS numberconversionform.cpp twinkleapplication.cpp yesnodialog.cpp + textbrowsernoautolink.cpp $<TARGET_OBJECTS:libtwinkle> $<TARGET_OBJECTS:libtwinkle-audio> @@ -135,7 +125,6 @@ set(TWINKLE_GUI-SRCS $<TARGET_OBJECTS:libtwinkle-utils> ${twinkle_UIS} ${twinkle_QRC} - ${twinkle_MOC} ${twinkle_LANG} ) @@ -143,7 +132,7 @@ add_executable(twinkle ${TWINKLE_GUI-SRCS}) target_link_libraries(twinkle -lpthread -lresolv ${LibMagic_LIBRARY} ${LIBXML2_LIBRARIES} ${Readline_LIBRARY} ${ILBC_LIBRARIES} ${SPEEX_LIBRARIES} ${ZRTPCPP_LIBRARIES} ${CCRTP_LIBRARIES} ${COMMONCPP_LIBRARIES} ${UCOMMON_LIBRARIES} ${LIBSNDFILE_LIBRARY} - ${Boost_LIBRARIES} Qt4::QtGui ${ALSA_LIBRARY}) + ${Boost_LIBRARIES} ${ALSA_LIBRARY} ${qt_LIBS}) install(TARGETS twinkle DESTINATION bin) install(FILES ${twinkle_LANG} DESTINATION share/twinkle/lang) diff --git a/src/gui/buddylistview.cpp b/src/gui/buddylistview.cpp index 8cb7629..a229e49 100644 --- a/src/gui/buddylistview.cpp +++ b/src/gui/buddylistview.cpp @@ -68,9 +68,14 @@ QString AbstractBLVItem::get_tip(void) { void BuddyListViewItem::set_icon(void) { t_user *user_config = buddy->get_user_profile(); string url_str = ui->expand_destination(user_config, buddy->get_sip_address()); + QString address = QString::fromStdString(ui->format_sip_address(user_config, buddy->get_name(), t_url(url_str))); tip = "<html>"; - tip += Qt::escape(QString::fromStdString(ui->format_sip_address(user_config, buddy->get_name(), t_url(url_str)))).replace(' ', " "); +#if QT_VERSION >= 0x050000 + tip += address.toHtmlEscaped().replace(' ', " "); +#else + tip += Qt::escape(address).replace(' ', " "); +#endif if (!buddy->get_may_subscribe_presence()) { setData(0, Qt::DecorationRole, QPixmap(":/icons/images/buddy.png")); @@ -159,7 +164,11 @@ void BLViewUserItem::set_icon(void) { QString profile_name = QString::fromStdString(presence_epa->get_user_profile()->get_profile_name()); tip = "<html>"; +#if QT_VERSION >= 0x050000 + tip += profile_name.toHtmlEscaped(); +#else tip += Qt::escape(profile_name); +#endif tip += "<br>"; tip += "<b>"; tip += qApp->translate("BuddyList", "Availability"); diff --git a/src/gui/lang/twinkle_cs.ts b/src/gui/lang/twinkle_cs.ts index ad71d31..e6ffbc3 100644 --- a/src/gui/lang/twinkle_cs.ts +++ b/src/gui/lang/twinkle_cs.ts @@ -1,5 +1,6 @@ -<!DOCTYPE TS><TS> -<defaultcodec></defaultcodec> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0"> <context> <name>AddressCardForm</name> <message> @@ -72,6 +73,21 @@ </message> </context> <context> + <name>AddressTableModel</name> + <message> + <source>Name</source> + <translation type="unfinished">Jméno</translation> + </message> + <message> + <source>Phone</source> + <translation type="unfinished">Telefon</translation> + </message> + <message> + <source>Remark</source> + <translation type="unfinished">Poznámka</translation> + </message> +</context> +<context> <name>AuthenticationForm</name> <message> <source>Twinkle - Authentication</source> @@ -319,48 +335,8 @@ <context> <name>DiamondcardProfileForm</name> <message> - <source>Twinkle - Diamondcard User Profile</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Your Diamondcard account ID.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>This is just your full name, e.g. John Doe. It is used as a display name. When you make a call, this display name might be shown to the called party.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>&Account ID:</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>&PIN code:</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>&Your name:</source> - <translation type="unfinished"></translation> - </message> - <message> - <source><p align="center"><u>Sign up for a Diamondcard account</u></p></source> - <translation type="unfinished"></translation> - </message> - <message> - <source>&OK</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Alt+O</source> - <translation type="unfinished"></translation> - </message> - <message> <source>&Cancel</source> - <translation type="unfinished">Zrušit (Es&c)</translation> - </message> - <message> - <source>Alt+C</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Zrušit (Es&c)</translation> </message> <message> <source>Fill in your account ID.</source> @@ -374,15 +350,6 @@ <source>A user profile with name %1 already exists.</source> <translation type="unfinished"></translation> </message> - <message> - <source>Your Diamondcard PIN code.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source><p>With a Diamondcard account you can make worldwide calls to regular and cell phones and send SMS messages. To sign up for a Diamondcard account click on the "sign up" link below. Once you have signed up you receive an account ID and PIN code. Enter the account ID and PIN code below to create a Twinkle user profile for your Diamondcard account.</p> -<p>For call rates see the sign up web page that will be shown to you when you click on the "sign up" link.</p></source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>DtmfForm</name> @@ -471,11 +438,11 @@ <name>FreeDeskSysTray</name> <message> <source>Show/Hide</source> - <translation>Ukázat/Zminimalizovat</translation> + <translation type="obsolete">Ukázat/Zminimalizovat</translation> </message> <message> <source>Quit</source> - <translation>Ukončit</translation> + <translation type="obsolete">Ukončit</translation> </message> </context> <context> @@ -878,15 +845,15 @@ Pokud se připojíte k nějaké síti později, musíte Twinkle spustit znovu. T </message> <message> <source>Name</source> - <translation>Jméno</translation> + <translation type="obsolete">Jméno</translation> </message> <message> <source>Type</source> - <translation>Typ</translation> + <translation type="obsolete">Typ</translation> </message> <message> <source>Phone</source> - <translation>Telefon</translation> + <translation type="obsolete">Telefon</translation> </message> <message> <source>&Show only SIP addresses</source> @@ -944,7 +911,7 @@ K vytvoření nebo úpravě kontaktů použijte program KAddressbook.</translati </message> <message> <source>Remark</source> - <translation>Poznámka</translation> + <translation type="obsolete">Poznámka</translation> </message> <message> <source>Contacts in the local address book of Twinkle.</source> @@ -1424,7 +1391,7 @@ With this option you request your SIP provider to hide your identity from the ca </message> <message> <source>Instant message toolbar</source> - <translation>Lišta s instantními zprávami</translation> + <translation type="obsolete">Lišta s instantními zprávami</translation> </message> <message> <source>Send file...</source> @@ -1571,7 +1538,7 @@ With this option you request your SIP provider to hide your identity from the ca </message> <message> <source>Visual indication of line state.</source> - <translation>Optické zobrazení stavu linky.</translation> + <translation type="obsolete">Optické zobrazení stavu linky.</translation> </message> <message> <source>idle</source> @@ -1580,15 +1547,15 @@ With this option you request your SIP provider to hide your identity from the ca </message> <message> <source>Call is on hold</source> - <translation>Hovor je podržen</translation> + <translation type="obsolete">Hovor je podržen</translation> </message> <message> <source>Voice is muted</source> - <translation>Hovor je ztišen</translation> + <translation type="obsolete">Hovor je ztišen</translation> </message> <message> <source>Conference call</source> - <translation>Konferenční hovor</translation> + <translation type="obsolete">Konferenční hovor</translation> </message> <message> <source>Transferring call</source> @@ -1605,7 +1572,7 @@ Both ends of an encrypted voice channel receive the same SAS on the first call. <p> If the SAS is equal at both ends, then you should confirm it by clicking this padlock for stronger security of future calls to the same destination. For subsequent calls to the same destination, you don't have to confirm the SAS again. The padlock will show a check symbol when the SAS has been confirmed. </p></source> - <translation><p> + <translation type="obsolete"><p> Symbol zámečku se zobrazí pokud je volání přenášeno pomocí šifrování a není možné ho odposlouchávat. </p> <h3>SAS - Short Authentication String</h3> @@ -1710,7 +1677,7 @@ Pokud je SAS shodný na obou stranách, klikněte na ikonku zámečku. Lze se o </message> <message> <source>Call Toolbar</source> - <translation>Lišta volání</translation> + <translation type="obsolete">Lišta volání</translation> </message> <message> <source>Quit</source> @@ -2164,117 +2131,117 @@ Pokud je SAS shodný na obou stranách, klikněte na ikonku zámečku. Lze se o <message> <source>Call</source> <comment>toolbar text</comment> - <translation>Volat</translation> + <translation type="obsolete">Volat</translation> </message> <message> <source>&Call...</source> <comment>call menu text</comment> - <translation>Volat (&Call)...</translation> + <translation type="obsolete">Volat (&Call)...</translation> </message> <message> <source>Answer</source> <comment>toolbar text</comment> - <translation>Odpovědět</translation> + <translation type="obsolete">Odpovědět</translation> </message> <message> <source>&Answer</source> <comment>menu text</comment> - <translation>&Odpovědět</translation> + <translation type="obsolete">&Odpovědět</translation> </message> <message> <source>Bye</source> <comment>toolbar text</comment> - <translation>Zavěsit</translation> + <translation type="obsolete">Zavěsit</translation> </message> <message> <source>&Bye</source> <comment>menu text</comment> - <translation>Zavěsit (&Bye)</translation> + <translation type="obsolete">Zavěsit (&Bye)</translation> </message> <message> <source>Reject</source> <comment>toolbar text</comment> - <translation>Odmítnout</translation> + <translation type="obsolete">Odmítnout</translation> </message> <message> <source>&Reject</source> <comment>menu text</comment> - <translation>&Odmítnout</translation> + <translation type="obsolete">&Odmítnout</translation> </message> <message> <source>Hold</source> <comment>toolbar text</comment> - <translation>Podržet</translation> + <translation type="obsolete">Podržet</translation> </message> <message> <source>&Hold</source> <comment>menu text</comment> - <translation>&Podržet</translation> + <translation type="obsolete">&Podržet</translation> </message> <message> <source>Redirect</source> <comment>toolbar text</comment> - <translation>Přesměrovat</translation> + <translation type="obsolete">Přesměrovat</translation> </message> <message> <source>R&edirect...</source> <comment>menu text</comment> - <translation>&Přesměrovat...</translation> + <translation type="obsolete">&Přesměrovat...</translation> </message> <message> <source>Dtmf</source> <comment>toolbar text</comment> - <translation>DTMF</translation> + <translation type="obsolete">DTMF</translation> </message> <message> <source>&Dtmf...</source> <comment>menu text</comment> - <translation>&DTMF...</translation> + <translation type="obsolete">&DTMF...</translation> </message> <message> <source>&Terminal capabilities...</source> <comment>menu text</comment> - <translation>&Parametry protistrany...</translation> + <translation type="obsolete">&Parametry protistrany...</translation> </message> <message> <source>Redial</source> <comment>toolbar text</comment> - <translation>Opakovat</translation> + <translation type="obsolete">Opakovat</translation> </message> <message> <source>&Redial</source> <comment>menu text</comment> - <translation>&Opakovat</translation> + <translation type="obsolete">&Opakovat</translation> </message> <message> <source>Conf</source> <comment>toolbar text</comment> - <translation>Konference</translation> + <translation type="obsolete">Konference</translation> </message> <message> <source>&Conference</source> <comment>menu text</comment> - <translation>&Konference</translation> + <translation type="obsolete">&Konference</translation> </message> <message> <source>Mute</source> <comment>toolbar text</comment> - <translation>Ztišit</translation> + <translation type="obsolete">Ztišit</translation> </message> <message> <source>&Mute</source> <comment>menu text</comment> - <translation>&Ztišit</translation> + <translation type="obsolete">&Ztišit</translation> </message> <message> <source>Xfer</source> <comment>toolbar text</comment> - <translation>Zprostředkovat</translation> + <translation type="obsolete">Zprostředkovat</translation> </message> <message> <source>Trans&fer...</source> <comment>menu text</comment> - <translation>&Zprostředkovat...</translation> + <translation type="obsolete">&Zprostředkovat...</translation> </message> <message> <source>Message waiting indication.</source> @@ -2412,6 +2379,94 @@ Pokud je SAS shodný na obou stranách, klikněte na ikonku zámečku. Lze se o <source>Admin center</source> <translation type="unfinished"></translation> </message> + <message> + <source>Call</source> + <translation type="unfinished">Volat</translation> + </message> + <message> + <source>&Answer</source> + <translation type="unfinished">&Odpovědět</translation> + </message> + <message> + <source>Answer</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&Bye</source> + <translation type="unfinished">Zavěsit (&Bye)</translation> + </message> + <message> + <source>Bye</source> + <translation type="unfinished">Zavěsit</translation> + </message> + <message> + <source>&Reject</source> + <translation type="unfinished">&Odmítnout</translation> + </message> + <message> + <source>Reject</source> + <translation type="unfinished">Odmítnout</translation> + </message> + <message> + <source>&Hold</source> + <translation type="unfinished">&Podržet</translation> + </message> + <message> + <source>Hold</source> + <translation type="unfinished">Podržet</translation> + </message> + <message> + <source>R&edirect...</source> + <translation type="unfinished">&Přesměrovat...</translation> + </message> + <message> + <source>Redirect</source> + <translation type="unfinished">Přesměrovat</translation> + </message> + <message> + <source>&Dtmf...</source> + <translation type="unfinished">&DTMF...</translation> + </message> + <message> + <source>Dtmf</source> + <translation type="unfinished">DTMF</translation> + </message> + <message> + <source>&Terminal capabilities...</source> + <translation type="unfinished">&Parametry protistrany...</translation> + </message> + <message> + <source>&Redial</source> + <translation type="unfinished">&Opakovat</translation> + </message> + <message> + <source>Redial</source> + <translation type="unfinished">Opakovat</translation> + </message> + <message> + <source>&Conference</source> + <translation type="unfinished">&Konference</translation> + </message> + <message> + <source>Conf</source> + <translation type="unfinished">Konference</translation> + </message> + <message> + <source>&Mute</source> + <translation type="unfinished">&Ztišit</translation> + </message> + <message> + <source>Mute</source> + <translation type="unfinished">Ztišit</translation> + </message> + <message> + <source>Trans&fer...</source> + <translation type="unfinished">&Zprostředkovat...</translation> + </message> + <message> + <source>Xfer</source> + <translation type="unfinished">Zprostředkovat</translation> + </message> </context> <context> <name>NumberConversionForm</name> @@ -2582,7 +2637,7 @@ Pokud je SAS shodný na obou stranách, klikněte na ikonku zámečku. Lze se o </message> <message> <source>User profile</source> - <translation>Uživatelský profil</translation> + <translation type="obsolete">Uživatelský profil</translation> </message> <message> <source>Tick the check boxes of the user profiles that you want to run and press run.</source> @@ -2743,7 +2798,7 @@ Please select a profile.</source> </message> <message> <source>Alt+I</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Alt+I</translation> </message> <message> <source>Dia&mondcard</source> @@ -2751,7 +2806,7 @@ Please select a profile.</source> </message> <message> <source>Alt+M</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Alt+M</translation> </message> <message> <source>Modify profile</source> @@ -2770,7 +2825,15 @@ Please select a profile.</source> <translation type="unfinished"></translation> </message> <message> - <source><html>You can use the profile editor to create a profile. With the profile editor you can change many settings to tune the SIP protocol, RTP and many other things.<br><br>Alternatively you can use the wizard to quickly setup a user profile. The wizard asks you only a few essential settings. If you create a user profile with the wizard you can still edit the full profile with the profile editor at a later time.<br><br>You can create a Diamondcard account to make worldwide calls to regular and cell phones and send SMS messages.<br><br>Choose what method you wish to use.</html></source> + <source><html>You can use the profile editor to create a profile. With the profile editor you can change many settings to tune the SIP protocol, RTP and many other things.<br><br>Alternatively you can use the wizard to quickly setup a user profile. The wizard asks you only a few essential settings. If you create a user profile with the wizard you can still edit the full profile with the profile editor at a later time.<br><br></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>You can create a Diamondcard account to make worldwide calls to regular and cell phones and send SMS messages.<br><br></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Choose what method you wish to use.</html></source> <translation type="unfinished"></translation> </message> </context> @@ -2819,7 +2882,7 @@ Please select a profile.</source> </message> <message> <source>User</source> - <translation>Uživatel</translation> + <translation type="obsolete">Uživatel</translation> </message> <message> <source>Register</source> @@ -3287,7 +3350,7 @@ Algoritmus je velmi jednoduchý. Zvuk je navzorkován jako 16 bitový PCM vzorek </message> <message> <source>Default user profiles</source> - <translation>Standardní uživatelský profil</translation> + <translation type="obsolete">Standardní uživatelský profil</translation> </message> <message> <source>If you always use the same profile(s), then you can mark these profiles as default here. The next time you start Twinkle, you will not be asked to select which profiles to run. The default profiles will automatically run.</source> @@ -3693,7 +3756,7 @@ If before answering a call, the microphone or speaker appears to be invalid, a w </message> <message> <source>Type of transfer</source> - <translation>Typ přesměrování</translation> + <translation type="obsolete">Typ přesměrování</translation> </message> <message> <source>&Blind transfer</source> diff --git a/src/gui/lang/twinkle_de.ts b/src/gui/lang/twinkle_de.ts index 5dd02ad..fa83635 100644 --- a/src/gui/lang/twinkle_de.ts +++ b/src/gui/lang/twinkle_de.ts @@ -1,4 +1,6 @@ -<!DOCTYPE TS><TS> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0"> <context> <name>AddressCardForm</name> <message> @@ -71,6 +73,21 @@ </message> </context> <context> + <name>AddressTableModel</name> + <message> + <source>Name</source> + <translation type="unfinished">Name</translation> + </message> + <message> + <source>Phone</source> + <translation type="unfinished">Telefon</translation> + </message> + <message> + <source>Remark</source> + <translation type="unfinished">Anmerkung</translation> + </message> +</context> +<context> <name>AuthenticationForm</name> <message> <source>Twinkle - Authentication</source> @@ -318,48 +335,8 @@ <context> <name>DiamondcardProfileForm</name> <message> - <source>Twinkle - Diamondcard User Profile</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Your Diamondcard account ID.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>This is just your full name, e.g. John Doe. It is used as a display name. When you make a call, this display name might be shown to the called party.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>&Account ID:</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>&PIN code:</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>&Your name:</source> - <translation type="unfinished"></translation> - </message> - <message> - <source><p align="center"><u>Sign up for a Diamondcard account</u></p></source> - <translation type="unfinished"></translation> - </message> - <message> - <source>&OK</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Alt+O</source> - <translation type="unfinished"></translation> - </message> - <message> <source>&Cancel</source> - <translation type="unfinished">Abbruch (Es&c)</translation> - </message> - <message> - <source>Alt+C</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Abbruch (Es&c)</translation> </message> <message> <source>Fill in your account ID.</source> @@ -373,15 +350,6 @@ <source>A user profile with name %1 already exists.</source> <translation type="unfinished"></translation> </message> - <message> - <source>Your Diamondcard PIN code.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source><p>With a Diamondcard account you can make worldwide calls to regular and cell phones and send SMS messages. To sign up for a Diamondcard account click on the "sign up" link below. Once you have signed up you receive an account ID and PIN code. Enter the account ID and PIN code below to create a Twinkle user profile for your Diamondcard account.</p> -<p>For call rates see the sign up web page that will be shown to you when you click on the "sign up" link.</p></source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>DtmfForm</name> @@ -470,11 +438,11 @@ <name>FreeDeskSysTray</name> <message> <source>Show/Hide</source> - <translation>Wiederherstellen/Minimieren</translation> + <translation type="obsolete">Wiederherstellen/Minimieren</translation> </message> <message> <source>Quit</source> - <translation>Beenden</translation> + <translation type="obsolete">Beenden</translation> </message> </context> <context> @@ -876,15 +844,15 @@ </message> <message> <source>Name</source> - <translation>Name</translation> + <translation type="obsolete">Name</translation> </message> <message> <source>Type</source> - <translation>Typ</translation> + <translation type="obsolete">Typ</translation> </message> <message> <source>Phone</source> - <translation>Telefon</translation> + <translation type="obsolete">Telefon</translation> </message> <message> <source>&Show only SIP addresses</source> @@ -943,7 +911,7 @@ Nutzen Sie zum Anlegen und Bearbeiten Ihrer systemweiten Adressinformationen das </message> <message> <source>Remark</source> - <translation>Anmerkung</translation> + <translation type="obsolete">Anmerkung</translation> </message> <message> <source>Contacts in the local address book of Twinkle.</source> @@ -1426,7 +1394,7 @@ With this option you request your SIP provider to hide your identity from the ca </message> <message> <source>Instant message toolbar</source> - <translation>Instant Message Werkzeugleiste</translation> + <translation type="obsolete">Instant Message Werkzeugleiste</translation> </message> <message> <source>Send file...</source> @@ -1577,7 +1545,7 @@ With this option you request your SIP provider to hide your identity from the ca </message> <message> <source>Visual indication of line state.</source> - <translation>Optische Anzeige des Leitungsstatus.</translation> + <translation type="obsolete">Optische Anzeige des Leitungsstatus.</translation> </message> <message> <source>idle</source> @@ -1586,15 +1554,15 @@ With this option you request your SIP provider to hide your identity from the ca </message> <message> <source>Call is on hold</source> - <translation>Anruf gehalten</translation> + <translation type="obsolete">Anruf gehalten</translation> </message> <message> <source>Voice is muted</source> - <translation>stummgeschaltet</translation> + <translation type="obsolete">stummgeschaltet</translation> </message> <message> <source>Conference call</source> - <translation>Konferenz</translation> + <translation type="obsolete">Konferenz</translation> </message> <message> <source>Transferring call</source> @@ -1611,7 +1579,7 @@ Both ends of an encrypted voice channel receive the same SAS on the first call. <p> If the SAS is equal at both ends, then you should confirm it by clicking this padlock for stronger security of future calls to the same destination. For subsequent calls to the same destination, you don't have to confirm the SAS again. The padlock will show a check symbol when the SAS has been confirmed. </p></source> - <translation><p> + <translation type="obsolete"><p> Das Vorhängeschloss erscheint, wenn eine abhörsicher verschüsselte Verbindung zur Übertragung der Sprachdaten aufgebaut werden konnte. </p> <h3>SAS - Short Authentication String</h3> @@ -1717,7 +1685,7 @@ Bei Übereinstimmung klicken Sie auf das Vorhängeschloss, und Twinkle merkt sic </message> <message> <source>Call Toolbar</source> - <translation>Anruf Werkzeugleiste</translation> + <translation type="obsolete">Anruf Werkzeugleiste</translation> </message> <message> <source>Quit</source> @@ -2171,118 +2139,118 @@ Bei Übereinstimmung klicken Sie auf das Vorhängeschloss, und Twinkle merkt sic <message> <source>Call</source> <comment>toolbar text</comment> - <translation>Anruf+</translation> + <translation type="obsolete">Anruf+</translation> </message> <message> <source>&Call...</source> <comment>call menu text</comment> - <translation>Anruf+... (&Call)</translation> + <translation type="obsolete">Anruf+... (&Call)</translation> </message> <message> <source>Answer</source> <comment>toolbar text</comment> - <translation>Ja?</translation> + <translation type="obsolete">Ja?</translation> </message> <message> <source>&Answer</source> <comment>menu text</comment> - <translation>&Annehmen</translation> + <translation type="obsolete">&Annehmen</translation> </message> <message> <source>Bye</source> <comment>toolbar text</comment> - <translation>Ende</translation> + <translation type="obsolete">Ende</translation> </message> <message> <source>&Bye</source> <comment>menu text</comment> - <translation>Auflegen (&Bye)</translation> + <translation type="obsolete">Auflegen (&Bye)</translation> </message> <message> <source>Reject</source> <comment>toolbar text</comment> - <translation>Nein!</translation> + <translation type="obsolete">Nein!</translation> </message> <message> <source>&Reject</source> <comment>menu text</comment> - <translation>Ab&weisen</translation> + <translation type="obsolete">Ab&weisen</translation> </message> <message> <source>Hold</source> <comment>toolbar text</comment> - <translation>Halten</translation> + <translation type="obsolete">Halten</translation> </message> <message> <source>&Hold</source> <comment>menu text</comment> - <translation>&Halten</translation> + <translation type="obsolete">&Halten</translation> </message> <message> <source>Redirect</source> <comment>toolbar text</comment> - <translation>Umleit</translation> + <translation type="obsolete">Umleit</translation> </message> <message> <source>R&edirect...</source> <comment>menu text</comment> - <translation>Uml&eiten...</translation> + <translation type="obsolete">Uml&eiten...</translation> </message> <message> <source>Dtmf</source> <comment>toolbar text</comment> - <translation>DTMF</translation> + <translation type="obsolete">DTMF</translation> </message> <message> <source>&Dtmf...</source> <comment>menu text</comment> - <translation>&DTMF...</translation> + <translation type="obsolete">&DTMF...</translation> </message> <message> <source>&Terminal capabilities...</source> <comment>menu text</comment> - <translation>&Fähigkeiten Gegenstelle...</translation> + <translation type="obsolete">&Fähigkeiten Gegenstelle...</translation> </message> <message> <source>Redial</source> <comment>toolbar text</comment> - <translation>-> -></translation> + <translation type="obsolete">-> -></translation> </message> <message> <source>&Redial</source> <comment>menu text</comment> - <translation>Wahlwiederholun&g</translation> + <translation type="obsolete">Wahlwiederholun&g</translation> </message> <message> <source>Conf</source> <comment>toolbar text</comment> - <translation>3er-K.</translation> + <translation type="obsolete">3er-K.</translation> </message> <message> <source>&Conference</source> <comment>menu text</comment> - <translation>Konferen&z</translation> + <translation type="obsolete">Konferen&z</translation> </message> <message> <source>Mute</source> <comment>toolbar text</comment> - <translation>Stumm</translation> + <translation type="obsolete">Stumm</translation> </message> <message> <source>&Mute</source> <comment>menu text</comment> - <translation>Stu&mm + <translation type="obsolete">Stu&mm </translation> </message> <message> <source>Xfer</source> <comment>toolbar text</comment> - <translation>Vmtlg</translation> + <translation type="obsolete">Vmtlg</translation> </message> <message> <source>Trans&fer...</source> <comment>menu text</comment> - <translation>Vermitte&ln...</translation> + <translation type="obsolete">Vermitte&ln...</translation> </message> <message> <source>Voice mail</source> @@ -2421,6 +2389,95 @@ Um den Online-Status eines Buddies abzufragen, muss <i>dessen</i> Pr <source>Admin center</source> <translation type="unfinished"></translation> </message> + <message> + <source>Call</source> + <translation type="unfinished">Anruf+</translation> + </message> + <message> + <source>&Answer</source> + <translation type="unfinished">&Annehmen</translation> + </message> + <message> + <source>Answer</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&Bye</source> + <translation type="unfinished">Auflegen (&Bye)</translation> + </message> + <message> + <source>Bye</source> + <translation type="unfinished">Ende</translation> + </message> + <message> + <source>&Reject</source> + <translation type="unfinished">Ab&weisen</translation> + </message> + <message> + <source>Reject</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&Hold</source> + <translation type="unfinished">&Halten</translation> + </message> + <message> + <source>Hold</source> + <translation type="unfinished">Halten</translation> + </message> + <message> + <source>R&edirect...</source> + <translation type="unfinished">Uml&eiten...</translation> + </message> + <message> + <source>Redirect</source> + <translation type="unfinished">Umleit</translation> + </message> + <message> + <source>&Dtmf...</source> + <translation type="unfinished">&DTMF...</translation> + </message> + <message> + <source>Dtmf</source> + <translation type="unfinished">DTMF</translation> + </message> + <message> + <source>&Terminal capabilities...</source> + <translation type="unfinished">&Fähigkeiten Gegenstelle...</translation> + </message> + <message> + <source>&Redial</source> + <translation type="unfinished">Wahlwiederholun&g</translation> + </message> + <message> + <source>Redial</source> + <translation type="unfinished">-> -></translation> + </message> + <message> + <source>&Conference</source> + <translation type="unfinished">Konferen&z</translation> + </message> + <message> + <source>Conf</source> + <translation type="unfinished">3er-K.</translation> + </message> + <message> + <source>&Mute</source> + <translation type="unfinished">Stu&mm +</translation> + </message> + <message> + <source>Mute</source> + <translation type="unfinished">Stumm</translation> + </message> + <message> + <source>Trans&fer...</source> + <translation type="unfinished">Vermitte&ln...</translation> + </message> + <message> + <source>Xfer</source> + <translation type="unfinished">Vmtlg</translation> + </message> </context> <context> <name>NumberConversionForm</name> @@ -2591,7 +2648,7 @@ Um den Online-Status eines Buddies abzufragen, muss <i>dessen</i> Pr </message> <message> <source>User profile</source> - <translation>Benutzerprofil</translation> + <translation type="obsolete">Benutzerprofil</translation> </message> <message> <source>Tick the check boxes of the user profiles that you want to run and press run.</source> @@ -2783,7 +2840,15 @@ Please select a profile.</source> <translation type="unfinished"></translation> </message> <message> - <source><html>You can use the profile editor to create a profile. With the profile editor you can change many settings to tune the SIP protocol, RTP and many other things.<br><br>Alternatively you can use the wizard to quickly setup a user profile. The wizard asks you only a few essential settings. If you create a user profile with the wizard you can still edit the full profile with the profile editor at a later time.<br><br>You can create a Diamondcard account to make worldwide calls to regular and cell phones and send SMS messages.<br><br>Choose what method you wish to use.</html></source> + <source><html>You can use the profile editor to create a profile. With the profile editor you can change many settings to tune the SIP protocol, RTP and many other things.<br><br>Alternatively you can use the wizard to quickly setup a user profile. The wizard asks you only a few essential settings. If you create a user profile with the wizard you can still edit the full profile with the profile editor at a later time.<br><br></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>You can create a Diamondcard account to make worldwide calls to regular and cell phones and send SMS messages.<br><br></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Choose what method you wish to use.</html></source> <translation type="unfinished"></translation> </message> </context> @@ -2832,7 +2897,7 @@ Please select a profile.</source> </message> <message> <source>User</source> - <translation>Benutzer</translation> + <translation type="obsolete">Benutzer</translation> </message> <message> <source>Register</source> @@ -3305,7 +3370,7 @@ Im Normalfall führt das Aktivieren eher zu einer kaum bemerkbaren Verschlechter </message> <message> <source>Default user profiles</source> - <translation>Default Benutzerprofile</translation> + <translation type="obsolete">Default Benutzerprofile</translation> </message> <message> <source>If you always use the same profile(s), then you can mark these profiles as default here. The next time you start Twinkle, you will not be asked to select which profiles to run. The default profiles will automatically run.</source> @@ -3714,7 +3779,7 @@ Stattdessen zeigt Twinkle in beiden Fällen eine Warnung.</p> </message> <message> <source>Type of transfer</source> - <translation>Art der Vermittlung</translation> + <translation type="obsolete">Art der Vermittlung</translation> </message> <message> <source>&Blind transfer</source> diff --git a/src/gui/lang/twinkle_fr.ts b/src/gui/lang/twinkle_fr.ts index 2a58c53..8b43deb 100644 --- a/src/gui/lang/twinkle_fr.ts +++ b/src/gui/lang/twinkle_fr.ts @@ -1,4 +1,6 @@ -<!DOCTYPE TS><TS> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0"> <context> <name>AddressCardForm</name> <message> @@ -71,6 +73,21 @@ </message> </context> <context> + <name>AddressTableModel</name> + <message> + <source>Name</source> + <translation type="unfinished">Nom</translation> + </message> + <message> + <source>Phone</source> + <translation type="unfinished">Téléphone</translation> + </message> + <message> + <source>Remark</source> + <translation type="unfinished">Remarque</translation> + </message> +</context> +<context> <name>AuthenticationForm</name> <message> <source>Twinkle - Authentication</source> @@ -318,48 +335,16 @@ <context> <name>DiamondcardProfileForm</name> <message> - <source>Twinkle - Diamondcard User Profile</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Your Diamondcard account ID.</source> - <translation type="unfinished"></translation> - </message> - <message> <source>This is just your full name, e.g. John Doe. It is used as a display name. When you make a call, this display name might be shown to the called party.</source> - <translation type="unfinished">C'est simplement votre nom complet, ex: Pierre Dupond. Il est utilisé pour l'affichage. Quand vous ferez un appel, ceci sera montré à votre correspondant.</translation> - </message> - <message> - <source>&Account ID:</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>&PIN code:</source> - <translation type="unfinished"></translation> + <translation type="obsolete">C'est simplement votre nom complet, ex: Pierre Dupond. Il est utilisé pour l'affichage. Quand vous ferez un appel, ceci sera montré à votre correspondant.</translation> </message> <message> <source>&Your name:</source> - <translation type="unfinished">&Votre nom:</translation> - </message> - <message> - <source><p align="center"><u>Sign up for a Diamondcard account</u></p></source> - <translation type="unfinished"></translation> - </message> - <message> - <source>&OK</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Alt+O</source> - <translation type="unfinished"></translation> + <translation type="obsolete">&Votre nom:</translation> </message> <message> <source>&Cancel</source> - <translation type="unfinished">Annuler (Es&c)</translation> - </message> - <message> - <source>Alt+C</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Annuler (Es&c)</translation> </message> <message> <source>Fill in your account ID.</source> @@ -373,15 +358,6 @@ <source>A user profile with name %1 already exists.</source> <translation type="unfinished"></translation> </message> - <message> - <source>Your Diamondcard PIN code.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source><p>With a Diamondcard account you can make worldwide calls to regular and cell phones and send SMS messages. To sign up for a Diamondcard account click on the "sign up" link below. Once you have signed up you receive an account ID and PIN code. Enter the account ID and PIN code below to create a Twinkle user profile for your Diamondcard account.</p> -<p>For call rates see the sign up web page that will be shown to you when you click on the "sign up" link.</p></source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>DtmfForm</name> @@ -470,11 +446,11 @@ <name>FreeDeskSysTray</name> <message> <source>Show/Hide</source> - <translation>Montrer/Cacher</translation> + <translation type="obsolete">Montrer/Cacher</translation> </message> <message> <source>Quit</source> - <translation>Quitter</translation> + <translation type="obsolete">Quitter</translation> </message> </context> <context> @@ -876,15 +852,15 @@ </message> <message> <source>Name</source> - <translation>Nom</translation> + <translation type="obsolete">Nom</translation> </message> <message> <source>Type</source> - <translation>Type</translation> + <translation type="obsolete">Type</translation> </message> <message> <source>Phone</source> - <translation>Téléphone</translation> + <translation type="obsolete">Téléphone</translation> </message> <message> <source>&Show only SIP addresses</source> @@ -941,7 +917,7 @@ Pour ajouter, supprimer, ou modifier une information de contact, vous devez util </message> <message> <source>Remark</source> - <translation>Remarque</translation> + <translation type="obsolete">Remarque</translation> </message> <message> <source>Contacts in the local address book of Twinkle.</source> @@ -1425,7 +1401,7 @@ With this option you request your SIP provider to hide your identity from the ca </message> <message> <source>Instant message toolbar</source> - <translation>Barre d'outil de la messagerie instantanée</translation> + <translation type="obsolete">Barre d'outil de la messagerie instantanée</translation> </message> <message> <source>Send file...</source> @@ -1576,7 +1552,7 @@ With this option you request your SIP provider to hide your identity from the ca </message> <message> <source>Visual indication of line state.</source> - <translation>Indication visuelle de l'état de la ligne.</translation> + <translation type="obsolete">Indication visuelle de l'état de la ligne.</translation> </message> <message> <source>idle</source> @@ -1585,15 +1561,15 @@ With this option you request your SIP provider to hide your identity from the ca </message> <message> <source>Call is on hold</source> - <translation>Appel en attente</translation> + <translation type="obsolete">Appel en attente</translation> </message> <message> <source>Voice is muted</source> - <translation>Voix coupée</translation> + <translation type="obsolete">Voix coupée</translation> </message> <message> <source>Conference call</source> - <translation>Conférence</translation> + <translation type="obsolete">Conférence</translation> </message> <message> <source>Transferring call</source> @@ -1610,7 +1586,7 @@ Both ends of an encrypted voice channel receive the same SAS on the first call. <p> If the SAS is equal at both ends, then you should confirm it by clicking this padlock for stronger security of future calls to the same destination. For subsequent calls to the same destination, you don't have to confirm the SAS again. The padlock will show a check symbol when the SAS has been confirmed. </p></source> - <translation><p> + <translation type="obsolete"><p> Le clavier indique que votre voix est encrypté sur le réseau. </p> <h3>SAS - Short Authentication String (chaine d'authentification courte)</h3> @@ -1714,7 +1690,7 @@ Si le SAS est égal, vous devez le confirmer en cliquant sur le clavier pour une </message> <message> <source>Call Toolbar</source> - <translation>Barre d'outil d'appel</translation> + <translation type="obsolete">Barre d'outil d'appel</translation> </message> <message> <source>Quit</source> @@ -2168,118 +2144,118 @@ Si le SAS est égal, vous devez le confirmer en cliquant sur le clavier pour une <message> <source>Call</source> <comment>toolbar text</comment> - <translation>Appel</translation> + <translation type="obsolete">Appel</translation> </message> <message> <source>&Call...</source> <comment>call menu text</comment> - <translation>&Appel...</translation> + <translation type="obsolete">&Appel...</translation> </message> <message> <source>Answer</source> <comment>toolbar text</comment> - <translation>Répondre</translation> + <translation type="obsolete">Répondre</translation> </message> <message> <source>&Answer</source> <comment>menu text</comment> - <translation>&Répondre</translation> + <translation type="obsolete">&Répondre</translation> </message> <message> <source>Bye</source> <comment>toolbar text</comment> - <translation>Fin</translation> + <translation type="obsolete">Fin</translation> </message> <message> <source>&Bye</source> <comment>menu text</comment> - <translation>&Fin</translation> + <translation type="obsolete">&Fin</translation> </message> <message> <source>Reject</source> <comment>toolbar text</comment> - <translation>Refuser</translation> + <translation type="obsolete">Refuser</translation> </message> <message> <source>&Reject</source> <comment>menu text</comment> - <translation>R&efuser</translation> + <translation type="obsolete">R&efuser</translation> </message> <message> <source>Hold</source> <comment>toolbar text</comment> - <translation>Attente</translation> + <translation type="obsolete">Attente</translation> </message> <message> <source>&Hold</source> <comment>menu text</comment> - <translation>Atte&nte</translation> + <translation type="obsolete">Atte&nte</translation> </message> <message> <source>Redirect</source> <comment>toolbar text</comment> - <translation>Redirect</translation> + <translation type="obsolete">Redirect</translation> </message> <message> <source>R&edirect...</source> <comment>menu text</comment> - <translation>Re&direction...</translation> + <translation type="obsolete">Re&direction...</translation> </message> <message> <source>Dtmf</source> <comment>toolbar text</comment> - <translation>Dtmf</translation> + <translation type="obsolete">Dtmf</translation> </message> <message> <source>&Dtmf...</source> <comment>menu text</comment> - <translation>Dt&mf...</translation> + <translation type="obsolete">Dt&mf...</translation> </message> <message> <source>&Terminal capabilities...</source> <comment>menu text</comment> - <translation>Possibilités du &terminal...</translation> + <translation type="obsolete">Possibilités du &terminal...</translation> </message> <message> <source>Redial</source> <comment>toolbar text</comment> - <translation>Rappeler</translation> + <translation type="obsolete">Rappeler</translation> </message> <message> <source>&Redial</source> <comment>menu text</comment> - <translation>&Rappeler</translation> + <translation type="obsolete">&Rappeler</translation> </message> <message> <source>Conf</source> <comment>toolbar text</comment> - <translation>Conf</translation> + <translation type="obsolete">Conf</translation> </message> <message> <source>&Conference</source> <comment>menu text</comment> - <translation>&Conférence</translation> + <translation type="obsolete">&Conférence</translation> </message> <message> <source>Mute</source> <comment>toolbar text</comment> - <translation>Muet</translation> + <translation type="obsolete">Muet</translation> </message> <message> <source>&Mute</source> <comment>menu text</comment> - <translation>M&uet + <translation type="obsolete">M&uet </translation> </message> <message> <source>Xfer</source> <comment>toolbar text</comment> - <translation>Transfert</translation> + <translation type="obsolete">Transfert</translation> </message> <message> <source>Trans&fer...</source> <comment>menu text</comment> - <translation>&Transfert...</translation> + <translation type="obsolete">&Transfert...</translation> </message> <message> <source>Voice mail</source> @@ -2413,6 +2389,95 @@ Si le SAS est égal, vous devez le confirmer en cliquant sur le clavier pour une <source>Admin center</source> <translation type="unfinished"></translation> </message> + <message> + <source>Call</source> + <translation type="unfinished">Appel</translation> + </message> + <message> + <source>&Answer</source> + <translation type="unfinished">&Répondre</translation> + </message> + <message> + <source>Answer</source> + <translation type="unfinished">Répondre</translation> + </message> + <message> + <source>&Bye</source> + <translation type="unfinished">&Fin</translation> + </message> + <message> + <source>Bye</source> + <translation type="unfinished">Fin</translation> + </message> + <message> + <source>&Reject</source> + <translation type="unfinished">R&efuser</translation> + </message> + <message> + <source>Reject</source> + <translation type="unfinished">Refuser</translation> + </message> + <message> + <source>&Hold</source> + <translation type="unfinished">Atte&nte</translation> + </message> + <message> + <source>Hold</source> + <translation type="unfinished">Attente</translation> + </message> + <message> + <source>R&edirect...</source> + <translation type="unfinished">Re&direction...</translation> + </message> + <message> + <source>Redirect</source> + <translation type="unfinished">Redirect</translation> + </message> + <message> + <source>&Dtmf...</source> + <translation type="unfinished">Dt&mf...</translation> + </message> + <message> + <source>Dtmf</source> + <translation type="unfinished">Dtmf</translation> + </message> + <message> + <source>&Terminal capabilities...</source> + <translation type="unfinished">Possibilités du &terminal...</translation> + </message> + <message> + <source>&Redial</source> + <translation type="unfinished">&Rappeler</translation> + </message> + <message> + <source>Redial</source> + <translation type="unfinished">Rappeler</translation> + </message> + <message> + <source>&Conference</source> + <translation type="unfinished">&Conférence</translation> + </message> + <message> + <source>Conf</source> + <translation type="unfinished">Conf</translation> + </message> + <message> + <source>&Mute</source> + <translation type="unfinished">M&uet +</translation> + </message> + <message> + <source>Mute</source> + <translation type="unfinished">Muet</translation> + </message> + <message> + <source>Trans&fer...</source> + <translation type="unfinished">&Transfert...</translation> + </message> + <message> + <source>Xfer</source> + <translation type="unfinished">Transfert</translation> + </message> </context> <context> <name>NumberConversionForm</name> @@ -2583,7 +2648,7 @@ Si le SAS est égal, vous devez le confirmer en cliquant sur le clavier pour une </message> <message> <source>User profile</source> - <translation>Profil utilisateur</translation> + <translation type="obsolete">Profil utilisateur</translation> </message> <message> <source>Tick the check boxes of the user profiles that you want to run and press run.</source> @@ -2749,7 +2814,7 @@ Merci de sélectionner un profil.</translation> </message> <message> <source>Alt+I</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Alt+E</translation> </message> <message> <source>Dia&mondcard</source> @@ -2757,7 +2822,7 @@ Merci de sélectionner un profil.</translation> </message> <message> <source>Alt+M</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Alt+A</translation> </message> <message> <source>Modify profile</source> @@ -2776,7 +2841,15 @@ Merci de sélectionner un profil.</translation> <translation type="unfinished"></translation> </message> <message> - <source><html>You can use the profile editor to create a profile. With the profile editor you can change many settings to tune the SIP protocol, RTP and many other things.<br><br>Alternatively you can use the wizard to quickly setup a user profile. The wizard asks you only a few essential settings. If you create a user profile with the wizard you can still edit the full profile with the profile editor at a later time.<br><br>You can create a Diamondcard account to make worldwide calls to regular and cell phones and send SMS messages.<br><br>Choose what method you wish to use.</html></source> + <source><html>You can use the profile editor to create a profile. With the profile editor you can change many settings to tune the SIP protocol, RTP and many other things.<br><br>Alternatively you can use the wizard to quickly setup a user profile. The wizard asks you only a few essential settings. If you create a user profile with the wizard you can still edit the full profile with the profile editor at a later time.<br><br></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>You can create a Diamondcard account to make worldwide calls to regular and cell phones and send SMS messages.<br><br></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Choose what method you wish to use.</html></source> <translation type="unfinished"></translation> </message> </context> @@ -2825,7 +2898,7 @@ Merci de sélectionner un profil.</translation> </message> <message> <source>User</source> - <translation>Utilisateur</translation> + <translation type="obsolete">Utilisateur</translation> </message> <message> <source>Register</source> @@ -3296,7 +3369,7 @@ L'algoritme de réduction de bruit est très simple. Le son est enregistré </message> <message> <source>Default user profiles</source> - <translation>Profil utilisateur par défaut</translation> + <translation type="obsolete">Profil utilisateur par défaut</translation> </message> <message> <source>If you always use the same profile(s), then you can mark these profiles as default here. The next time you start Twinkle, you will not be asked to select which profiles to run. The default profiles will automatically run.</source> @@ -3702,7 +3775,7 @@ If before answering a call, the microphone or speaker appears to be invalid, a w </message> <message> <source>Type of transfer</source> - <translation>Type de transfert</translation> + <translation type="obsolete">Type de transfert</translation> </message> <message> <source>&Blind transfer</source> diff --git a/src/gui/lang/twinkle_nl.ts b/src/gui/lang/twinkle_nl.ts index e7281cd..6e6722f 100644 --- a/src/gui/lang/twinkle_nl.ts +++ b/src/gui/lang/twinkle_nl.ts @@ -1,4 +1,6 @@ -<!DOCTYPE TS><TS> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0"> <context> <name>AddressCardForm</name> <message> @@ -71,6 +73,21 @@ </message> </context> <context> + <name>AddressTableModel</name> + <message> + <source>Name</source> + <translation type="unfinished">Naam</translation> + </message> + <message> + <source>Phone</source> + <translation type="unfinished">Telefoon</translation> + </message> + <message> + <source>Remark</source> + <translation type="unfinished">Opmerkingen</translation> + </message> +</context> +<context> <name>AuthenticationForm</name> <message> <source>Twinkle - Authentication</source> @@ -319,7 +336,7 @@ <name>DiamondcardProfileForm</name> <message> <source>Twinkle - Diamondcard User Profile</source> - <translation>Twinkle - Diamondcard gebruikersprofiel</translation> + <translation type="obsolete">Twinkle - Diamondcard gebruikersprofiel</translation> </message> <message> <source><p>With a Diamondcard account you can make worldwide calls to regular and cell phones. To sign up for a Diamondcard account click on the "sign up" link below. Once you have signed up you receive an account ID and PIN code. Enter the account ID and PIN code below to create a Twinkle user profile for your Diamondcard account.</p> @@ -329,43 +346,35 @@ </message> <message> <source>Your Diamondcard account ID.</source> - <translation>Uw Diamondcard account ID.</translation> + <translation type="obsolete">Uw Diamondcard account ID.</translation> </message> <message> <source>This is just your full name, e.g. John Doe. It is used as a display name. When you make a call, this display name might be shown to the called party.</source> - <translation>Dit is uw eigen naam. bijv. Jan Jansen. Als u iemand belt, kan deze naam getoond worden.</translation> + <translation type="obsolete">Dit is uw eigen naam. bijv. Jan Jansen. Als u iemand belt, kan deze naam getoond worden.</translation> </message> <message> <source>&Account ID:</source> - <translation>&Account ID:</translation> + <translation type="obsolete">&Account ID:</translation> </message> <message> <source>&PIN code:</source> - <translation>&PIN code:</translation> + <translation type="obsolete">&PIN code:</translation> </message> <message> <source>&Your name:</source> - <translation>U&w naam:</translation> + <translation type="obsolete">U&w naam:</translation> </message> <message> <source><p align="center"><u>Sign up for a Diamondcard account</u></p></source> - <translation><p align="center"><u>Aanmelden voor een Diamondcard account</u></p></translation> + <translation type="obsolete"><p align="center"><u>Aanmelden voor een Diamondcard account</u></p></translation> </message> <message> <source>&OK</source> - <translation>&OK</translation> - </message> - <message> - <source>Alt+O</source> - <translation></translation> + <translation type="obsolete">&OK</translation> </message> <message> <source>&Cancel</source> - <translation>Ann&uleren</translation> - </message> - <message> - <source>Alt+C</source> - <translation></translation> + <translation type="obsolete">Ann&uleren</translation> </message> <message> <source>Fill in your account ID.</source> @@ -381,12 +390,12 @@ </message> <message> <source>Your Diamondcard PIN code.</source> - <translation>Uw Diamondcard PIN code.</translation> + <translation type="obsolete">Uw Diamondcard PIN code.</translation> </message> <message> <source><p>With a Diamondcard account you can make worldwide calls to regular and cell phones and send SMS messages. To sign up for a Diamondcard account click on the "sign up" link below. Once you have signed up you receive an account ID and PIN code. Enter the account ID and PIN code below to create a Twinkle user profile for your Diamondcard account.</p> <p>For call rates see the sign up web page that will be shown to you when you click on the "sign up" link.</p></source> - <translation><p>Met een Diamondcard account kunt u wereldwijd bellen naar vaste en mobiele telefoons en SMS berichten versturen. U kunt zich aanmelden voor een Diamondcard account door op de onderstaande "aanmelden" link te klikken. Na aanmelding ontvangt u een account ID en PIN code. Voer dit account ID en de PIN code hieronder in om een Twinkle gebruikersprofiel voor uw Diamondcard account te maken.</p> + <translation type="obsolete"><p>Met een Diamondcard account kunt u wereldwijd bellen naar vaste en mobiele telefoons en SMS berichten versturen. U kunt zich aanmelden voor een Diamondcard account door op de onderstaande "aanmelden" link te klikken. Na aanmelding ontvangt u een account ID en PIN code. Voer dit account ID en de PIN code hieronder in om een Twinkle gebruikersprofiel voor uw Diamondcard account te maken.</p> <p>Beltarieven kunt u vinden op de aanmeldingspagina die u krijgt als u op de "aanmelden" link klinkt.</p></translation> </message> </context> @@ -477,11 +486,11 @@ <name>FreeDeskSysTray</name> <message> <source>Show/Hide</source> - <translation>Toon/Verberg</translation> + <translation type="obsolete">Toon/Verberg</translation> </message> <message> <source>Quit</source> - <translation>Afsluiten</translation> + <translation type="obsolete">Afsluiten</translation> </message> </context> <context> @@ -883,15 +892,15 @@ </message> <message> <source>Name</source> - <translation>Naam</translation> + <translation type="obsolete">Naam</translation> </message> <message> <source>Type</source> - <translation>Type</translation> + <translation type="obsolete">Type</translation> </message> <message> <source>Phone</source> - <translation>Telefoon</translation> + <translation type="obsolete">Telefoon</translation> </message> <message> <source>&Show only SIP addresses</source> @@ -947,7 +956,7 @@ </message> <message> <source>Remark</source> - <translation>Opmerkingen</translation> + <translation type="obsolete">Opmerkingen</translation> </message> <message> <source>Contacts in the local address book of Twinkle.</source> @@ -1435,7 +1444,7 @@ Met deze optie verzoekt u uw SIP provider om uw identiteit verborgen te houden v </message> <message> <source>Instant message toolbar</source> - <translation>Instant berichten</translation> + <translation type="obsolete">Instant berichten</translation> </message> <message> <source>Send file...</source> @@ -1581,15 +1590,15 @@ Met deze optie verzoekt u uw SIP provider om uw identiteit verborgen te houden v </message> <message> <source>Call is on hold</source> - <translation>Gesprek staat in de wacht</translation> + <translation type="obsolete">Gesprek staat in de wacht</translation> </message> <message> <source>Voice is muted</source> - <translation>Geluid is onderdrukt</translation> + <translation type="obsolete">Geluid is onderdrukt</translation> </message> <message> <source>Conference call</source> - <translation>Conferentiegesprek</translation> + <translation type="obsolete">Conferentiegesprek</translation> </message> <message> <source>Transferring call</source> @@ -1606,7 +1615,7 @@ Both ends of an encrypted voice channel receive the same SAS on the first call. <p> If the SAS is equal at both ends, then you should confirm it by clicking this padlock for stronger security of future calls to the same destination. For subsequent calls to the same destination, you don't have to confirm the SAS again. The padlock will show a check symbol when the SAS has been confirmed. </p></source> - <translation><p> + <translation type="obsolete"><p> Het hangslot geeft aan dat het geluidskanaal versleuteld is tijdens transport over het netwerk. </p> <h3>SAS - Short Authentication String</h3> @@ -1679,7 +1688,7 @@ Als de SAS aan beide kanten hetzelfde is, dan moet u die bevestigen door op het </message> <message> <source>Call Toolbar</source> - <translation>Gespreksbalk</translation> + <translation type="obsolete">Gespreksbalk</translation> </message> <message> <source>Quit</source> @@ -2058,7 +2067,7 @@ Als de SAS aan beide kanten hetzelfde is, dan moet u die bevestigen door op het </message> <message> <source>Visual indication of line state.</source> - <translation>Visuele indicatie van de lijnstatus.</translation> + <translation type="obsolete">Visuele indicatie van de lijnstatus.</translation> </message> <message> <source>Call redirection</source> @@ -2172,117 +2181,117 @@ Als de SAS aan beide kanten hetzelfde is, dan moet u die bevestigen door op het <message> <source>Call</source> <comment>toolbar text</comment> - <translation>Bel</translation> + <translation type="obsolete">Bel</translation> </message> <message> <source>&Call...</source> <comment>call menu text</comment> - <translation>&Bel...</translation> + <translation type="obsolete">&Bel...</translation> </message> <message> <source>Answer</source> <comment>toolbar text</comment> - <translation>Antw</translation> + <translation type="obsolete">Antw</translation> </message> <message> <source>&Answer</source> <comment>menu text</comment> - <translation>&Antwoord</translation> + <translation type="obsolete">&Antwoord</translation> </message> <message> <source>Bye</source> <comment>toolbar text</comment> - <translation>Einde</translation> + <translation type="obsolete">Einde</translation> </message> <message> <source>&Bye</source> <comment>menu text</comment> - <translation>&Einde</translation> + <translation type="obsolete">&Einde</translation> </message> <message> <source>Reject</source> <comment>toolbar text</comment> - <translation>Afwijzen</translation> + <translation type="obsolete">Afwijzen</translation> </message> <message> <source>&Reject</source> <comment>menu text</comment> - <translation>A&fwijzen</translation> + <translation type="obsolete">A&fwijzen</translation> </message> <message> <source>Hold</source> <comment>toolbar text</comment> - <translation>Wacht</translation> + <translation type="obsolete">Wacht</translation> </message> <message> <source>&Hold</source> <comment>menu text</comment> - <translation>&Wacht</translation> + <translation type="obsolete">&Wacht</translation> </message> <message> <source>Redirect</source> <comment>toolbar text</comment> - <translation>Verwijs</translation> + <translation type="obsolete">Verwijs</translation> </message> <message> <source>R&edirect...</source> <comment>menu text</comment> - <translation>&Verwijs...</translation> + <translation type="obsolete">&Verwijs...</translation> </message> <message> <source>Dtmf</source> <comment>toolbar text</comment> - <translation>Dtmf</translation> + <translation type="obsolete">Dtmf</translation> </message> <message> <source>&Dtmf...</source> <comment>menu text</comment> - <translation>Dt&mf...</translation> + <translation type="obsolete">Dt&mf...</translation> </message> <message> <source>&Terminal capabilities...</source> <comment>menu text</comment> - <translation>&Terminal eigenschappen...</translation> + <translation type="obsolete">&Terminal eigenschappen...</translation> </message> <message> <source>Redial</source> <comment>toolbar text</comment> - <translation>Herh</translation> + <translation type="obsolete">Herh</translation> </message> <message> <source>&Redial</source> <comment>menu text</comment> - <translation>&Herhaal</translation> + <translation type="obsolete">&Herhaal</translation> </message> <message> <source>Conf</source> <comment>toolbar text</comment> - <translation>Conf</translation> + <translation type="obsolete">Conf</translation> </message> <message> <source>&Conference</source> <comment>menu text</comment> - <translation>&Conferentie</translation> + <translation type="obsolete">&Conferentie</translation> </message> <message> <source>Mute</source> <comment>toolbar text</comment> - <translation>Stil</translation> + <translation type="obsolete">Stil</translation> </message> <message> <source>&Mute</source> <comment>menu text</comment> - <translation>&Stil</translation> + <translation type="obsolete">&Stil</translation> </message> <message> <source>Xfer</source> <comment>toolbar text</comment> - <translation>Xfer</translation> + <translation type="obsolete">Xfer</translation> </message> <message> <source>Trans&fer...</source> <comment>menu text</comment> - <translation>&Doorverbinden...</translation> + <translation type="obsolete">&Doorverbinden...</translation> </message> <message> <source>Voice mail</source> @@ -2420,6 +2429,94 @@ Als de SAS aan beide kanten hetzelfde is, dan moet u die bevestigen door op het <source>Admin center</source> <translation>Admin center</translation> </message> + <message> + <source>Call</source> + <translation type="unfinished">Bel</translation> + </message> + <message> + <source>&Answer</source> + <translation type="unfinished">&Antwoord</translation> + </message> + <message> + <source>Answer</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&Bye</source> + <translation type="unfinished">&Einde</translation> + </message> + <message> + <source>Bye</source> + <translation type="unfinished">Einde</translation> + </message> + <message> + <source>&Reject</source> + <translation type="unfinished">A&fwijzen</translation> + </message> + <message> + <source>Reject</source> + <translation type="unfinished">Afwijzen</translation> + </message> + <message> + <source>&Hold</source> + <translation type="unfinished">&Wacht</translation> + </message> + <message> + <source>Hold</source> + <translation type="unfinished">Wacht</translation> + </message> + <message> + <source>R&edirect...</source> + <translation type="unfinished">&Verwijs...</translation> + </message> + <message> + <source>Redirect</source> + <translation type="unfinished">Verwijs</translation> + </message> + <message> + <source>&Dtmf...</source> + <translation type="unfinished">Dt&mf...</translation> + </message> + <message> + <source>Dtmf</source> + <translation type="unfinished">Dtmf</translation> + </message> + <message> + <source>&Terminal capabilities...</source> + <translation type="unfinished">&Terminal eigenschappen...</translation> + </message> + <message> + <source>&Redial</source> + <translation type="unfinished">&Herhaal</translation> + </message> + <message> + <source>Redial</source> + <translation type="unfinished">Herh</translation> + </message> + <message> + <source>&Conference</source> + <translation type="unfinished">&Conferentie</translation> + </message> + <message> + <source>Conf</source> + <translation type="unfinished">Conf</translation> + </message> + <message> + <source>&Mute</source> + <translation type="unfinished">&Stil</translation> + </message> + <message> + <source>Mute</source> + <translation type="unfinished">Stil</translation> + </message> + <message> + <source>Trans&fer...</source> + <translation type="unfinished">&Doorverbinden...</translation> + </message> + <message> + <source>Xfer</source> + <translation type="unfinished">Xfer</translation> + </message> </context> <context> <name>NumberConversionForm</name> @@ -2590,7 +2687,7 @@ Als de SAS aan beide kanten hetzelfde is, dan moet u die bevestigen door op het </message> <message> <source>User profile</source> - <translation>Gebruikersprofiel</translation> + <translation type="obsolete">Gebruikersprofiel</translation> </message> <message> <source>Tick the check boxes of the user profiles that you want to run and press run.</source> @@ -2793,7 +2890,19 @@ Kies eerst een gebruikersprofiel.</translation> </message> <message> <source><html>You can use the profile editor to create a profile. With the profile editor you can change many settings to tune the SIP protocol, RTP and many other things.<br><br>Alternatively you can use the wizard to quickly setup a user profile. The wizard asks you only a few essential settings. If you create a user profile with the wizard you can still edit the full profile with the profile editor at a later time.<br><br>You can create a Diamondcard account to make worldwide calls to regular and cell phones and send SMS messages.<br><br>Choose what method you wish to use.</html></source> - <translation><html>U kunt de profieleditor gebruiken om een gebruikersprofiel te maken. Met de profieleditor kunt u diverse instellingen met betrekking tot het SIP protocol, RTP en vele andere zaken wijzigen.<br><br>Met de wizard kunt u snel een gebruikersprofiel maken. De wizard vraagt u alleen om een aantal essentiële instellingen. Als u een gebruikersprofiel met de wizard maakt, dan kun u deze op een later tijdstip alsnog met de profieleditor wijzigen.<br><br>U kunt een Diamondcard account aanmaken waarmee u wereldwijd kunt bellen naar vaste en mobiele telefoonnummers en SMS berichten versturen.<br><br>Kies op welke wijze u een gebruikersprofiel wilt maken.</html></translation> + <translation type="obsolete"><html>U kunt de profieleditor gebruiken om een gebruikersprofiel te maken. Met de profieleditor kunt u diverse instellingen met betrekking tot het SIP protocol, RTP en vele andere zaken wijzigen.<br><br>Met de wizard kunt u snel een gebruikersprofiel maken. De wizard vraagt u alleen om een aantal essentiële instellingen. Als u een gebruikersprofiel met de wizard maakt, dan kun u deze op een later tijdstip alsnog met de profieleditor wijzigen.<br><br>U kunt een Diamondcard account aanmaken waarmee u wereldwijd kunt bellen naar vaste en mobiele telefoonnummers en SMS berichten versturen.<br><br>Kies op welke wijze u een gebruikersprofiel wilt maken.</html></translation> + </message> + <message> + <source><html>You can use the profile editor to create a profile. With the profile editor you can change many settings to tune the SIP protocol, RTP and many other things.<br><br>Alternatively you can use the wizard to quickly setup a user profile. The wizard asks you only a few essential settings. If you create a user profile with the wizard you can still edit the full profile with the profile editor at a later time.<br><br></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>You can create a Diamondcard account to make worldwide calls to regular and cell phones and send SMS messages.<br><br></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Choose what method you wish to use.</html></source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -2836,7 +2945,7 @@ Kies eerst een gebruikersprofiel.</translation> </message> <message> <source>User</source> - <translation>Gebruiker</translation> + <translation type="obsolete">Gebruiker</translation> </message> <message> <source>Register</source> @@ -3314,7 +3423,7 @@ Het algoritme om ruis te verminderen is erg simplistisch. Geluid wordt gedigital </message> <message> <source>Default user profiles</source> - <translation>Default gebruikersprofielen</translation> + <translation type="obsolete">Default gebruikersprofielen</translation> </message> <message> <source>If you always use the same profile(s), then you can mark these profiles as default here. The next time you start Twinkle, you will not be asked to select which profiles to run. The default profiles will automatically run.</source> @@ -3727,7 +3836,7 @@ Als voor het beantwoorden van een inkomend gesprek, de microfoon of speaker onbe </message> <message> <source>Type of transfer</source> - <translation>Doorverbindmethode</translation> + <translation type="obsolete">Doorverbindmethode</translation> </message> <message> <source>&Blind transfer</source> diff --git a/src/gui/lang/twinkle_ru.ts b/src/gui/lang/twinkle_ru.ts index e71b60c..bf63c18 100644 --- a/src/gui/lang/twinkle_ru.ts +++ b/src/gui/lang/twinkle_ru.ts @@ -1,5 +1,6 @@ -<!DOCTYPE TS><TS> -<defaultcodec></defaultcodec> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0"> <context> <name>AddressCardForm</name> <message> @@ -72,6 +73,21 @@ </message> </context> <context> + <name>AddressTableModel</name> + <message> + <source>Name</source> + <translation type="unfinished">Имя</translation> + </message> + <message> + <source>Phone</source> + <translation type="unfinished">Телефон</translation> + </message> + <message> + <source>Remark</source> + <translation type="unfinished">Описание</translation> + </message> +</context> +<context> <name>AuthenticationForm</name> <message> <source>Twinkle - Authentication</source> @@ -319,48 +335,12 @@ <context> <name>DiamondcardProfileForm</name> <message> - <source>Twinkle - Diamondcard User Profile</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Your Diamondcard account ID.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>This is just your full name, e.g. John Doe. It is used as a display name. When you make a call, this display name might be shown to the called party.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>&Account ID:</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>&PIN code:</source> - <translation type="unfinished"></translation> - </message> - <message> <source>&Your name:</source> - <translation type="unfinished">&Ваше имя:</translation> - </message> - <message> - <source><p align="center"><u>Sign up for a Diamondcard account</u></p></source> - <translation type="unfinished"></translation> - </message> - <message> - <source>&OK</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Alt+O</source> - <translation type="unfinished"></translation> + <translation type="obsolete">&Ваше имя:</translation> </message> <message> <source>&Cancel</source> - <translation type="unfinished">&Отмена</translation> - </message> - <message> - <source>Alt+C</source> - <translation type="unfinished"></translation> + <translation type="obsolete">&Отмена</translation> </message> <message> <source>Fill in your account ID.</source> @@ -374,15 +354,6 @@ <source>A user profile with name %1 already exists.</source> <translation type="unfinished"></translation> </message> - <message> - <source>Your Diamondcard PIN code.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source><p>With a Diamondcard account you can make worldwide calls to regular and cell phones and send SMS messages. To sign up for a Diamondcard account click on the "sign up" link below. Once you have signed up you receive an account ID and PIN code. Enter the account ID and PIN code below to create a Twinkle user profile for your Diamondcard account.</p> -<p>For call rates see the sign up web page that will be shown to you when you click on the "sign up" link.</p></source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>DtmfForm</name> @@ -471,11 +442,11 @@ <name>FreeDeskSysTray</name> <message> <source>Show/Hide</source> - <translation>Показать/Скрыть</translation> + <translation type="obsolete">Показать/Скрыть</translation> </message> <message> <source>Quit</source> - <translation>Выход</translation> + <translation type="obsolete">Выход</translation> </message> </context> <context> @@ -877,15 +848,15 @@ </message> <message> <source>Name</source> - <translation>Имя</translation> + <translation type="obsolete">Имя</translation> </message> <message> <source>Type</source> - <translation>Тип</translation> + <translation type="obsolete">Тип</translation> </message> <message> <source>Phone</source> - <translation>Телефон</translation> + <translation type="obsolete">Телефон</translation> </message> <message> <source>This list of addresses is taken from <b>KAddressBook</b>. Contacts for which you did not provide a phone number are not shown here. To add, delete or modify address information you have to use KAddressBook.</source> @@ -921,7 +892,7 @@ </message> <message> <source>Remark</source> - <translation>Описание</translation> + <translation type="obsolete">Описание</translation> </message> <message> <source>Contacts in the local address book of Twinkle.</source> @@ -1424,7 +1395,7 @@ With this option you request your SIP provider to hide your identity from the ca </message> <message> <source>Instant message toolbar</source> - <translation>Панель мгновенных сообщений</translation> + <translation type="obsolete">Панель мгновенных сообщений</translation> </message> <message> <source>Send file...</source> @@ -1583,7 +1554,7 @@ With this option you request your SIP provider to hide your identity from the ca </message> <message> <source>Visual indication of line state.</source> - <translation>Наглядное отображение состояния линии.</translation> + <translation type="obsolete">Наглядное отображение состояния линии.</translation> </message> <message> <source>idle</source> @@ -1592,34 +1563,21 @@ With this option you request your SIP provider to hide your identity from the ca </message> <message> <source>Call is on hold</source> - <translation>Звонок на удержании</translation> + <translation type="obsolete">Звонок на удержании</translation> </message> <message> <source>Voice is muted</source> - <translation>Микрофон заглушен</translation> + <translation type="obsolete">Микрофон заглушен</translation> </message> <message> <source>Conference call</source> - <translation>Конференц связь</translation> + <translation type="obsolete">Конференц связь</translation> </message> <message> <source>Transferring call</source> <translation>Передача звонка</translation> </message> <message> - <source><p> -The padlock indicates that your voice is encrypted during transport over the network. -</p> -<h3>SAS - Short Authentication String</h3> -<p> -Both ends of an encrypted voice channel receive the same SAS on the first call. If the SAS is different at each end, your voice channel may be compromised by a man-in-the-middle attack (MitM). -</p> -<p> -If the SAS is equal at both ends, then you should confirm it by clicking this padlock for stronger security of future calls to the same destination. For subsequent calls to the same destination, you don't have to confirm the SAS again. The padlock will show a check symbol when the SAS has been confirmed. -</p></source> - <translation type="unfinished"></translation> - </message> - <message> <source>sas</source> <comment>No need to translate</comment> <translation></translation> @@ -1715,7 +1673,7 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa </message> <message> <source>Call Toolbar</source> - <translation>Панель звонков</translation> + <translation type="obsolete">Панель звонков</translation> </message> <message> <source>Quit</source> @@ -1740,12 +1698,12 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <message> <source>Call</source> <comment>toolbar text</comment> - <translation>Звон</translation> + <translation type="obsolete">Звон</translation> </message> <message> <source>&Call...</source> <comment>call menu text</comment> - <translation>&Звонить...</translation> + <translation type="obsolete">&Звонить...</translation> </message> <message> <source>Call someone</source> @@ -1758,12 +1716,12 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <message> <source>Answer</source> <comment>toolbar text</comment> - <translation>Ответ</translation> + <translation type="obsolete">Ответ</translation> </message> <message> <source>&Answer</source> <comment>menu text</comment> - <translation>&Ответить</translation> + <translation type="obsolete">&Ответить</translation> </message> <message> <source>Answer incoming call</source> @@ -1776,12 +1734,12 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <message> <source>Bye</source> <comment>toolbar text</comment> - <translation>Заверш</translation> + <translation type="obsolete">Заверш</translation> </message> <message> <source>&Bye</source> <comment>menu text</comment> - <translation>&Завершить</translation> + <translation type="obsolete">&Завершить</translation> </message> <message> <source>Release call</source> @@ -1794,12 +1752,12 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <message> <source>Reject</source> <comment>toolbar text</comment> - <translation>Отклон</translation> + <translation type="obsolete">Отклон</translation> </message> <message> <source>&Reject</source> <comment>menu text</comment> - <translation>&Отклонить</translation> + <translation type="obsolete">&Отклонить</translation> </message> <message> <source>Reject incoming call</source> @@ -1812,12 +1770,12 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <message> <source>Hold</source> <comment>toolbar text</comment> - <translation>Удерж</translation> + <translation type="obsolete">Удерж</translation> </message> <message> <source>&Hold</source> <comment>menu text</comment> - <translation>&Удержать</translation> + <translation type="obsolete">&Удержать</translation> </message> <message> <source>Put a call on hold, or retrieve a held call</source> @@ -1826,28 +1784,18 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <message> <source>Redirect</source> <comment>toolbar text</comment> - <translation>Направ</translation> + <translation type="obsolete">Направ</translation> </message> <message> <source>R&edirect...</source> <comment>menu text</comment> - <translation>П&еренаправить...</translation> + <translation type="obsolete">П&еренаправить...</translation> </message> <message> <source>Redirect incoming call without answering</source> <translation>Перенаправить входящий звонок без ответа</translation> </message> <message> - <source>Dtmf</source> - <comment>toolbar text</comment> - <translation></translation> - </message> - <message> - <source>&Dtmf...</source> - <comment>menu text</comment> - <translation></translation> - </message> - <message> <source>Open keypad to enter digits for voice menu's</source> <translation>Открывает панель цифровых клавиш для использования в голосовых меню</translation> </message> @@ -1886,7 +1834,7 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <message> <source>&Terminal capabilities...</source> <comment>menu text</comment> - <translation>&Ограничения терминала...</translation> + <translation type="obsolete">&Ограничения терминала...</translation> </message> <message> <source>Request terminal capabilities from someone</source> @@ -1911,12 +1859,12 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <message> <source>Redial</source> <comment>toolbar text</comment> - <translation>Повт</translation> + <translation type="obsolete">Повт</translation> </message> <message> <source>&Redial</source> <comment>menu text</comment> - <translation>&Повторить</translation> + <translation type="obsolete">&Повторить</translation> </message> <message> <source>Repeat last call</source> @@ -1945,12 +1893,12 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <message> <source>Conf</source> <comment>toolbar text</comment> - <translation>Конф</translation> + <translation type="obsolete">Конф</translation> </message> <message> <source>&Conference</source> <comment>menu text</comment> - <translation>&Конференция</translation> + <translation type="obsolete">&Конференция</translation> </message> <message> <source>Join two calls in a 3-way conference</source> @@ -1959,12 +1907,12 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <message> <source>Mute</source> <comment>toolbar text</comment> - <translation>Вык.Зв</translation> + <translation type="obsolete">Вык.Зв</translation> </message> <message> <source>&Mute</source> <comment>menu text</comment> - <translation>&Выключить звук</translation> + <translation type="obsolete">&Выключить звук</translation> </message> <message> <source>Mute a call</source> @@ -1973,12 +1921,12 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <message> <source>Xfer</source> <comment>toolbar text</comment> - <translation>Перекл</translation> + <translation type="obsolete">Перекл</translation> </message> <message> <source>Trans&fer...</source> <comment>menu text</comment> - <translation>Пере&ключить...</translation> + <translation type="obsolete">Пере&ключить...</translation> </message> <message> <source>Transfer call</source> @@ -2400,6 +2348,94 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <source>Admin center</source> <translation type="unfinished"></translation> </message> + <message> + <source>Call</source> + <translation type="unfinished">Звон</translation> + </message> + <message> + <source>&Answer</source> + <translation type="unfinished">&Ответить</translation> + </message> + <message> + <source>Answer</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&Bye</source> + <translation type="unfinished">&Завершить</translation> + </message> + <message> + <source>Bye</source> + <translation type="unfinished">Заверш</translation> + </message> + <message> + <source>&Reject</source> + <translation type="unfinished">&Отклонить</translation> + </message> + <message> + <source>Reject</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&Hold</source> + <translation type="unfinished">&Удержать</translation> + </message> + <message> + <source>Hold</source> + <translation type="unfinished">Удерж</translation> + </message> + <message> + <source>R&edirect...</source> + <translation type="unfinished">П&еренаправить...</translation> + </message> + <message> + <source>Redirect</source> + <translation type="unfinished">Направ</translation> + </message> + <message> + <source>&Dtmf...</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Dtmf</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&Terminal capabilities...</source> + <translation type="unfinished">&Ограничения терминала...</translation> + </message> + <message> + <source>&Redial</source> + <translation type="unfinished">&Повторить</translation> + </message> + <message> + <source>Redial</source> + <translation type="unfinished">Повт</translation> + </message> + <message> + <source>&Conference</source> + <translation type="unfinished">&Конференция</translation> + </message> + <message> + <source>Conf</source> + <translation type="unfinished">Конф</translation> + </message> + <message> + <source>&Mute</source> + <translation type="unfinished">&Выключить звук</translation> + </message> + <message> + <source>Mute</source> + <translation type="unfinished">Вык.Зв</translation> + </message> + <message> + <source>Trans&fer...</source> + <translation type="unfinished">Пере&ключить...</translation> + </message> + <message> + <source>Xfer</source> + <translation type="unfinished">Перекл</translation> + </message> </context> <context> <name>NumberConversionForm</name> @@ -2570,7 +2606,7 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa </message> <message> <source>User profile</source> - <translation>Профиль пользователя</translation> + <translation type="obsolete">Профиль пользователя</translation> </message> <message> <source>Tick the check boxes of the user profiles that you want to run and press run.</source> @@ -2759,7 +2795,15 @@ Please select a profile.</source> <translation type="unfinished"></translation> </message> <message> - <source><html>You can use the profile editor to create a profile. With the profile editor you can change many settings to tune the SIP protocol, RTP and many other things.<br><br>Alternatively you can use the wizard to quickly setup a user profile. The wizard asks you only a few essential settings. If you create a user profile with the wizard you can still edit the full profile with the profile editor at a later time.<br><br>You can create a Diamondcard account to make worldwide calls to regular and cell phones and send SMS messages.<br><br>Choose what method you wish to use.</html></source> + <source><html>You can use the profile editor to create a profile. With the profile editor you can change many settings to tune the SIP protocol, RTP and many other things.<br><br>Alternatively you can use the wizard to quickly setup a user profile. The wizard asks you only a few essential settings. If you create a user profile with the wizard you can still edit the full profile with the profile editor at a later time.<br><br></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>You can create a Diamondcard account to make worldwide calls to regular and cell phones and send SMS messages.<br><br></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Choose what method you wish to use.</html></source> <translation type="unfinished"></translation> </message> </context> @@ -2808,7 +2852,7 @@ Please select a profile.</source> </message> <message> <source>User</source> - <translation>Пользователь</translation> + <translation type="obsolete">Пользователь</translation> </message> <message> <source>Register</source> @@ -3284,7 +3328,7 @@ If before answering a call, the microphone or speaker appears to be invalid, a w </message> <message> <source>Default user profiles</source> - <translation>Стандартный профиль пользователя</translation> + <translation type="obsolete">Стандартный профиль пользователя</translation> </message> <message> <source>If you always use the same profile(s), then you can mark these profiles as default here. The next time you start Twinkle, you will not be asked to select which profiles to run. The default profiles will automatically run.</source> @@ -3618,7 +3662,7 @@ Depending on your SIP provider the network might provide ring back tone or an an </message> <message> <source>Type of transfer</source> - <translation>Тип переключения</translation> + <translation type="obsolete">Тип переключения</translation> </message> <message> <source>&Blind transfer</source> diff --git a/src/gui/lang/twinkle_sv.ts b/src/gui/lang/twinkle_sv.ts index a63d54d..37a3e64 100644 --- a/src/gui/lang/twinkle_sv.ts +++ b/src/gui/lang/twinkle_sv.ts @@ -1,5 +1,6 @@ -<!DOCTYPE TS><TS> -<defaultcodec></defaultcodec> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0"> <context> <name>AddressCardForm</name> <message> @@ -72,6 +73,21 @@ </message> </context> <context> + <name>AddressTableModel</name> + <message> + <source>Name</source> + <translation type="unfinished">Namn</translation> + </message> + <message> + <source>Phone</source> + <translation type="unfinished">Telefon</translation> + </message> + <message> + <source>Remark</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>AuthenticationForm</name> <message> <source>Twinkle - Authentication</source> @@ -319,48 +335,20 @@ <context> <name>DiamondcardProfileForm</name> <message> - <source>Twinkle - Diamondcard User Profile</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Your Diamondcard account ID.</source> - <translation type="unfinished"></translation> - </message> - <message> <source>This is just your full name, e.g. John Doe. It is used as a display name. When you make a call, this display name might be shown to the called party.</source> - <translation type="unfinished">Detta är helt enkelt ditt fullständiga namn, t.ex. Sven Svensson. Det används endast för visning. När du ringer ett samtal kan dock detta namn visas för motparten.</translation> - </message> - <message> - <source>&Account ID:</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>&PIN code:</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Detta är helt enkelt ditt fullständiga namn, t.ex. Sven Svensson. Det används endast för visning. När du ringer ett samtal kan dock detta namn visas för motparten.</translation> </message> <message> <source>&Your name:</source> - <translation type="unfinished">&Ditt namn:</translation> - </message> - <message> - <source><p align="center"><u>Sign up for a Diamondcard account</u></p></source> - <translation type="unfinished"></translation> + <translation type="obsolete">&Ditt namn:</translation> </message> <message> <source>&OK</source> - <translation type="unfinished">&OK</translation> - </message> - <message> - <source>Alt+O</source> - <translation type="unfinished"></translation> + <translation type="obsolete">&OK</translation> </message> <message> <source>&Cancel</source> - <translation type="unfinished">&Avbryt</translation> - </message> - <message> - <source>Alt+C</source> - <translation type="unfinished"></translation> + <translation type="obsolete">&Avbryt</translation> </message> <message> <source>Fill in your account ID.</source> @@ -374,15 +362,6 @@ <source>A user profile with name %1 already exists.</source> <translation type="unfinished"></translation> </message> - <message> - <source>Your Diamondcard PIN code.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source><p>With a Diamondcard account you can make worldwide calls to regular and cell phones and send SMS messages. To sign up for a Diamondcard account click on the "sign up" link below. Once you have signed up you receive an account ID and PIN code. Enter the account ID and PIN code below to create a Twinkle user profile for your Diamondcard account.</p> -<p>For call rates see the sign up web page that will be shown to you when you click on the "sign up" link.</p></source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>DtmfForm</name> @@ -471,11 +450,11 @@ <name>FreeDeskSysTray</name> <message> <source>Show/Hide</source> - <translation>Visa/Göm</translation> + <translation type="obsolete">Visa/Göm</translation> </message> <message> <source>Quit</source> - <translation>Avsluta</translation> + <translation type="obsolete">Avsluta</translation> </message> </context> <context> @@ -881,15 +860,15 @@ </message> <message> <source>Name</source> - <translation>Namn</translation> + <translation type="obsolete">Namn</translation> </message> <message> <source>Type</source> - <translation>Typ</translation> + <translation type="obsolete">Typ</translation> </message> <message> <source>Phone</source> - <translation>Telefon</translation> + <translation type="obsolete">Telefon</translation> </message> <message> <source>This list of addresses is taken from <b>KAddressBook</b>. Contacts for which you did not provide a phone number are not shown here. To add, delete or modify address information you have to use KAddressBook.</source> @@ -924,10 +903,6 @@ <translation>&Lokal adressbok</translation> </message> <message> - <source>Remark</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Contacts in the local address book of Twinkle.</source> <translation>Kontakter i den lokala adressboken för Twinkle.</translation> </message> @@ -1420,7 +1395,7 @@ Med denna inställning kan du be din SIP-leverantör dölja din identitet för d </message> <message> <source>Instant message toolbar</source> - <translation>Verktygsrad för snabbmeddelanden</translation> + <translation type="obsolete">Verktygsrad för snabbmeddelanden</translation> </message> <message> <source>Send file...</source> @@ -1574,44 +1549,19 @@ Med denna inställning kan du be din SIP-leverantör dölja din identitet för d <translation>Ämne:</translation> </message> <message> - <source>Visual indication of line state.</source> - <translation type="unfinished"></translation> - </message> - <message> <source>idle</source> <comment>No need to translate</comment> <translation>Overksam</translation> </message> <message> - <source>Call is on hold</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Voice is muted</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Conference call</source> - <translation>Konferenssamtal</translation> + <translation type="obsolete">Konferenssamtal</translation> </message> <message> <source>Transferring call</source> <translation type="unfinished"></translation> </message> <message> - <source><p> -The padlock indicates that your voice is encrypted during transport over the network. -</p> -<h3>SAS - Short Authentication String</h3> -<p> -Both ends of an encrypted voice channel receive the same SAS on the first call. If the SAS is different at each end, your voice channel may be compromised by a man-in-the-middle attack (MitM). -</p> -<p> -If the SAS is equal at both ends, then you should confirm it by clicking this padlock for stronger security of future calls to the same destination. For subsequent calls to the same destination, you don't have to confirm the SAS again. The padlock will show a check symbol when the SAS has been confirmed. -</p></source> - <translation type="unfinished"></translation> - </message> - <message> <source>sas</source> <comment>No need to translate</comment> <translation>sas</translation> @@ -1702,10 +1652,6 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <translation>&Hjälp</translation> </message> <message> - <source>Call Toolbar</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Quit</source> <translation>Avsluta</translation> </message> @@ -1728,12 +1674,12 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <message> <source>Call</source> <comment>toolbar text</comment> - <translation>Ring</translation> + <translation type="obsolete">Ring</translation> </message> <message> <source>&Call...</source> <comment>call menu text</comment> - <translation>&Ring...</translation> + <translation type="obsolete">&Ring...</translation> </message> <message> <source>Call someone</source> @@ -1746,12 +1692,12 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <message> <source>Answer</source> <comment>toolbar text</comment> - <translation>Svara</translation> + <translation type="obsolete">Svara</translation> </message> <message> <source>&Answer</source> <comment>menu text</comment> - <translation>&Svara</translation> + <translation type="obsolete">&Svara</translation> </message> <message> <source>Answer incoming call</source> @@ -1764,12 +1710,12 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <message> <source>Bye</source> <comment>toolbar text</comment> - <translation>Adjö</translation> + <translation type="obsolete">Adjö</translation> </message> <message> <source>&Bye</source> <comment>menu text</comment> - <translation>&Lägg på</translation> + <translation type="obsolete">&Lägg på</translation> </message> <message> <source>Release call</source> @@ -1782,12 +1728,12 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <message> <source>Reject</source> <comment>toolbar text</comment> - <translation>Avvisa</translation> + <translation type="obsolete">Avvisa</translation> </message> <message> <source>&Reject</source> <comment>menu text</comment> - <translation>&Avvisa</translation> + <translation type="obsolete">&Avvisa</translation> </message> <message> <source>Reject incoming call</source> @@ -1798,14 +1744,9 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <translation>F8</translation> </message> <message> - <source>Hold</source> - <comment>toolbar text</comment> - <translation type="unfinished"></translation> - </message> - <message> <source>&Hold</source> <comment>menu text</comment> - <translation>&Parkera</translation> + <translation type="obsolete">&Parkera</translation> </message> <message> <source>Put a call on hold, or retrieve a held call</source> @@ -1814,12 +1755,12 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <message> <source>Redirect</source> <comment>toolbar text</comment> - <translation>Koppla vidare</translation> + <translation type="obsolete">Koppla vidare</translation> </message> <message> <source>R&edirect...</source> <comment>menu text</comment> - <translation>Koppla vidar&e...</translation> + <translation type="obsolete">Koppla vidar&e...</translation> </message> <message> <source>Redirect incoming call without answering</source> @@ -1828,12 +1769,12 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <message> <source>Dtmf</source> <comment>toolbar text</comment> - <translation>Dtmf</translation> + <translation type="obsolete">Dtmf</translation> </message> <message> <source>&Dtmf...</source> <comment>menu text</comment> - <translation>&Dtmf...</translation> + <translation type="obsolete">&Dtmf...</translation> </message> <message> <source>Open keypad to enter digits for voice menu's</source> @@ -1874,7 +1815,7 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <message> <source>&Terminal capabilities...</source> <comment>menu text</comment> - <translation>&Terminalförmågor...</translation> + <translation type="obsolete">&Terminalförmågor...</translation> </message> <message> <source>Request terminal capabilities from someone</source> @@ -1899,12 +1840,12 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <message> <source>Redial</source> <comment>toolbar text</comment> - <translation>Ring igen</translation> + <translation type="obsolete">Ring igen</translation> </message> <message> <source>&Redial</source> <comment>menu text</comment> - <translation>Ring &igen</translation> + <translation type="obsolete">Ring &igen</translation> </message> <message> <source>Repeat last call</source> @@ -1933,12 +1874,12 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <message> <source>Conf</source> <comment>toolbar text</comment> - <translation>Konf</translation> + <translation type="obsolete">Konf</translation> </message> <message> <source>&Conference</source> <comment>menu text</comment> - <translation>&Konferens</translation> + <translation type="obsolete">&Konferens</translation> </message> <message> <source>Join two calls in a 3-way conference</source> @@ -1947,12 +1888,12 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <message> <source>Mute</source> <comment>toolbar text</comment> - <translation>Tyst</translation> + <translation type="obsolete">Tyst</translation> </message> <message> <source>&Mute</source> <comment>menu text</comment> - <translation>&Tyst</translation> + <translation type="obsolete">&Tyst</translation> </message> <message> <source>Mute a call</source> @@ -1961,12 +1902,12 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <message> <source>Xfer</source> <comment>toolbar text</comment> - <translation>Koppla</translation> + <translation type="obsolete">Koppla</translation> </message> <message> <source>Trans&fer...</source> <comment>menu text</comment> - <translation>Kopp&la...</translation> + <translation type="obsolete">Kopp&la...</translation> </message> <message> <source>Transfer call</source> @@ -2404,6 +2345,94 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <source>Admin center</source> <translation type="unfinished"></translation> </message> + <message> + <source>Call</source> + <translation type="unfinished">Ring</translation> + </message> + <message> + <source>&Answer</source> + <translation type="unfinished">&Svara</translation> + </message> + <message> + <source>Answer</source> + <translation type="unfinished">Svara</translation> + </message> + <message> + <source>&Bye</source> + <translation type="unfinished">&Lägg på</translation> + </message> + <message> + <source>Bye</source> + <translation type="unfinished">Adjö</translation> + </message> + <message> + <source>&Reject</source> + <translation type="unfinished">&Avvisa</translation> + </message> + <message> + <source>Reject</source> + <translation type="unfinished">Avvisa</translation> + </message> + <message> + <source>&Hold</source> + <translation type="unfinished">&Parkera</translation> + </message> + <message> + <source>Hold</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>R&edirect...</source> + <translation type="unfinished">Koppla vidar&e...</translation> + </message> + <message> + <source>Redirect</source> + <translation type="unfinished">Koppla vidare</translation> + </message> + <message> + <source>&Dtmf...</source> + <translation type="unfinished">&Dtmf...</translation> + </message> + <message> + <source>Dtmf</source> + <translation type="unfinished">Dtmf</translation> + </message> + <message> + <source>&Terminal capabilities...</source> + <translation type="unfinished">&Terminalförmågor...</translation> + </message> + <message> + <source>&Redial</source> + <translation type="unfinished">Ring &igen</translation> + </message> + <message> + <source>Redial</source> + <translation type="unfinished">Ring igen</translation> + </message> + <message> + <source>&Conference</source> + <translation type="unfinished">&Konferens</translation> + </message> + <message> + <source>Conf</source> + <translation type="unfinished">Konf</translation> + </message> + <message> + <source>&Mute</source> + <translation type="unfinished">&Tyst</translation> + </message> + <message> + <source>Mute</source> + <translation type="unfinished">Tyst</translation> + </message> + <message> + <source>Trans&fer...</source> + <translation type="unfinished">Kopp&la...</translation> + </message> + <message> + <source>Xfer</source> + <translation type="unfinished">Koppla</translation> + </message> </context> <context> <name>NumberConversionForm</name> @@ -2574,7 +2603,7 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa </message> <message> <source>User profile</source> - <translation>Användarprofil</translation> + <translation type="obsolete">Användarprofil</translation> </message> <message> <source>Tick the check boxes of the user profiles that you want to run and press run.</source> @@ -2763,7 +2792,15 @@ Välj en profil.</translation> <translation type="unfinished"></translation> </message> <message> - <source><html>You can use the profile editor to create a profile. With the profile editor you can change many settings to tune the SIP protocol, RTP and many other things.<br><br>Alternatively you can use the wizard to quickly setup a user profile. The wizard asks you only a few essential settings. If you create a user profile with the wizard you can still edit the full profile with the profile editor at a later time.<br><br>You can create a Diamondcard account to make worldwide calls to regular and cell phones and send SMS messages.<br><br>Choose what method you wish to use.</html></source> + <source><html>You can use the profile editor to create a profile. With the profile editor you can change many settings to tune the SIP protocol, RTP and many other things.<br><br>Alternatively you can use the wizard to quickly setup a user profile. The wizard asks you only a few essential settings. If you create a user profile with the wizard you can still edit the full profile with the profile editor at a later time.<br><br></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>You can create a Diamondcard account to make worldwide calls to regular and cell phones and send SMS messages.<br><br></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Choose what method you wish to use.</html></source> <translation type="unfinished"></translation> </message> </context> @@ -2812,7 +2849,7 @@ Välj en profil.</translation> </message> <message> <source>User</source> - <translation>Användare</translation> + <translation type="obsolete">Användare</translation> </message> <message> <source>Register</source> @@ -3292,7 +3329,7 @@ If before answering a call, the microphone or speaker appears to be invalid, a w </message> <message> <source>Default user profiles</source> - <translation>Användarprofiler som standard</translation> + <translation type="obsolete">Användarprofiler som standard</translation> </message> <message> <source>If you always use the same profile(s), then you can mark these profiles as default here. The next time you start Twinkle, you will not be asked to select which profiles to run. The default profiles will automatically run.</source> @@ -3626,7 +3663,7 @@ Depending on your SIP provider the network might provide ring back tone or an an </message> <message> <source>Type of transfer</source> - <translation>Typ av koppling</translation> + <translation type="obsolete">Typ av koppling</translation> </message> <message> <source>&Blind transfer</source> diff --git a/src/gui/lang/twinkle_xx.ts b/src/gui/lang/twinkle_xx.ts index 6f2ade3..1c2174f 100644 --- a/src/gui/lang/twinkle_xx.ts +++ b/src/gui/lang/twinkle_xx.ts @@ -1,4 +1,6 @@ -<!DOCTYPE TS><TS> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0"> <context> <name>AddressCardForm</name> <message> @@ -71,6 +73,21 @@ </message> </context> <context> + <name>AddressTableModel</name> + <message> + <source>Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Phone</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Remark</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>AuthenticationForm</name> <message> <source>Twinkle - Authentication</source> @@ -318,50 +335,6 @@ <context> <name>DiamondcardProfileForm</name> <message> - <source>Twinkle - Diamondcard User Profile</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Your Diamondcard account ID.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>This is just your full name, e.g. John Doe. It is used as a display name. When you make a call, this display name might be shown to the called party.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>&Account ID:</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>&PIN code:</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>&Your name:</source> - <translation type="unfinished"></translation> - </message> - <message> - <source><p align="center"><u>Sign up for a Diamondcard account</u></p></source> - <translation type="unfinished"></translation> - </message> - <message> - <source>&OK</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Alt+O</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>&Cancel</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Alt+C</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Fill in your account ID.</source> <translation type="unfinished"></translation> </message> @@ -373,15 +346,6 @@ <source>A user profile with name %1 already exists.</source> <translation type="unfinished"></translation> </message> - <message> - <source>Your Diamondcard PIN code.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source><p>With a Diamondcard account you can make worldwide calls to regular and cell phones and send SMS messages. To sign up for a Diamondcard account click on the "sign up" link below. Once you have signed up you receive an account ID and PIN code. Enter the account ID and PIN code below to create a Twinkle user profile for your Diamondcard account.</p> -<p>For call rates see the sign up web page that will be shown to you when you click on the "sign up" link.</p></source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>DtmfForm</name> @@ -467,17 +431,6 @@ </message> </context> <context> - <name>FreeDeskSysTray</name> - <message> - <source>Show/Hide</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Quit</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>GUI</name> <message> <source>Failed to create a %1 socket (SIP) on port %2</source> @@ -875,18 +828,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Name</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Type</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Phone</source> - <translation type="unfinished"></translation> - </message> - <message> <source>This list of addresses is taken from <b>KAddressBook</b>. Contacts for which you did not provide a phone number are not shown here. To add, delete or modify address information you have to use KAddressBook.</source> <translation type="unfinished"></translation> </message> @@ -919,10 +860,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Remark</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Contacts in the local address book of Twinkle.</source> <translation type="unfinished"></translation> </message> @@ -1406,10 +1343,6 @@ With this option you request your SIP provider to hide your identity from the ca <translation type="unfinished"></translation> </message> <message> - <source>Instant message toolbar</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Send file...</source> <translation type="unfinished"></translation> </message> @@ -1565,44 +1498,15 @@ With this option you request your SIP provider to hide your identity from the ca <translation type="unfinished"></translation> </message> <message> - <source>Visual indication of line state.</source> - <translation type="unfinished"></translation> - </message> - <message> <source>idle</source> <comment>No need to translate</comment> <translation type="unfinished"></translation> </message> <message> - <source>Call is on hold</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Voice is muted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Conference call</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Transferring call</source> <translation type="unfinished"></translation> </message> <message> - <source><p> -The padlock indicates that your voice is encrypted during transport over the network. -</p> -<h3>SAS - Short Authentication String</h3> -<p> -Both ends of an encrypted voice channel receive the same SAS on the first call. If the SAS is different at each end, your voice channel may be compromised by a man-in-the-middle attack (MitM). -</p> -<p> -If the SAS is equal at both ends, then you should confirm it by clicking this padlock for stronger security of future calls to the same destination. For subsequent calls to the same destination, you don't have to confirm the SAS again. The padlock will show a check symbol when the SAS has been confirmed. -</p></source> - <translation type="unfinished"></translation> - </message> - <message> <source>sas</source> <comment>No need to translate</comment> <translation type="unfinished"></translation> @@ -1697,10 +1601,6 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <translation type="unfinished"></translation> </message> <message> - <source>Call Toolbar</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Quit</source> <translation type="unfinished"></translation> </message> @@ -1721,16 +1621,6 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <translation type="unfinished"></translation> </message> <message> - <source>Call</source> - <comment>toolbar text</comment> - <translation type="unfinished"></translation> - </message> - <message> - <source>&Call...</source> - <comment>call menu text</comment> - <translation type="unfinished"></translation> - </message> - <message> <source>Call someone</source> <translation type="unfinished"></translation> </message> @@ -1739,16 +1629,6 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <translation type="unfinished"></translation> </message> <message> - <source>Answer</source> - <comment>toolbar text</comment> - <translation type="unfinished"></translation> - </message> - <message> - <source>&Answer</source> - <comment>menu text</comment> - <translation type="unfinished"></translation> - </message> - <message> <source>Answer incoming call</source> <translation type="unfinished"></translation> </message> @@ -1757,16 +1637,6 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <translation type="unfinished"></translation> </message> <message> - <source>Bye</source> - <comment>toolbar text</comment> - <translation type="unfinished"></translation> - </message> - <message> - <source>&Bye</source> - <comment>menu text</comment> - <translation type="unfinished"></translation> - </message> - <message> <source>Release call</source> <translation type="unfinished"></translation> </message> @@ -1775,16 +1645,6 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <translation type="unfinished"></translation> </message> <message> - <source>Reject</source> - <comment>toolbar text</comment> - <translation type="unfinished"></translation> - </message> - <message> - <source>&Reject</source> - <comment>menu text</comment> - <translation type="unfinished"></translation> - </message> - <message> <source>Reject incoming call</source> <translation type="unfinished"></translation> </message> @@ -1793,44 +1653,14 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <translation type="unfinished"></translation> </message> <message> - <source>Hold</source> - <comment>toolbar text</comment> - <translation type="unfinished"></translation> - </message> - <message> - <source>&Hold</source> - <comment>menu text</comment> - <translation type="unfinished"></translation> - </message> - <message> <source>Put a call on hold, or retrieve a held call</source> <translation type="unfinished"></translation> </message> <message> - <source>Redirect</source> - <comment>toolbar text</comment> - <translation type="unfinished"></translation> - </message> - <message> - <source>R&edirect...</source> - <comment>menu text</comment> - <translation type="unfinished"></translation> - </message> - <message> <source>Redirect incoming call without answering</source> <translation type="unfinished"></translation> </message> <message> - <source>Dtmf</source> - <comment>toolbar text</comment> - <translation type="unfinished"></translation> - </message> - <message> - <source>&Dtmf...</source> - <comment>menu text</comment> - <translation type="unfinished"></translation> - </message> - <message> <source>Open keypad to enter digits for voice menu's</source> <translation type="unfinished"></translation> </message> @@ -1867,11 +1697,6 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <translation type="unfinished"></translation> </message> <message> - <source>&Terminal capabilities...</source> - <comment>menu text</comment> - <translation type="unfinished"></translation> - </message> - <message> <source>Request terminal capabilities from someone</source> <translation type="unfinished"></translation> </message> @@ -1892,16 +1717,6 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <translation type="unfinished"></translation> </message> <message> - <source>Redial</source> - <comment>toolbar text</comment> - <translation type="unfinished"></translation> - </message> - <message> - <source>&Redial</source> - <comment>menu text</comment> - <translation type="unfinished"></translation> - </message> - <message> <source>Repeat last call</source> <translation type="unfinished"></translation> </message> @@ -1926,44 +1741,14 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <translation type="unfinished"></translation> </message> <message> - <source>Conf</source> - <comment>toolbar text</comment> - <translation type="unfinished"></translation> - </message> - <message> - <source>&Conference</source> - <comment>menu text</comment> - <translation type="unfinished"></translation> - </message> - <message> <source>Join two calls in a 3-way conference</source> <translation type="unfinished"></translation> </message> <message> - <source>Mute</source> - <comment>toolbar text</comment> - <translation type="unfinished"></translation> - </message> - <message> - <source>&Mute</source> - <comment>menu text</comment> - <translation type="unfinished"></translation> - </message> - <message> <source>Mute a call</source> <translation type="unfinished"></translation> </message> <message> - <source>Xfer</source> - <comment>toolbar text</comment> - <translation type="unfinished"></translation> - </message> - <message> - <source>Trans&fer...</source> - <comment>menu text</comment> - <translation type="unfinished"></translation> - </message> - <message> <source>Transfer call</source> <translation type="unfinished"></translation> </message> @@ -2383,6 +2168,94 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <source>Admin center</source> <translation type="unfinished"></translation> </message> + <message> + <source>Call</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&Answer</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Answer</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&Bye</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Bye</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&Reject</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Reject</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&Hold</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Hold</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>R&edirect...</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Redirect</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&Dtmf...</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Dtmf</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&Terminal capabilities...</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&Redial</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Redial</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&Conference</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Conf</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&Mute</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Mute</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Trans&fer...</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Xfer</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>NumberConversionForm</name> @@ -2552,10 +2425,6 @@ If the SAS is equal at both ends, then you should confirm it by clicking this pa <translation type="unfinished"></translation> </message> <message> - <source>User profile</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Tick the check boxes of the user profiles that you want to run and press run.</source> <translation type="unfinished"></translation> </message> @@ -2733,7 +2602,15 @@ Please select a profile.</source> <translation type="unfinished"></translation> </message> <message> - <source><html>You can use the profile editor to create a profile. With the profile editor you can change many settings to tune the SIP protocol, RTP and many other things.<br><br>Alternatively you can use the wizard to quickly setup a user profile. The wizard asks you only a few essential settings. If you create a user profile with the wizard you can still edit the full profile with the profile editor at a later time.<br><br>You can create a Diamondcard account to make worldwide calls to regular and cell phones and send SMS messages.<br><br>Choose what method you wish to use.</html></source> + <source><html>You can use the profile editor to create a profile. With the profile editor you can change many settings to tune the SIP protocol, RTP and many other things.<br><br>Alternatively you can use the wizard to quickly setup a user profile. The wizard asks you only a few essential settings. If you create a user profile with the wizard you can still edit the full profile with the profile editor at a later time.<br><br></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>You can create a Diamondcard account to make worldwide calls to regular and cell phones and send SMS messages.<br><br></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Choose what method you wish to use.</html></source> <translation type="unfinished"></translation> </message> </context> @@ -2781,10 +2658,6 @@ Please select a profile.</source> <translation type="unfinished"></translation> </message> <message> - <source>User</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Register</source> <translation type="unfinished"></translation> </message> @@ -3253,10 +3126,6 @@ If before answering a call, the microphone or speaker appears to be invalid, a w <translation type="unfinished"></translation> </message> <message> - <source>Default user profiles</source> - <translation type="unfinished"></translation> - </message> - <message> <source>If you always use the same profile(s), then you can mark these profiles as default here. The next time you start Twinkle, you will not be asked to select which profiles to run. The default profiles will automatically run.</source> <translation type="unfinished"></translation> </message> @@ -3577,10 +3446,6 @@ Depending on your SIP provider the network might provide ring back tone or an an <translation type="unfinished"></translation> </message> <message> - <source>Type of transfer</source> - <translation type="unfinished"></translation> - </message> - <message> <source>&Blind transfer</source> <translation type="unfinished"></translation> </message> diff --git a/src/gui/main.cpp b/src/gui/main.cpp index a43c9bb..ff8ec00 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -17,6 +17,7 @@ */ #include "twinkle_config.h" +#include <QtDebug> #ifdef HAVE_KDE #include <kapplication.h> @@ -25,7 +26,6 @@ #include <qapplication.h> #include <qtranslator.h> -#include <qmime.h> #include <qtextcodec.h> #include "mphoneform.h" @@ -507,8 +507,10 @@ QApplication *create_user_interface(bool cli_mode, int argc, char **argv, QTrans qa = new t_twinkle_application(tmp, argv); MEMMAN_NEW(qa); #endif +#if QT_VERSION < 0x050000 // In Qt5, these functions are removed. UTF-8 is the default. QTextCodec::setCodecForCStrings(QTextCodec::codecForName("utf8")); QTextCodec::setCodecForTr(QTextCodec::codecForName("utf8")); +#endif // Install Qt translator // Do not report to memman as the translator will be deleted @@ -533,6 +535,37 @@ QApplication *create_user_interface(bool cli_mode, int argc, char **argv, QTrans return qa; } +void blockSignals() +{ + // Dedicated thread will catch SIGALRM, SIGINT, SIGTERM, SIGCHLD signals, + // therefore all threads must block these signals. Block now, then all + // created threads will inherit the signal mask. + // In LinuxThreads the sigwait does not work very well, so + // in LinuxThreads a signal handler is used instead. + + if (!threading_is_LinuxThreads) { + sigset_t sigset; + sigemptyset(&sigset); + sigaddset(&sigset, SIGALRM); + sigaddset(&sigset, SIGINT); + sigaddset(&sigset, SIGTERM); + sigaddset(&sigset, SIGCHLD); + sigprocmask(SIG_BLOCK, &sigset, NULL); + } else { + if (!phone->set_sighandler()) { + string msg = "Failed to register signal handler."; + log_file->write_report(msg, "::main", LOG_NORMAL, LOG_CRITICAL); + ui->cb_show_msg(msg, MSG_CRITICAL); + sys_config->delete_lock_file(); + exit(1); + } + } + + // Ignore SIGPIPE so read from broken sockets will not cause + // the process to terminate. + (void)signal(SIGPIPE, SIG_IGN); +} + int main( int argc, char ** argv ) { string error_msg; @@ -546,6 +579,8 @@ int main( int argc, char ** argv ) // Determine threading implementation threading_is_LinuxThreads = t_thread::is_LinuxThreads(); + blockSignals(); + QApplication *qa = NULL; QTranslator *qtranslator = NULL; @@ -913,33 +948,6 @@ int main( int argc, char ** argv ) log_msg += "\n"; log_file->write_report(log_msg, "::main", LOG_NORMAL, LOG_WARNING); } - - // Dedicated thread will catch SIGALRM, SIGINT, SIGTERM, SIGCHLD signals, - // therefore all threads must block these signals. Block now, then all - // created threads will inherit the signal mask. - // In LinuxThreads the sigwait does not work very well, so - // in LinuxThreads a signal handler is used instead. - if (!threading_is_LinuxThreads) { - sigset_t sigset; - sigemptyset(&sigset); - sigaddset(&sigset, SIGALRM); - sigaddset(&sigset, SIGINT); - sigaddset(&sigset, SIGTERM); - sigaddset(&sigset, SIGCHLD); - sigprocmask(SIG_BLOCK, &sigset, NULL); - } else { - if (!phone->set_sighandler()) { - string msg = "Failed to register signal handler."; - log_file->write_report(msg, "::main", LOG_NORMAL, LOG_CRITICAL); - ui->cb_show_msg(msg, MSG_CRITICAL); - sys_config->delete_lock_file(); - exit(1); - } - } - - // Ignore SIGPIPE so read from broken sockets will not cause - // the process to terminate. - (void)signal(SIGPIPE, SIG_IGN); // Create threads t_thread *thr_sender; diff --git a/src/gui/messageform.cpp b/src/gui/messageform.cpp index f4afec8..02c7a0e 100644 --- a/src/gui/messageform.cpp +++ b/src/gui/messageform.cpp @@ -318,7 +318,11 @@ void MessageForm::addMessage(const im::t_msg &msg, const QString &name) // Timestamp and name of sender if (msg.direction == im::MSG_DIR_IN) s += "<font color=\"blue\">"; s += time2str(msg.timestamp, "%H:%M:%S ").c_str(); +#if QT_VERSION >= 0x050000 + s += name.toHtmlEscaped(); +#else s += Qt::escape(name); +#endif if (msg.direction == im::MSG_DIR_IN) s += "</font>"; s += "</b>"; @@ -337,7 +341,11 @@ void MessageForm::addMessage(const im::t_msg &msg, const QString &name) if (msg.format == im::TXT_HTML) { s += msg.message.c_str(); } else { +#if QT_VERSION >= 0x050000 + s += QString::fromStdString(msg.message).toHtmlEscaped(); +#else s += Qt::escape(msg.message.c_str()); +#endif } } @@ -428,7 +436,11 @@ void MessageForm::displayError(const QString &errorMsg) s += "<b>"; s += tr("Delivery failure"); s += ": </b>"; +#if QT_VERSION >= 0x050000 + s += errorMsg.toHtmlEscaped(); +#else s += Qt::escape(errorMsg); +#endif s += "</font>"; conversationBrowser->append(s); @@ -440,7 +452,11 @@ void MessageForm::displayDeliveryNotification(const QString ¬ification) s += "<b>"; s += tr("Delivery notification"); s += ": </b>"; +#if QT_VERSION >= 0x050000 + s += notification.toHtmlEscaped(); +#else s += Qt::escape(notification); +#endif s += "</font>"; conversationBrowser->append(s); @@ -454,7 +470,7 @@ void MessageForm::setRemotePartyCaption(void) { remote_party.display, remote_party.url).c_str()); } -void MessageForm::showAttachmentPopupMenu(const QString &attachment) { +void MessageForm::showAttachmentPopupMenu(const QUrl &attachment) { #ifdef HAVE_KDE vector<KService::Ptr> *serviceMap = (vector<KService::Ptr> *)_serviceMap; @@ -471,7 +487,7 @@ void MessageForm::showAttachmentPopupMenu(const QString &attachment) { // Store attachment. When the user selects an attachment we still // know which attachment was clicked. - clickedAttachment = attachment; + clickedAttachment = attachment.toLocalFile(); attachmentPopupMenu->clear(); diff --git a/src/gui/messageform.h b/src/gui/messageform.h index b95da81..6ebf05b 100644 --- a/src/gui/messageform.h +++ b/src/gui/messageform.h @@ -1,10 +1,9 @@ #ifndef MESSAGEFORM_H #define MESSAGEFORM_H -#include <textbrowsernoautolink.h> #include "getaddressform.h" #include "im/msg_session.h" #include "phone.h" -#include <QtGui/QLabel> +#include <QLabel> #include <QtCore/QStringRef> #include "textbrowsernoautolink.h" #include "user.h" @@ -38,7 +37,7 @@ public slots: virtual void displayError( const QString & errorMsg ); virtual void displayDeliveryNotification( const QString & notification ); virtual void setRemotePartyCaption( void ); - virtual void showAttachmentPopupMenu( const QString & attachment ); + virtual void showAttachmentPopupMenu( const QUrl & attachment ); virtual void attachmentPopupActivated( QAction* action ); virtual void saveAttachment(); virtual void chooseFileToSend(); diff --git a/src/gui/messageform.ui b/src/gui/messageform.ui index 9893980..a35bb69 100644 --- a/src/gui/messageform.ui +++ b/src/gui/messageform.ui @@ -194,13 +194,13 @@ </connection> <connection> <sender>conversationBrowser</sender> - <signal>linkClicked(QString)</signal> + <signal>anchorClicked(QUrl)</signal> <receiver>MessageForm</receiver> - <slot>showAttachmentPopupMenu(QString)</slot> + <slot>showAttachmentPopupMenu(QUrl)</slot> </connection> <connection> <sender>sendFileAction</sender> - <signal>activated()</signal> + <signal>triggered()</signal> <receiver>MessageForm</receiver> <slot>chooseFileToSend()</slot> </connection> diff --git a/src/gui/mphoneform.cpp b/src/gui/mphoneform.cpp index f4b4392..7726a41 100644 --- a/src/gui/mphoneform.cpp +++ b/src/gui/mphoneform.cpp @@ -1420,12 +1420,12 @@ void MphoneForm::updateMenuStatus() } else { serviceDnd->setChecked(false); serviceDnd->setCheckable(false); - connect(serviceDnd, SIGNAL(activated()), + connect(serviceDnd, SIGNAL(triggered()), this, SLOT(srvDnd())); serviceAutoAnswer->setChecked(false); serviceAutoAnswer->setCheckable(false); - connect(serviceAutoAnswer, SIGNAL(activated()), + connect(serviceAutoAnswer, SIGNAL(triggered()), this, SLOT(srvAutoAnswer())); } diff --git a/src/gui/mphoneform.ui b/src/gui/mphoneform.ui index 45f4ded..79ceb61 100644 --- a/src/gui/mphoneform.ui +++ b/src/gui/mphoneform.ui @@ -1861,7 +1861,7 @@ <connections> <connection> <sender>helpWhats_ThisAction</sender> - <signal>activated()</signal> + <signal>triggered()</signal> <receiver>MphoneForm</receiver> <slot>whatsThis()</slot> <hints> @@ -1909,7 +1909,7 @@ </connection> <connection> <sender>fileChangeUserAction</sender> - <signal>activated()</signal> + <signal>triggered()</signal> <receiver>MphoneForm</receiver> <slot>selectProfile()</slot> <hints> @@ -1925,7 +1925,7 @@ </connection> <connection> <sender>viewCall_HistoryAction</sender> - <signal>activated()</signal> + <signal>triggered()</signal> <receiver>MphoneForm</receiver> <slot>viewHistory()</slot> <hints> @@ -1941,7 +1941,7 @@ </connection> <connection> <sender>viewLogAction</sender> - <signal>activated()</signal> + <signal>triggered()</signal> <receiver>MphoneForm</receiver> <slot>viewLog()</slot> <hints> @@ -1957,7 +1957,7 @@ </connection> <connection> <sender>regDeregisterAll</sender> - <signal>activated()</signal> + <signal>triggered()</signal> <receiver>MphoneForm</receiver> <slot>phoneDeregisterAll()</slot> <hints> @@ -1973,7 +1973,7 @@ </connection> <connection> <sender>editSysSettingsAction</sender> - <signal>activated()</signal> + <signal>triggered()</signal> <receiver>MphoneForm</receiver> <slot>editSysSettings()</slot> <hints> @@ -2005,7 +2005,7 @@ </connection> <connection> <sender>callConference</sender> - <signal>activated()</signal> + <signal>triggered()</signal> <receiver>MphoneForm</receiver> <slot>phoneConference()</slot> <hints> @@ -2021,7 +2021,7 @@ </connection> <connection> <sender>editUserProfileAction</sender> - <signal>activated()</signal> + <signal>triggered()</signal> <receiver>MphoneForm</receiver> <slot>editUserProfile()</slot> <hints> @@ -2037,7 +2037,7 @@ </connection> <connection> <sender>helpAboutQtAction</sender> - <signal>activated()</signal> + <signal>triggered()</signal> <receiver>MphoneForm</receiver> <slot>aboutQt()</slot> <hints> @@ -2053,7 +2053,7 @@ </connection> <connection> <sender>helpAboutAction</sender> - <signal>activated()</signal> + <signal>triggered()</signal> <receiver>MphoneForm</receiver> <slot>about()</slot> <hints> @@ -2069,7 +2069,7 @@ </connection> <connection> <sender>callRedial</sender> - <signal>activated()</signal> + <signal>triggered()</signal> <receiver>MphoneForm</receiver> <slot>phoneRedial()</slot> <hints> @@ -2085,7 +2085,7 @@ </connection> <connection> <sender>serviceRedirection</sender> - <signal>activated()</signal> + <signal>triggered()</signal> <receiver>MphoneForm</receiver> <slot>srvRedirect()</slot> <hints> @@ -2101,7 +2101,7 @@ </connection> <connection> <sender>regShow</sender> - <signal>activated()</signal> + <signal>triggered()</signal> <receiver>MphoneForm</receiver> <slot>phoneShowRegistrations()</slot> <hints> @@ -2117,7 +2117,7 @@ </connection> <connection> <sender>regDeregister</sender> - <signal>activated()</signal> + <signal>triggered()</signal> <receiver>MphoneForm</receiver> <slot>phoneDeregister()</slot> <hints> @@ -2133,7 +2133,7 @@ </connection> <connection> <sender>regRegister</sender> - <signal>activated()</signal> + <signal>triggered()</signal> <receiver>MphoneForm</receiver> <slot>phoneRegister()</slot> <hints> @@ -2165,7 +2165,7 @@ </connection> <connection> <sender>callReject</sender> - <signal>activated()</signal> + <signal>triggered()</signal> <receiver>MphoneForm</receiver> <slot>phoneReject()</slot> <hints> @@ -2181,7 +2181,7 @@ </connection> <connection> <sender>callRedirect</sender> - <signal>activated()</signal> + <signal>triggered()</signal> <receiver>MphoneForm</receiver> <slot>phoneRedirect()</slot> <hints> @@ -2197,7 +2197,7 @@ </connection> <connection> <sender>callInvite</sender> - <signal>activated()</signal> + <signal>triggered()</signal> <receiver>MphoneForm</receiver> <slot>phoneInvite()</slot> <hints> @@ -2213,7 +2213,7 @@ </connection> <connection> <sender>callDTMF</sender> - <signal>activated()</signal> + <signal>triggered()</signal> <receiver>MphoneForm</receiver> <slot>phoneDTMF()</slot> <hints> @@ -2229,7 +2229,7 @@ </connection> <connection> <sender>callBye</sender> - <signal>activated()</signal> + <signal>triggered()</signal> <receiver>MphoneForm</receiver> <slot>phoneBye()</slot> <hints> @@ -2245,7 +2245,7 @@ </connection> <connection> <sender>callAnswer</sender> - <signal>activated()</signal> + <signal>triggered()</signal> <receiver>MphoneForm</receiver> <slot>phoneAnswer()</slot> <hints> @@ -2261,7 +2261,7 @@ </connection> <connection> <sender>callTermCap</sender> - <signal>activated()</signal> + <signal>triggered()</signal> <receiver>MphoneForm</receiver> <slot>phoneTermCap()</slot> <hints> @@ -2309,7 +2309,7 @@ </connection> <connection> <sender>fileExitAction</sender> - <signal>activated()</signal> + <signal>triggered()</signal> <receiver>MphoneForm</receiver> <slot>fileExit()</slot> <hints> @@ -2373,7 +2373,7 @@ </connection> <connection> <sender>callTransfer</sender> - <signal>activated()</signal> + <signal>triggered()</signal> <receiver>MphoneForm</receiver> <slot>phoneTransfer()</slot> <hints> @@ -2389,7 +2389,7 @@ </connection> <connection> <sender>servicesVoice_mailAction</sender> - <signal>activated()</signal> + <signal>triggered()</signal> <receiver>MphoneForm</receiver> <slot>popupMenuVoiceMail()</slot> <hints> @@ -2405,7 +2405,7 @@ </connection> <connection> <sender>actionSendMsg</sender> - <signal>activated()</signal> + <signal>triggered()</signal> <receiver>MphoneForm</receiver> <slot>startMessageSession()</slot> <hints> @@ -2437,7 +2437,7 @@ </connection> <connection> <sender>helpManualAction</sender> - <signal>activated()</signal> + <signal>triggered()</signal> <receiver>MphoneForm</receiver> <slot>manual()</slot> <hints> @@ -2453,7 +2453,7 @@ </connection> <connection> <sender>diamondcardSign_upAction</sender> - <signal>activated()</signal> + <signal>triggered()</signal> <receiver>MphoneForm</receiver> <slot>DiamondcardSignUp()</slot> <hints> diff --git a/src/gui/redirectform.h b/src/gui/redirectform.h index 6e74622..b4f17f1 100644 --- a/src/gui/redirectform.h +++ b/src/gui/redirectform.h @@ -1,20 +1,20 @@ #ifndef REDIRECTFORM_UI_H #define REDIRECTFORM_UI_H #include "ui_redirectform.h" -#include <QtCore/QVariant> -#include <QtGui/QAction> -#include <QtGui/QApplication> -#include <QtGui/QButtonGroup> -#include <QtGui/QDialog> -#include <QtGui/QGridLayout> -#include <QtGui/QHBoxLayout> -#include <QtGui/QHeaderView> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QPushButton> -#include <QtGui/QSpacerItem> -#include <QtGui/QToolButton> -#include <QtGui/QVBoxLayout> +#include <QVariant> +#include <QAction> +#include <QApplication> +#include <QButtonGroup> +#include <QDialog> +#include <QGridLayout> +#include <QHBoxLayout> +#include <QHeaderView> +#include <QLabel> +#include <QLineEdit> +#include <QPushButton> +#include <QSpacerItem> +#include <QToolButton> +#include <QVBoxLayout> #include <list> #include "getaddressform.h" #include "sockets/url.h" diff --git a/src/gui/srvredirectform.h b/src/gui/srvredirectform.h index 62da9f5..ec324f4 100644 --- a/src/gui/srvredirectform.h +++ b/src/gui/srvredirectform.h @@ -3,7 +3,7 @@ #include <list> #include "getaddressform.h" #include "phone.h" -#include <QtGui/QLineEdit> +#include <QLineEdit> #include "sockets/url.h" #include "user.h" #include "ui_srvredirectform.h" diff --git a/src/gui/textbrowsernoautolink.cpp b/src/gui/textbrowsernoautolink.cpp new file mode 100644 index 0000000..07f694b --- /dev/null +++ b/src/gui/textbrowsernoautolink.cpp @@ -0,0 +1,18 @@ +#include "textbrowsernoautolink.h" + +TextBrowserNoAutoLink::TextBrowserNoAutoLink (QWidget* parent) : + QTextBrowser(parent) +{ +} + +#if QT_VERSION >= 0x050000 +void TextBrowserNoAutoLink::setSource(const QUrl & name) +{ +} +#else + +void TextBrowserNoAutoLink::setSource ( const QString & name ) +{ +} + +#endif diff --git a/src/gui/textbrowsernoautolink.h b/src/gui/textbrowsernoautolink.h index 36be95e..78c0dbd 100644 --- a/src/gui/textbrowsernoautolink.h +++ b/src/gui/textbrowsernoautolink.h @@ -40,9 +40,12 @@ class TextBrowserNoAutoLink : public QTextBrowser { Q_OBJECT public: - TextBrowserNoAutoLink ( QWidget * parent = 0 ) : - QTextBrowser(parent) {}; - virtual void setSource ( const QString & name ) {}; + TextBrowserNoAutoLink ( QWidget * parent = 0 ); +#if QT_VERSION >= 0x050000 + virtual void setSource(const QUrl & name) override; +#else + virtual void setSource ( const QString & name ) override; +#endif }; #endif |