From 60a174c68b2c3a7517a619ea44ca020142dbb42b Mon Sep 17 00:00:00 2001 From: Jenkins <jenkins@ring-packaging.cx> Date: Mon, 16 Sep 2019 03:10:18 -0400 Subject: [PATCH] i18n: automatic bump Change-Id: I8186f72cd05c99e9688e576546c5ff861af327b6 --- po/ar.po | 270 +++++++++++++++++++++------------- po/bg.po | 276 +++++++++++++++++++++------------- po/ca.po | 276 +++++++++++++++++++++------------- po/cs_CZ.po | 292 ++++++++++++++++++++++-------------- po/da.po | 280 +++++++++++++++++++++-------------- po/de.po | 296 ++++++++++++++++++++++--------------- po/de_DE.po | 282 +++++++++++++++++++++-------------- po/el.po | 276 +++++++++++++++++++++------------- po/eo.po | 276 +++++++++++++++++++++------------- po/es.po | 292 ++++++++++++++++++++++-------------- po/es_AR.po | 278 +++++++++++++++++++++-------------- po/eu.po | 272 +++++++++++++++++++++------------- po/fa_IR.po | 282 +++++++++++++++++++++-------------- po/fi.po | 276 +++++++++++++++++++++------------- po/fr.po | 310 +++++++++++++++++++++++---------------- po/fr_BE.po | 270 +++++++++++++++++++++------------- po/fr_CA.po | 280 +++++++++++++++++++++-------------- po/fr_CH.po | 270 +++++++++++++++++++++------------- po/fr_FR.po | 268 ++++++++++++++++++++------------- po/he.po | 270 +++++++++++++++++++++------------- po/hr.po | 272 +++++++++++++++++++++------------- po/hu.po | 302 +++++++++++++++++++++++--------------- po/id.po | 268 ++++++++++++++++++++------------- po/it.po | 294 ++++++++++++++++++++++--------------- po/it_IT.po | 294 ++++++++++++++++++++++--------------- po/ja.po | 270 +++++++++++++++++++++------------- po/ko_KR.po | 270 +++++++++++++++++++++------------- po/lt.po | 296 ++++++++++++++++++++++--------------- po/ms.po | 270 +++++++++++++++++++++------------- po/nb.po | 292 ++++++++++++++++++++++-------------- po/nl.po | 300 ++++++++++++++++++++++--------------- po/nl_BE.po | 298 ++++++++++++++++++++++--------------- po/nl_NL.po | 268 ++++++++++++++++++++------------- po/pa.po | 272 +++++++++++++++++++++------------- po/pl.po | 292 ++++++++++++++++++++++-------------- po/pl_PL.po | 292 ++++++++++++++++++++++-------------- po/pt.po | 296 ++++++++++++++++++++++--------------- po/pt_BR.po | 292 ++++++++++++++++++++++-------------- po/pt_PT.po | 294 ++++++++++++++++++++++--------------- po/ring-client-gnome.pot | 266 ++++++++++++++++++++------------- po/ro.po | 268 ++++++++++++++++++++------------- po/ru.po | 294 ++++++++++++++++++++++--------------- po/ru_RU.po | 290 ++++++++++++++++++++++-------------- po/sk_SK.po | 292 ++++++++++++++++++++++-------------- po/sl.po | 278 +++++++++++++++++++++-------------- po/sq_AL.po | 300 ++++++++++++++++++++++--------------- po/sv.po | 294 ++++++++++++++++++++++--------------- po/tr.po | 282 +++++++++++++++++++++-------------- po/uk.po | 292 ++++++++++++++++++++++-------------- po/zh.po | 270 +++++++++++++++++++++------------- po/zh_CN.po | 278 +++++++++++++++++++++-------------- po/zh_TW.po | 296 ++++++++++++++++++++++--------------- 52 files changed, 9026 insertions(+), 5698 deletions(-) diff --git a/po/ar.po b/po/ar.po index f3dd134b..b754a751 100644 --- a/po/ar.po +++ b/po/ar.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" "Language-Team: Arabic (http://www.transifex.com/savoirfairelinux/jami/language/ar/)\n" "MIME-Version: 1.0\n" @@ -178,7 +178,8 @@ msgstr "الاسم المستعار" msgid "RingID" msgstr "" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "كلمة السر" @@ -267,135 +268,174 @@ msgstr "نقل" msgid "Transfer to" msgstr "" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "ألغِ" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "" -#: ui/accountcreationwizard.ui:97 -msgid "Add a new SIP account" +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." msgstr "" #: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" +msgid "Add a new SIP account" msgstr "" -#: ui/accountcreationwizard.ui:134 -msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." +#: ui/accountcreationwizard.ui:234 +msgid "Archive" msgstr "" -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." msgstr "" -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" +#: ui/accountcreationwizard.ui:287 +msgid "PIN" msgstr "" -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." msgstr "" -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" + +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "التالي" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "خذ لمحة" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "حساب" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "" -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "اسم المستخدم" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "" -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "" - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "موافق" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "النظام" @@ -500,7 +540,7 @@ msgstr "عام" msgid "Media" msgstr "ميديا" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "إعدادات" @@ -587,6 +627,10 @@ msgstr "" msgid "Enter archive password" msgstr "" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "ألغِ" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "" @@ -603,10 +647,6 @@ msgstr "" msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "" @@ -998,12 +1038,13 @@ msgid "Choose download folder" msgstr "" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "" @@ -1065,90 +1106,90 @@ msgstr "" msgid "Add account…" msgstr "" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "إبحث عن إتصالات أو أدخل رقم" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "مكالمة واردة" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "مسح السجل" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1225,10 +1266,53 @@ msgstr "إستعداد الحالة المخفية للنافذة الرئيسي msgid "- GNOME client for Jami" msgstr "" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "حفظ الملف" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "" + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1251,10 +1335,6 @@ msgstr "" msgid "Send File" msgstr "" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "حفظ الملف" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1317,22 +1397,6 @@ msgstr "" msgid "New password" msgstr "" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "" - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "" diff --git a/po/bg.po b/po/bg.po index 0fe56ed5..df4d45d3 100644 --- a/po/bg.po +++ b/po/bg.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" -"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" +"Last-Translator: solusitor\n" "Language-Team: Bulgarian (http://www.transifex.com/savoirfairelinux/jami/language/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -178,7 +178,8 @@ msgstr "Псевдоним" msgid "RingID" msgstr "" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Парола" @@ -267,135 +268,174 @@ msgstr "Прехвърляне" msgid "Transfer to" msgstr "" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Отказ" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "" -#: ui/accountcreationwizard.ui:97 -msgid "Add a new SIP account" +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." msgstr "" #: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Свържи това устройство със съществуващ акаунт" +msgid "Add a new SIP account" +msgstr "" -#: ui/accountcreationwizard.ui:134 -msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." +#: ui/accountcreationwizard.ui:234 +msgid "Archive" msgstr "" -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." msgstr "" -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "ПИН" + +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." msgstr "" -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "Въведете парола:" +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "Предишен" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Напред" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Профил" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Акаунт" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "" -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Потребителско име" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Потвърдете паролата" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "Пропускане" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "Може да отнеме известно време." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "" - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "Добре" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "Система" @@ -500,7 +540,7 @@ msgstr "Общи" msgid "Media" msgstr "Звук и видео" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Настройки" @@ -587,6 +627,10 @@ msgstr "Парола (задължително):" msgid "Enter archive password" msgstr "Вкарай архивна парола" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Отказ" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "" @@ -603,10 +647,6 @@ msgstr "Създаденият за Вас Ли" msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "" @@ -998,12 +1038,13 @@ msgid "Choose download folder" msgstr "" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "_Откажи" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "" @@ -1065,90 +1106,90 @@ msgstr "" msgid "Add account…" msgstr "" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "започване на разговор" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "отваряне на чата" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "Потърсете контакти или въведете номер" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Входящо обаждане" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Изчистване на историята" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "Блокиране на контакт" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1225,10 +1266,53 @@ msgstr "Възстановява скритото състояние на осн msgid "- GNOME client for Jami" msgstr "" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "Паролите не съвпадат" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Запазване на файла" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "" + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1251,10 +1335,6 @@ msgstr "Ring е безплатен софтуер за универсална к msgid "Send File" msgstr "" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Запазване на файла" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1317,22 +1397,6 @@ msgstr "" msgid "New password" msgstr "Нова парола" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "" - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "Грешна парола" diff --git a/po/ca.po b/po/ca.po index 04ea9d09..a9d8b088 100644 --- a/po/ca.po +++ b/po/ca.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" "Language-Team: Catalan (http://www.transifex.com/savoirfairelinux/jami/language/ca/)\n" "MIME-Version: 1.0\n" @@ -180,7 +180,8 @@ msgstr "Àlies" msgid "RingID" msgstr "" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Contrasenya" @@ -269,135 +270,174 @@ msgstr "" msgid "Transfer to" msgstr "" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "Benvingut a" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Cancel·la" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" + +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "" -#: ui/accountcreationwizard.ui:97 -msgid "Add a new SIP account" +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." msgstr "" #: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Enllaça aquest dispositiu a un compte ja existent" +msgid "Add a new SIP account" +msgstr "" -#: ui/accountcreationwizard.ui:134 -msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." +#: ui/accountcreationwizard.ui:234 +msgid "Archive" msgstr "" -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "Entra el pin:" +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." +msgstr "" -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" +#: ui/accountcreationwizard.ui:287 +msgid "PIN" msgstr "" -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "Entra la contrasenya:" +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." +msgstr "" + +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Següent" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Perfil" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Compte" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "" -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Nom d'usuari" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "Això pot trigar uns minuts." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "Error creant/carregant compte" - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "D'acord" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "Sistema" @@ -502,7 +542,7 @@ msgstr "General" msgid "Media" msgstr "Mitjans" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Opcions" @@ -589,6 +629,10 @@ msgstr "" msgid "Enter archive password" msgstr "" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Cancel·la" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "" @@ -605,10 +649,6 @@ msgstr "" msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "" @@ -1000,12 +1040,13 @@ msgid "Choose download folder" msgstr "" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "_Cancel·la" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "" @@ -1067,90 +1108,90 @@ msgstr "" msgid "Add account…" msgstr "" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "fer una trucada" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "obrir un xat" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "Busqueu contactes o introduïu el nombre" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Trucada entrant" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Neteja historial" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1227,10 +1268,53 @@ msgstr "Restaura l'estat ocult de la finestra principal (només s'aplica a la in msgid "- GNOME client for Jami" msgstr "" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "No coincideixen les contrasenyes" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "" + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1253,10 +1337,6 @@ msgstr "Jami és un programari lliure de comunicació universal, que respecta le msgid "Send File" msgstr "" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1319,22 +1399,6 @@ msgstr "" msgid "New password" msgstr "Nova contrasenya" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "" - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "Mala contrasenya" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index 8fc3f87b..767d02de 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" -"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" +"Last-Translator: fri\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/savoirfairelinux/jami/language/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -179,7 +179,8 @@ msgstr "Přezdívka" msgid "RingID" msgstr "RingID" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Heslo" @@ -268,135 +269,174 @@ msgstr "Přenos dat" msgid "Transfer to" msgstr "Přenést do" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "Vítejte v" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" -msgstr "Vytvořit účet Jami" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" +msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" -msgstr "Vytvořit nový účet Jami (pro nové uživatele)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" +msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Zrušit" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" + +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "Pokročilé…" -#: ui/accountcreationwizard.ui:97 +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." +msgstr "" + +#: ui/accountcreationwizard.ui:119 msgid "Add a new SIP account" msgstr "Přidat nový účet SIP" -#: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Propojit zařízení s již existujícím účtem" +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" + +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." +msgstr "" + +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "PIN" -#: ui/accountcreationwizard.ui:134 +#: ui/accountcreationwizard.ui:349 msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." -msgstr "Pro připojení tohoto zařízení k jinému účtu máte dvě možnosti. Můžete svůj účet zavést z DHT, ale potřebujete nejdříve získat kód PIN. Abyste jej vytvořili, otevřete na předchozím zařízení nastavení správy účtů, zvolte, který účet Jami použít, a vyberte „Připojit k tomuto účtu další zařízení“. Dostanete PIN nezbytný k dokončení tohoto formuláře. PIN zůstává platný jen po 10 minut. Anebo svůj účet můžete zavést přímo z archivu." - -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "Vložte svoje osobní identifikační číslo (PIN):" - -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" -msgstr "Nebo zavést soubor:" - -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "Vložte své heslo:" - -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." +msgstr "" + +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" + +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "Předchozí" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Další" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Profil" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Účet" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "Zaregistrovat uživatelské jméno" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "Zaškrtnutím tohoto nastavení si zaregistrujete jedinečné uživatelské jméno na síti Jami. Ostatní ho budou moci použít k navázání spojení, namísto obvyklého RingID, které je 40 znaků dlouhé." -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Uživatelské jméno" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "Toto heslo bude použito k zašifrování dat vašeho účtu a pro připojování nových zařízení k účtu." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Potvrdit heslo" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "Vytváří se váš účet Jami…" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "Vyvést účet" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "Přeskočit" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "Registruje se uživatelské jméno…" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "Toto může pár minut trvat." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "Získává se váš účet Jami…" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "Chyba při vytváření/nahrávání účtu." - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "Budiž" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "Systém" @@ -501,7 +541,7 @@ msgstr "Obecné" msgid "Media" msgstr "Média" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Nastavení" @@ -588,6 +628,10 @@ msgstr "Heslo (vyžadováno):" msgid "Enter archive password" msgstr "Vložte heslo k archivu" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Zrušit" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "Vyvést na síť" @@ -604,10 +648,6 @@ msgstr "Vaše vytvořené osobní identifikační číslo (PIN):" msgid "Click to change password" msgstr "Klepněte pro změnu hesla" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "Vyvést účet" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "Povolit účet" @@ -999,12 +1039,13 @@ msgid "Choose download folder" msgstr "Vybrat složku pro stahování" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "_Zrušit" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "_Uložit" @@ -1066,90 +1107,90 @@ msgstr "Poslat nahranou zprávu" msgid "Add account…" msgstr "Přidat účet…" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "zavolat" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "otevřít zprávy" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "Hledat kontakty nebo zadat číslo" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "Opustit stránku s nastavením" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "vám volá!" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Příchozí hovor" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "Nová žádost od" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "Žádosti o důvěru" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "Nová zpráva" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Vymazat historii" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "Blokovat spojení" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1226,10 +1267,53 @@ msgstr "Obnoví skrytý stav hlavního okna (platí pouze pro primární instanc msgid "- GNOME client for Jami" msgstr "- klient GNOME pro Jami" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "Hesla se neshodují" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Uložit soubor" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "Pro vyvedení celého archivu musíte zadat heslo." + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "Zadejte heslo pro vyvedení archivu" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "Účet vyveden!" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "Nepodařilo se vyvést účet." + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1252,10 +1336,6 @@ msgstr "Jami je svobodný software určený k univerzální komunikaci, který r msgid "Send File" msgstr "Poslat soubor" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Uložit soubor" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1318,22 +1398,6 @@ msgstr "Nynější heslo" msgid "New password" msgstr "Nové heslo" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "Pro vyvedení celého archivu musíte zadat heslo." - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "Zadejte heslo pro vyvedení archivu" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "Účet vyveden!" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "Nepodařilo se vyvést účet." - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "Nesprávné heslo" diff --git a/po/da.po b/po/da.po index 0ea44ac6..89d9aa5f 100644 --- a/po/da.po +++ b/po/da.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" -"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" +"Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/savoirfairelinux/jami/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -179,7 +179,8 @@ msgstr "Alias" msgid "RingID" msgstr "RingID" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Adgangskode" @@ -268,135 +269,174 @@ msgstr "Overfør" msgid "Transfer to" msgstr "Overfør til" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "Velkommen til " -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Annuller" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" + +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "Avanceret…" -#: ui/accountcreationwizard.ui:97 +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." +msgstr "" + +#: ui/accountcreationwizard.ui:119 msgid "Add a new SIP account" msgstr "Tilføj en ny SIP-konto" -#: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Tilnyt denne enhed til en eksisterende konto" +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" -#: ui/accountcreationwizard.ui:134 -msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." msgstr "" -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "Indtast PIN-kode:" +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "PIN" -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" -msgstr "Eller importér en fil:" +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." +msgstr "" -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "Indtast din adgangskode:" +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "Tilbage" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Næste" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Profil" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Konto" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "Registrer brugernavn" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "" -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Brugernavn" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "Denne adgangskode vil blive brugt til at kryptere din kontos data og til at tilknytte nye enheder til din konto." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Bekræft adgangskode" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "Eksporter konto" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "Spring over" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "Registrer brugernavn…" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "Dette kan tage nogle minutter." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "Fejl ved oprettelse/hentning af konto." - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "OK" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "System" @@ -501,7 +541,7 @@ msgstr "Generelt" msgid "Media" msgstr "Medier" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Indstillinger" @@ -588,6 +628,10 @@ msgstr "Adgangskode (påkrævet):" msgid "Enter archive password" msgstr "Indtast arkivets adgangskode" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Annuller" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "" @@ -604,10 +648,6 @@ msgstr "Din genererede PIN-kode:" msgid "Click to change password" msgstr "Klik for at skifte adgangskode" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "Eksporter konto" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "Aktivér konto" @@ -999,12 +1039,13 @@ msgid "Choose download folder" msgstr "Vælg downloadmappe" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "_Annuller" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "_Gem" @@ -1066,90 +1107,90 @@ msgstr "Send optagede meddelelse" msgid "Add account…" msgstr "Tilføj konto…" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "foretag opkald" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "åbn chat" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "Søg efter kontakt eller indtast nummer" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "Forlad indstillingsside" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr " kalder dig!" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Indgående opkald" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "Ny anmodning fra " -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "Hav tillid til anmodning" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "Ny besked" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Ryd historiken" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "Bloker kontakt" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1226,10 +1267,53 @@ msgstr "Gendanner den skjulte tilstand fort hovedvinduer (kun gyldig for den pri msgid "- GNOME client for Jami" msgstr "" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "Adgangskoderne er ikke ens" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Gem fil" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "Konto eksporteret!" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "Eksport af konto mislykkedes." + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1252,10 +1336,6 @@ msgstr "" msgid "Send File" msgstr "Send fil" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Gem fil" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1318,22 +1398,6 @@ msgstr "Nuværende adgangskode" msgid "New password" msgstr "Ny adgangskode" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "Konto eksporteret!" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "Eksport af konto mislykkedes." - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "Forkert adgangskode" diff --git a/po/de.po b/po/de.po index d469556b..05ed754d 100644 --- a/po/de.po +++ b/po/de.po @@ -25,9 +25,9 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" -"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" +"Last-Translator: Jan Wirth <jottenwe@gmail.com>\n" "Language-Team: German (http://www.transifex.com/savoirfairelinux/jami/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -193,7 +193,8 @@ msgstr "Alias" msgid "RingID" msgstr "Ring-ID" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Passwort" @@ -282,135 +283,174 @@ msgstr "Transfer" msgid "Transfer to" msgstr "Übertragung an" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "Willkommen bei" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" -msgstr "Jami-Konto anlegen" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" +msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" -msgstr "Erzeugen eines neuen Jami-Kontos (für neue Benutzer)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" +msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" -msgstr "Existierendes Konto importieren" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" +msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" -msgstr "Importiere ein Konto mit deiner PIN oder deinem Kontoarchiv" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" +msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Abbrechen" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "Erweitert..." -#: ui/accountcreationwizard.ui:97 +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." +msgstr "" + +#: ui/accountcreationwizard.ui:119 msgid "Add a new SIP account" msgstr "Neues SIP-Konto hinzufügen" -#: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Dieses Gerät mit einem vorhandenen Konto verknüpfen" +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" + +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." +msgstr "" + +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "PIN" + +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." +msgstr "" -#: ui/accountcreationwizard.ui:134 +#: ui/accountcreationwizard.ui:382 msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." -msgstr "Um dieses Gerät mit einem anderen Konto zu verbinden. gibt es zwei Möglichkeiten. Sie können Ihr Konto von DHT importieren, zuvor müssen Sie aber einen PIN-Code erhalten. Um einen PIN-Code zu erzeugen, gehen Sie in die Kontoeinstellungen des anderen Geräts, öffnen das zu nutzende Jami-Konto und drücken auf \"Weiteres Gerät mit diesem Konto verknüpfen\". Um die EIngabe zu beenden, wird automatisch der notwendige PIN-Code generiert. Der PIN-Code ist nur 10 Minuten gültig. Eine andere Möglichkeit ist der Direkte Import Ihres Kontos aus einem Archive." - -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "Geben Sie Ihre PIN ein:" - -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" -msgstr "Oder eine Datei importieren:" - -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "Geben Sie Ihr Passwort ein:" - -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" + +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "Vorherige" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Weiter" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Profil" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Konto" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "Benutzername registrieren" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "Durch Setzen dieses Flags wird ein eindeutiger Benutzername im Jami-Netzwerk eingetragen. Andere Teilnehmer können sich über diesen Eintrag mit Ihnen verbinden, anstelle der Angabe der Ring-ID, welche 40 Zeichen umfasst." -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Benutzername" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "Mit diesem Passwort werden Ihre Kontodaten geschützt und Sie können neue Geräte mit Ihrem Konto verknüpfen." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Passwort bestätigen" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "Erzeugen Ihres Jami-Kontos..." -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "Konten exportieren" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "Überspringen" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "Registrieren des Benutzernamens..." -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "Das kann ein paar Minuten dauern." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "Empfangen Ihres Jami-Kontos..." -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "Problem das Konto zu laden/zu erzeugen." - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "OK" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "System" @@ -515,7 +555,7 @@ msgstr "Allgemein" msgid "Media" msgstr "Medium" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Einstellungen" @@ -602,6 +642,10 @@ msgstr "Passwort (erforderlich):" msgid "Enter archive password" msgstr "Passwort für das Archiv eingeben" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Abbrechen" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "Ins Netzwerk exportieren" @@ -618,10 +662,6 @@ msgstr "Ihre generierte PIN:" msgid "Click to change password" msgstr "Klilcken, um Passwort zu ändern" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "Konten exportieren" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "Konto aktivieren" @@ -1013,12 +1053,13 @@ msgid "Choose download folder" msgstr "Zielordner wählen" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "_Abbrechen" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "_Speichern" @@ -1080,90 +1121,90 @@ msgstr "Aufgenommene Nachricht senden" msgid "Add account…" msgstr "Konto hinzufügen..." -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "Anrufen" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "Chat öffnen" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "Kontakte suchen oder Nummer eingeben" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "Seite mit Einstellungen verlassen" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "Es gibt aktive Anrufe" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "ruft Sie gerade an!" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Eingehender Anruf" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "Neue Anfrage von" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "Anfrage vertrauen" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "Neue Nachricht" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "Aktuellen Anruf beenden?" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "Ein Aufruf ist derzeit im Gange. Möchten Sie das Fenster schließen und alle aktuellen Anrufe stoppen?" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Verlauf leeren" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "Wollen Sie wirklich den Verlauf dieser Konversation löschen?" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "Konversation entfernen" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "Wollen Sie wirklich diese Konversation löschen?" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "Kontakt blockieren" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "Wollen Sie wirklich diesen Kontakt sperren?" @@ -1240,10 +1281,53 @@ msgstr "Stellt den versteckten Zustand des Hauptfensters wieder her (nur für di msgid "- GNOME client for Jami" msgstr "- GNOME-Client für Jami" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "Passwörter stimmen nicht überein" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Datei speichern" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "Sie müssen Ihr Passwort eingeben, um das komplette Archiv zu exportieren." + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "Geben SIe das Passwort ein, um das komplette Archiv zu exportieren" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "Konto exportiert!" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "Fehler beim Kontoexport." + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1266,10 +1350,6 @@ msgstr "Jami ist eine freie Software für universelle Kommunikation und respekti msgid "Send File" msgstr "Datei senden" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Datei speichern" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1332,22 +1412,6 @@ msgstr "Aktuelles Passwort" msgid "New password" msgstr "Neues Passwort" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "Sie müssen Ihr Passwort eingeben, um das komplette Archiv zu exportieren." - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "Geben SIe das Passwort ein, um das komplette Archiv zu exportieren" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "Konto exportiert!" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "Fehler beim Kontoexport." - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "Unsicheres Passwort" diff --git a/po/de_DE.po b/po/de_DE.po index 70281cc4..e36ce9ab 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" -"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" +"Last-Translator: Ralf\n" "Language-Team: German (Germany) (http://www.transifex.com/savoirfairelinux/jami/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -181,7 +181,8 @@ msgstr "Alias" msgid "RingID" msgstr "RingID" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Passwort" @@ -270,135 +271,174 @@ msgstr "Übertragung" msgid "Transfer to" msgstr "" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" -msgstr "Jami-Konto erstellen" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" +msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Abbrechen" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "Erweitert…" -#: ui/accountcreationwizard.ui:97 +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." +msgstr "" + +#: ui/accountcreationwizard.ui:119 msgid "Add a new SIP account" msgstr "Neues SIP-Konto hinzufügen" -#: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Dieses Gerät mit einem bestehenden Konto verknüpfen" +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" -#: ui/accountcreationwizard.ui:134 -msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." -msgstr "Um dieses Gerät mit einem bestehenden Konto zu verbinden, haben Sie zwei Möglichkeiten. Sie können Ihr Konto aus dem Jami-Netzwerk importieren, doch dafür brauchen Sie zunächst eine PIN. Um diese PIN zu generieren, gehen Sie zu den Kontoeinstellungen Ihres anderen Geräts, wählen dort das gewünschte Jami-Konto aus und klicken auf »Neues Gerät verbinden«. Dann wird die benötigte PIN angezeigt, die Sie daraufhin hier eingeben. Die PIN ist nur für 10 Minuten gültig. Alternativ können Sie ein Konto auch direkt aus einer exportierten Archivdatei importieren." +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." +msgstr "" -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "PIN eingeben:" +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "PIN" -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." msgstr "" -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "Passwort eingeben:" +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Weiter" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Profil" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Konto" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "Benutzernamen registrieren" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "Klicken Sie hier, um einen eindeutigen Benutzernamen im Jami-Netzwerk zu registrieren. Andere Nutzer können darüber mit Ihnen Kontakt aufnehmen, anstatt die 40 Zeichen lange RingID zu benutzen." -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Benutzername" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "Dieses Passwort wird benutzt, um Ihre Kontodaten zu verschlüsseln und um neue Geräte mit Ihrem Konto zu verknüpfen." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Konto bestätigen" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "Ihr Jami-Konto wird erstellt …" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "Konto exportieren" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "Überspringen" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "Benutzername wird registriert …" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "Dies kann einige Minuten dauern." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "Ihr Jami-Konto wird geladen …" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "Fehler beim Erstellen bzw. Laden des Kontos." - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "Okay" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "System" @@ -503,7 +543,7 @@ msgstr "Allgemein" msgid "Media" msgstr "Media" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Einstellungen" @@ -590,6 +630,10 @@ msgstr "Passwort (erforderlich):" msgid "Enter archive password" msgstr "Archiv-Passwort eingeben" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Abbrechen" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "In das Netzwerk exportieren" @@ -606,10 +650,6 @@ msgstr "Ihre generierte PIN:" msgid "Click to change password" msgstr "Hier klicken, um das Passwort zu ändern." -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "Konto exportieren" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "Konto aktivieren" @@ -1001,12 +1041,13 @@ msgid "Choose download folder" msgstr "Download-Ordner auswählen" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "" @@ -1068,90 +1109,90 @@ msgstr "Sprachnachricht senden" msgid "Add account…" msgstr "Konto hinzufügen…" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "Einstellungen verlassen" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Eingehender Anruf" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "Neue Nachricht" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Verlauf löschen" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "Kontakt blockieren" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1228,10 +1269,53 @@ msgstr "" msgid "- GNOME client for Jami" msgstr "- GNOME-Client für Jami" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "Passwörter stimmen nicht überein" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Datei speichern" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "Sie müssen Ihr Passwort eingeben, um das gesamte Archiv zu exportieren." + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "Passwort eingeben, um Archiv zu exportieren" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "Konto exportiert!" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "Konto-Export fehlgeschlagen." + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1254,10 +1338,6 @@ msgstr "Jami ist Freie Software für universelle Kommunikation, die die Freiheit msgid "Send File" msgstr "Datei senden" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Datei speichern" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1320,22 +1400,6 @@ msgstr "Aktuelles Passwort" msgid "New password" msgstr "Neues Passwort" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "Sie müssen Ihr Passwort eingeben, um das gesamte Archiv zu exportieren." - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "Passwort eingeben, um Archiv zu exportieren" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "Konto exportiert!" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "Konto-Export fehlgeschlagen." - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "Falsches Passwort" diff --git a/po/el.po b/po/el.po index 6adde5bc..6acb1aed 100644 --- a/po/el.po +++ b/po/el.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" "Language-Team: Greek (http://www.transifex.com/savoirfairelinux/jami/language/el/)\n" "MIME-Version: 1.0\n" @@ -178,7 +178,8 @@ msgstr "Ψευδώνυμο" msgid "RingID" msgstr "RingID" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Συνθηματικό" @@ -267,135 +268,174 @@ msgstr "Μεταφορά" msgid "Transfer to" msgstr "" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Ακύρωση" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" + +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "" -#: ui/accountcreationwizard.ui:97 -msgid "Add a new SIP account" +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." msgstr "" #: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Σύνδεση αυτής της συσκευής σε έναν λογαριασμό που ήδη υπάρχει" +msgid "Add a new SIP account" +msgstr "" -#: ui/accountcreationwizard.ui:134 -msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." +#: ui/accountcreationwizard.ui:234 +msgid "Archive" msgstr "" -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "Εισάγετε το PIN σας:" +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." +msgstr "" -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" +#: ui/accountcreationwizard.ui:287 +msgid "PIN" msgstr "" -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "Εισάγετε το συνθηματικό:" +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." +msgstr "" + +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "Προηγούμενο" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Επόμενο" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Προφίλ" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Λογαριασμός" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "" -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Όνομα χρήστη" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "Αυτό το συνθηματικό θα χρησιμοποιηθεί για να κρυπτογραφήσει τα δεδομένα του λογαριασμού σας και να συνδέσει νέες συσκευές στο λογαριασμό σας." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "Αυτό μπορεί να διαρκέσει λίγα λεπτά." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "Σφάλμα δημιουργίας/φόρτωσης λογαριασμού." - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "OK" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "Σύστημα" @@ -500,7 +540,7 @@ msgstr "Γενικά" msgid "Media" msgstr "Μέσα" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Ρυθμίσεις" @@ -587,6 +627,10 @@ msgstr "Συνθηματικό (απαιτείται)" msgid "Enter archive password" msgstr "Εισαγωγή συνθηματικού αρχειοθέτησης" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Ακύρωση" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "" @@ -603,10 +647,6 @@ msgstr "Το δημιουργημένο σας PIN:" msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "" @@ -998,12 +1038,13 @@ msgid "Choose download folder" msgstr "" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "Άκυρο" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "" @@ -1065,90 +1106,90 @@ msgstr "" msgid "Add account…" msgstr "" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "έναρξη κλήσης" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "άνοιγμα συνομιλίας" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "Αναζήτηση επαφών ή εισαγωγή αριθμού" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Εισερχόμενη κλήση" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1225,10 +1266,53 @@ msgstr "Επαναφέρει την κρυμένη κατάσταση του κ msgid "- GNOME client for Jami" msgstr "" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "Τα συνθηματικά δεν ταιριάζουν" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Αποθήκευση αρχείου" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "" + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1251,10 +1335,6 @@ msgstr "" msgid "Send File" msgstr "" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Αποθήκευση αρχείου" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1317,22 +1397,6 @@ msgstr "" msgid "New password" msgstr "Νέο συνθηματικό" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "" - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "Λανθασμένο συνθηματικό" diff --git a/po/eo.po b/po/eo.po index 71d41139..db9262d6 100644 --- a/po/eo.po +++ b/po/eo.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" "Language-Team: Esperanto (http://www.transifex.com/savoirfairelinux/jami/language/eo/)\n" "MIME-Version: 1.0\n" @@ -178,7 +178,8 @@ msgstr "Kaŝnomo" msgid "RingID" msgstr "" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Pasvorto" @@ -267,135 +268,174 @@ msgstr "Transigo" msgid "Transfer to" msgstr "" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Rezigni" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" + +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "" -#: ui/accountcreationwizard.ui:97 -msgid "Add a new SIP account" +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." msgstr "" #: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Ligi ĉi tiun aparaton al ekzistanta konto" +msgid "Add a new SIP account" +msgstr "" -#: ui/accountcreationwizard.ui:134 -msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." +#: ui/accountcreationwizard.ui:234 +msgid "Archive" msgstr "" -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "Entajpu vian PIN-on:" +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." +msgstr "" -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" +#: ui/accountcreationwizard.ui:287 +msgid "PIN" msgstr "" -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "Entajpu vian pasvorton:" +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." +msgstr "" + +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "Antaŭa" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Sekva" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Profilo" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Konto" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "" -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Uzantnomo" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Konfirmu pasvorton" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "Tio povas daŭri iom da minutoj." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "Eraro kreante/ŝarĝante konton." - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "Okej" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "Sistemo" @@ -500,7 +540,7 @@ msgstr "Ĝenerala" msgid "Media" msgstr "Aŭdvidaĵo" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Agordoj" @@ -587,6 +627,10 @@ msgstr "Pasvorto (bezonata):" msgid "Enter archive password" msgstr "Entajpu arĥivan pasvorton" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Rezigni" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "" @@ -603,10 +647,6 @@ msgstr "Via generita PIN:" msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "" @@ -998,12 +1038,13 @@ msgid "Choose download folder" msgstr "" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "_Rezigni" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "" @@ -1065,90 +1106,90 @@ msgstr "" msgid "Add account…" msgstr "" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "voki" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "malfermi babilejon" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "Serĉu kontaktojn aŭ entajpu numeron" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Envena voko" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Vakigi historion" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1225,10 +1266,53 @@ msgstr "Restaŭras kaŝecon de la ĉefa fenestro (nur por la ĉefa ekzemplo)" msgid "- GNOME client for Jami" msgstr "" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "Pasvortoj ne kongruas" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Konservi Dosieron" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "" + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1251,10 +1335,6 @@ msgstr "" msgid "Send File" msgstr "" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Konservi Dosieron" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1317,22 +1397,6 @@ msgstr "" msgid "New password" msgstr "Nova pasvorto" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "" - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "Malĝusta pasvorto" diff --git a/po/es.po b/po/es.po index 0cc5638f..d97fb020 100644 --- a/po/es.po +++ b/po/es.po @@ -38,9 +38,9 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" -"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" +"Last-Translator: Miguel Angel NV <manvac@gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/savoirfairelinux/jami/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -206,7 +206,8 @@ msgstr "Alias" msgid "RingID" msgstr "RingID" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Contraseña" @@ -295,135 +296,174 @@ msgstr "Transferir" msgid "Transfer to" msgstr "Transferir a" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "Bienvenido a" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" -msgstr "Crear Cuenta Jami" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" +msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" -msgstr "Crear una nueva cuenta Jami (para usuarios nuevos)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" +msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Cancelar" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" + +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "Avanzado..." -#: ui/accountcreationwizard.ui:97 +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." +msgstr "" + +#: ui/accountcreationwizard.ui:119 msgid "Add a new SIP account" msgstr "Añada una nueva cuenta SIP" -#: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Vincular este dispositivo con una cuenta existente" +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" + +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." +msgstr "" + +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "PIN" -#: ui/accountcreationwizard.ui:134 +#: ui/accountcreationwizard.ui:349 msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." -msgstr "Para enlazar este dispositivo hacia otra cuenta, usted tiene dos posibilidades. Usted puede importar el usuario desde el DHT, pero primero, usted necesita obtener el código PIN. Para generar el código PIN, vaya a la configuración de administrador de usuario del anterior dispositivo, elija el Usuario Jami a usar y seleccione \"Vincular a otro dispositivo a esta cuenta \". Usted deberá obtener el PIN necesariamente para completar este formulario. El PIN es solo valido por 10 minutos. O, puede importarlo directamente la cuenta desde un fichero." - -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "Escribe tu PIN:" - -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" -msgstr "o importar a un fichero:" - -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "Escribe tu contraseña:" - -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." +msgstr "" + +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" + +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "Anterior" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Siguiente" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Perfil" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Cuenta" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "Registrar nombre de usuario" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "Al marcar aquí, estarás registrando un nombre de usuario único en la red de Jami. Otras personas podrán utilizarlo para llamarte sin tener que utilizar tu identificador RingID, que tiene 40 caracteres." -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Nombre de usuario" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "La contraseña se utilizará para cifrar los datos de tu cuenta y para conectar nuevos dispositivos a tu cuenta." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Confirmar contraseña" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "Generando tu cuenta Jami..." -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "Exportar la cuenta" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "Saltar" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "Registrando nombre de usuario..." -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "Esto puede llevar unos minutos." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "Recuperando tu cuenta de Jami..." -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "Error creando o cargando la cuenta." - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "OK" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "Sistema" @@ -528,7 +568,7 @@ msgstr "General" msgid "Media" msgstr "Medios" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Configuración" @@ -615,6 +655,10 @@ msgstr "Contraseña (necesario)" msgid "Enter archive password" msgstr "Introducir la contraseña del archivo" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Cancelar" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "Exportar a la red" @@ -631,10 +675,6 @@ msgstr "PIN generado:" msgid "Click to change password" msgstr "Haga clic para cambiar la contraseña" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "Exportar la cuenta" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "Habilitar cuenta" @@ -1026,12 +1066,13 @@ msgid "Choose download folder" msgstr "Elegir la carpeta de descargas" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "_Cancelar" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "_Guardar" @@ -1093,90 +1134,90 @@ msgstr "Enviar mensaje grabado" msgid "Add account…" msgstr "Añadir cuenta..." -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "llamar" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "Abrir chat" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "Buscar contacto o introducir número" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "Abandonar la página de configuración" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "Hay llamadas activas" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "te está llamando." -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Llamada entrante" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "Nueva petición de" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "Solicitud de confianza" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "Nuevo mensaje" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "¿Finalizar llamada actual?" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "Una llamada está activa. ¿Quiere cerrar la ventana y finalizar todas las llamadas que se están llevando a cabo?" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Limpiar historial" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "¿Desea eliminar el historial de esta conversación?" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "Eliminar conversación" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "¿Desea eliminar esta conversación?" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "Bloquear contacto" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "¿Desea bloquear este contacto?" @@ -1253,10 +1294,53 @@ msgstr "Restaura el estado de ocultación de la ventana principal (únicamente l msgid "- GNOME client for Jami" msgstr "- Cliente Gnome para Jami" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "Las contraseñas no coinciden" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Guardar fichero" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "Necesitas ingresar tu contraseña para exportar el archivo completo" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "Ingresa tu contraseña para exportar el archivo" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "¡Cuenta exportada!" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "Fallo al exportar la cuenta." + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1279,10 +1363,6 @@ msgstr "Jami es software libre para la comunicación universal que respeta las l msgid "Send File" msgstr "Enviar archivo" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Guardar fichero" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1345,22 +1425,6 @@ msgstr "Contraseña actual" msgid "New password" msgstr "Contraseña nueva" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "Necesitas ingresar tu contraseña para exportar el archivo completo" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "Ingresa tu contraseña para exportar el archivo" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "¡Cuenta exportada!" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "Fallo al exportar la cuenta." - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "Contraseña errónea" diff --git a/po/es_AR.po b/po/es_AR.po index cba3ef7c..fab393b8 100644 --- a/po/es_AR.po +++ b/po/es_AR.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" -"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" +"Last-Translator: Gonzalo Maunas <gonzamaunas@gmail.com>\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/savoirfairelinux/jami/language/es_AR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -176,7 +176,8 @@ msgstr "Alias" msgid "RingID" msgstr "RingID" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Contraseña" @@ -265,135 +266,174 @@ msgstr "" msgid "Transfer to" msgstr "" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "Bienvenido a" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Cancelar" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" + +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "" -#: ui/accountcreationwizard.ui:97 -msgid "Add a new SIP account" +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." msgstr "" #: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Enlazar este dispositivo a una cuenta existente" +msgid "Add a new SIP account" +msgstr "" -#: ui/accountcreationwizard.ui:134 -msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." +#: ui/accountcreationwizard.ui:234 +msgid "Archive" msgstr "" -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "Ingresá tu pin:" +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." +msgstr "" + +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "PIN" -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." msgstr "" -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "Ingresá tu contraseña:" +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "Anterior" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Siguiente" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Perfil" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Cuenta" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "" -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Nombre de usuario" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Confirmar contraseña" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "Saltar" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "" -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "" - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "Ok" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "Sistema" @@ -498,7 +538,7 @@ msgstr "General" msgid "Media" msgstr "Medios" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Ajustes" @@ -585,6 +625,10 @@ msgstr "Contraseña (requerida):" msgid "Enter archive password" msgstr "" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Cancelar" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "" @@ -601,10 +645,6 @@ msgstr "Tu pin generado:" msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "" @@ -996,12 +1036,13 @@ msgid "Choose download folder" msgstr "" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "" @@ -1063,90 +1104,90 @@ msgstr "" msgid "Add account…" msgstr "" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Llamada entrante" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Borrar historial" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1223,10 +1264,53 @@ msgstr "" msgid "- GNOME client for Jami" msgstr "" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "" + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1249,10 +1333,6 @@ msgstr "" msgid "Send File" msgstr "" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1315,22 +1395,6 @@ msgstr "" msgid "New password" msgstr "Nueva contraseña" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "" - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "" diff --git a/po/eu.po b/po/eu.po index 92eb304a..aa66bdde 100644 --- a/po/eu.po +++ b/po/eu.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" -"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" +"Last-Translator: Osoitz <oelkoro@gmail.com>\n" "Language-Team: Basque (http://www.transifex.com/savoirfairelinux/jami/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -176,7 +176,8 @@ msgstr "Ezizena" msgid "RingID" msgstr "RingID" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Pasahitza" @@ -265,135 +266,174 @@ msgstr "Transferitu" msgid "Transfer to" msgstr "" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Ezeztatu" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "" -#: ui/accountcreationwizard.ui:97 -msgid "Add a new SIP account" +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." msgstr "" #: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" +msgid "Add a new SIP account" msgstr "" -#: ui/accountcreationwizard.ui:134 -msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." +#: ui/accountcreationwizard.ui:234 +msgid "Archive" msgstr "" -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." msgstr "" -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "PIN-a" + +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." msgstr "" -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." msgstr "" -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Hurengoa" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Kontua" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "" -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Erabiltzaile-izena" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "Jauzi" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "" -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "" - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "Ados" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "Sistema" @@ -498,7 +538,7 @@ msgstr "Orokorra" msgid "Media" msgstr "Multimedia" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Ezarpenak" @@ -585,6 +625,10 @@ msgstr "" msgid "Enter archive password" msgstr "" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Ezeztatu" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "" @@ -601,10 +645,6 @@ msgstr "" msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "" @@ -996,12 +1036,13 @@ msgid "Choose download folder" msgstr "" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "" @@ -1063,90 +1104,90 @@ msgstr "" msgid "Add account…" msgstr "" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Sarrera-deia" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Garbitu historiala" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "Blokeatu kontaktua" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1223,10 +1264,53 @@ msgstr "" msgid "- GNOME client for Jami" msgstr "" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "" + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1249,10 +1333,6 @@ msgstr "Jami komunikazio unibertsalerako software librea da, erabiltzaileek aska msgid "Send File" msgstr "" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1315,22 +1395,6 @@ msgstr "" msgid "New password" msgstr "Pasahitz berria" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "" - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "" diff --git a/po/fa_IR.po b/po/fa_IR.po index 28dd5ec5..5d6862a8 100644 --- a/po/fa_IR.po +++ b/po/fa_IR.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" -"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" +"Last-Translator: Reza Ghasemi\n" "Language-Team: Persian (Iran) (http://www.transifex.com/savoirfairelinux/jami/language/fa_IR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -181,7 +181,8 @@ msgstr "نام مستعار" msgid "RingID" msgstr "آیدی رینگ" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "گذرواژه" @@ -270,135 +271,174 @@ msgstr "انتقال" msgid "Transfer to" msgstr "انتقال به" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "خوش آمدید به" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" -msgstr "ایجاد حساب جمی" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" +msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "لغو" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "پیشرفته" -#: ui/accountcreationwizard.ui:97 +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." +msgstr "" + +#: ui/accountcreationwizard.ui:119 msgid "Add a new SIP account" msgstr "افزودن یک حساب کاربری جدید SIP" -#: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "پیوند این دستگاه به یک حساب کاربری موجود" +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" -#: ui/accountcreationwizard.ui:134 -msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." msgstr "" -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "پین خود را وارد کنید:" +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "پین" -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" -msgstr "یا درونریزی یک پرونده:" +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." +msgstr "" -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "گذرواژه خود را وارد کنید:" +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "پیشین" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "بعدی" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "نمایه" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "حساب کاربری" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "ثبت نام کاربری" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "" -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "نام کاربری" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "از این گذرواژه برای رمزنگاری داده های حساب شما و برای پیوند دادن دستگاه های جدید به حساب شما استفاده خواهد شد." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "تأیید گذرواژه" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "برونریزی حساب" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "اسکیپ" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "ثبت نام کاربری..." -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "این ممکن است چند دقیقه طول بکشد." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "خطا در ایجاد/بارگذاری حساب کاربری." - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "خب" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "سیستم" @@ -503,7 +543,7 @@ msgstr "همگانی" msgid "Media" msgstr "رسانه" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "تنظیمات" @@ -590,6 +630,10 @@ msgstr "گذرواژ (الزامی):" msgid "Enter archive password" msgstr "گذرواژه آرشیو را وارد کنید" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "لغو" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "" @@ -606,10 +650,6 @@ msgstr "پین تولید شده شما:" msgid "Click to change password" msgstr "برای تغییر گذرواژه کلیک کنید" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "برونریزی حساب" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "فعال سازی حساب کاربری" @@ -1001,12 +1041,13 @@ msgid "Choose download folder" msgstr "انتخاب پوشه دانلود" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "_لغو" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "_ذخیره" @@ -1068,90 +1109,90 @@ msgstr "ارسال پیام ضبط شده" msgid "Add account…" msgstr "افزودن حساب..." -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "گشودن گپ" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "خروج از صفحهٔ تنظیمات" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "تماس ورودی" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "درخواست جدید از جانب" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "درخواست اعتماد" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "پیام جدید" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "پاکسازی تاریخچه" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "مسدودسازی مخاطب" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1228,10 +1269,53 @@ msgstr "" msgid "- GNOME client for Jami" msgstr "" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "گذرواژهها یکسان نیستند" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "ذخیره فایل" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "حساب صادر شد!" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "" + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1254,10 +1338,6 @@ msgstr "جمی نرمافزار آزاد برای ارتباط جهانی ا msgid "Send File" msgstr "ارسال فایل" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "ذخیره فایل" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1320,22 +1400,6 @@ msgstr "گذرواژه فعلی" msgid "New password" msgstr "گذرواژهٔ نو" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "حساب صادر شد!" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "" - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "گذرواژهٔ بد" diff --git a/po/fi.po b/po/fi.po index ecf55d85..4724d4cd 100644 --- a/po/fi.po +++ b/po/fi.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" -"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" +"Last-Translator: Nikolay Korotkiy <sikmir@gmail.com>\n" "Language-Team: Finnish (http://www.transifex.com/savoirfairelinux/jami/language/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -178,7 +178,8 @@ msgstr "Lempinimi" msgid "RingID" msgstr "RingID" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Salasana" @@ -267,135 +268,174 @@ msgstr "Lähetys" msgid "Transfer to" msgstr "" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "Tervetuloa" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" -msgstr "Luo Jami tunnus" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" +msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Peru" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "" -#: ui/accountcreationwizard.ui:97 -msgid "Add a new SIP account" +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." msgstr "" #: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" +msgid "Add a new SIP account" msgstr "" -#: ui/accountcreationwizard.ui:134 -msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." +#: ui/accountcreationwizard.ui:234 +msgid "Archive" msgstr "" -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." msgstr "" -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "PIN" + +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." msgstr "" -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "Syötä salasanasi:" +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "Edellinen" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Seuraava" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Profiili" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Tunnus" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "Rekisteröi käyttäjänimi" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "" -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Käyttäjänimi" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Varmista salasana" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "Vie tunnus" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "" -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "" - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "OK" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "Järjestelmä" @@ -500,7 +540,7 @@ msgstr "Yleiset" msgid "Media" msgstr "Media" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Asetukset" @@ -587,6 +627,10 @@ msgstr "" msgid "Enter archive password" msgstr "" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Peru" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "" @@ -603,10 +647,6 @@ msgstr "" msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "Vie tunnus" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "" @@ -998,12 +1038,13 @@ msgid "Choose download folder" msgstr "" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "_Tallenna" @@ -1065,90 +1106,90 @@ msgstr "" msgid "Add account…" msgstr "Lisää tunnus…" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Saapuva puhelu" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "Uusi viesti" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Tyhjennä historia" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "Estä yhteystieto" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1225,10 +1266,53 @@ msgstr "" msgid "- GNOME client for Jami" msgstr "" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "Salasanat eivät täsmää" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Tallenna tiedosto" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "" + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1251,10 +1335,6 @@ msgstr "Jami on vapaa ja universaali viestintäalusta, joka kunnioittaa käyttä msgid "Send File" msgstr "Lähetä tiedosto" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Tallenna tiedosto" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1317,22 +1397,6 @@ msgstr "" msgid "New password" msgstr "Uusi salasana" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "" - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "" diff --git a/po/fr.po b/po/fr.po index 04249ac3..7db67225 100644 --- a/po/fr.po +++ b/po/fr.po @@ -27,9 +27,9 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" -"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" +"Last-Translator: 17373e25dc4e21ad6338b9498621c066\n" "Language-Team: French (http://www.transifex.com/savoirfairelinux/jami/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -195,7 +195,8 @@ msgstr "Nom du compte" msgid "RingID" msgstr "RingID" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Mot de passe" @@ -284,135 +285,174 @@ msgstr "Transféré" msgid "Transfer to" msgstr "Transférer à " -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "Bienvenue sur" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" -msgstr "Créer un compte Jami" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" +msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" -msgstr "Créer un nouveau compte Jami (pour les nouveaux utilisateurs)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" +msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" -msgstr "Importer un compte" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" +msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" -msgstr "Importer un compte à partir de votre NIP ou bien à partir d'un fichier d'archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" +msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Annuler" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "Avancé ..." -#: ui/accountcreationwizard.ui:97 +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." +msgstr "" + +#: ui/accountcreationwizard.ui:119 msgid "Add a new SIP account" msgstr "Ajouter un nouveau compte SIP" -#: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Lier cet appareil à un compte existant" +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" + +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." +msgstr "" -#: ui/accountcreationwizard.ui:134 +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "NIP" + +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." +msgstr "" + +#: ui/accountcreationwizard.ui:382 msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." -msgstr "Pour associer cet appareil à un compte Jami déjà existant sur un autre appareil, vous avez deux possibilités:\nVous pouvez importer votre compte via le réseau Jami. Pour cela vous devez obtenir un NIP du premier appareil. Aller dans la gestion du compte du premier appareil et choisissez \"Associer un autre appareil à ce compte\". Vous obtiendrez alors un NIP qui sera valide 10 minutes sur le réseau.\nVous pouvez également importer votre compte en important une archive de compte Jami." - -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "Entrez votre NIP :" - -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" -msgstr "Ou importer une archive : " - -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "Entrez votre mot de passe :" - -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" + +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "Précédent" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Suivant" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Profil" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Compte" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "Enregistrer le nom d'utilisateur" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "En cochant cette case, vous enregistrez un nom d'utilisateur unique sur le réseau Jami. Les personnes peuvent l'utiliser pour vous contacter au lieu d'utiliser votre identifiant de 40 caractères." -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Nom d’utilisateur" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "Ce mot de passe sera utilisé pour crypter vos données et pour connecter vos nouveaux appareils à votre compte." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Confirmer le mot de passe" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "Génération de votre compte Jami..." -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "Exporter compte" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "Passer" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "Enregistrement du nom d'utilisateur …" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "Cela peut prendre quelques minutes." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "Récupération de votre compte Jami …" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "Erreur lors de la création ou du chargement du compte." - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "OK" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "Système" @@ -475,23 +515,23 @@ msgstr "Effacer tout l’historique" #: ui/generalsettingsview.ui:595 msgid "Call Recording" -msgstr "" +msgstr "Enregistrement d'appel" #: ui/generalsettingsview.ui:633 msgid "Record local video" -msgstr "" +msgstr "Enregistrer la vidéo locale" #: ui/generalsettingsview.ui:669 msgid "Always record calls" -msgstr "" +msgstr "Toujours enregistrer les appels" #: ui/generalsettingsview.ui:706 msgid "Record folder" -msgstr "" +msgstr "Répertoire des fichiers d'enregistrements" #: ui/generalsettingsview.ui:743 msgid "Bitrate for call recordings (kb/s)" -msgstr "" +msgstr "Débit pour l'enregistrement d'appel (kb/s) " #: ui/profile.ui:58 msgid "Informations" @@ -517,7 +557,7 @@ msgstr "Général" msgid "Media" msgstr "Médias" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Paramètres" @@ -604,6 +644,10 @@ msgstr "Mot de passe :" msgid "Enter archive password" msgstr "Entrez ici le mot de passe de l’archive" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Annuler" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "Exporter sur le réseau" @@ -620,10 +664,6 @@ msgstr "Votre NIP généré :" msgid "Click to change password" msgstr "Cliquer ici pour changer le mot de passe" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "Exporter compte" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "Activer le compte" @@ -1015,12 +1055,13 @@ msgid "Choose download folder" msgstr "Choisissez le dossier de téléchargement" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "_Annuler" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "_Sauvegarder" @@ -1082,90 +1123,90 @@ msgstr "Envoyer le message enregistré" msgid "Add account…" msgstr "Ajouter un compte ..." -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "Appeler" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "Ouvrir la discussion" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" -msgstr "" +msgstr "Jami - Migration nécessaire" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." -msgstr "" +msgstr "Migration en cours ... S'il vous plaît, ne fermez pas la fenêtre." -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "Rechercher dans les contacts ou appeler un numéro" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "Quitter la page des réglages" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "Il y a des appels en cours" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "vous appelle" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Appel entrant" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "Nouvelle demande de " -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "Invitation" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "Nouveau message" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "Mettre fin à l'appel en cours?" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "I y a un appel en cours. Désirez vous fermer la fenêtre et mettre fin à tous les appels en cours?" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Effacer l'historique" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "Voulez-vous vraiment effacer l'historique de cette conversation ?" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "Supprimer la conversation" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "Êtes-vous certain de vouloir supprimer cette conversation ? " -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "Bloquer le contact" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "Souhaitez-vous vraiment bloquer ce contact ?" @@ -1242,10 +1283,53 @@ msgstr "Restaurer l’état caché de la fenêtre principale (applicable seuleme msgid "- GNOME client for Jami" msgstr "- le client GNOME de Jami" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "Les mots de passes ne correspondent pas" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Sauvegarder" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "Vous devez entrer votre mot de passe pour exporter l'archive" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "Entrer le mot de passe pour exporter l'archive" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "Le compte a été exporté." + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "Échec de l'export de compte." + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1268,10 +1352,6 @@ msgstr "Jami est un logiciel libre de communication universel qui respecte la vi msgid "Send File" msgstr "Envoyez un fichier" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Sauvegarder" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1334,22 +1414,6 @@ msgstr "Mot de passe actuel" msgid "New password" msgstr "Nouveau mot de passe" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "Vous devez entrer votre mot de passe pour exporter l'archive" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "Entrer le mot de passe pour exporter l'archive" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "Le compte a été exporté." - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "Échec de l'export de compte." - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "Mot de passe incorrect" diff --git a/po/fr_BE.po b/po/fr_BE.po index ae0dc0f5..0587f19a 100644 --- a/po/fr_BE.po +++ b/po/fr_BE.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" "Language-Team: French (Belgium) (http://www.transifex.com/savoirfairelinux/jami/language/fr_BE/)\n" "MIME-Version: 1.0\n" @@ -175,7 +175,8 @@ msgstr "" msgid "RingID" msgstr "" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "" @@ -264,135 +265,174 @@ msgstr "" msgid "Transfer to" msgstr "" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Annuler" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "" -#: ui/accountcreationwizard.ui:97 -msgid "Add a new SIP account" +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." msgstr "" #: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" +msgid "Add a new SIP account" msgstr "" -#: ui/accountcreationwizard.ui:134 -msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." +#: ui/accountcreationwizard.ui:234 +msgid "Archive" msgstr "" -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." msgstr "" -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" +#: ui/accountcreationwizard.ui:287 +msgid "PIN" msgstr "" -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." msgstr "" -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" + +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "" -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "" -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "" - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "ok" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "" @@ -497,7 +537,7 @@ msgstr "Général" msgid "Media" msgstr "" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "" @@ -584,6 +624,10 @@ msgstr "" msgid "Enter archive password" msgstr "" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Annuler" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "" @@ -600,10 +644,6 @@ msgstr "" msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "" @@ -995,12 +1035,13 @@ msgid "Choose download folder" msgstr "" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "" @@ -1062,90 +1103,90 @@ msgstr "" msgid "Add account…" msgstr "" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1222,10 +1263,53 @@ msgstr "" msgid "- GNOME client for Jami" msgstr "" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "" + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1248,10 +1332,6 @@ msgstr "Jami est un logiciel libre de communication universel qui respecte la vi msgid "Send File" msgstr "" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1314,22 +1394,6 @@ msgstr "" msgid "New password" msgstr "" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "" - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "" diff --git a/po/fr_CA.po b/po/fr_CA.po index 1c6c50cb..0f1bb3d9 100644 --- a/po/fr_CA.po +++ b/po/fr_CA.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" -"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" +"Last-Translator: Badr El Berdai\n" "Language-Team: French (Canada) (http://www.transifex.com/savoirfairelinux/jami/language/fr_CA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -180,7 +180,8 @@ msgstr "Alias" msgid "RingID" msgstr "Identifiant Ring" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Mot de passe" @@ -269,135 +270,174 @@ msgstr "Transfert" msgid "Transfer to" msgstr "" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Annuler" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" + +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "" -#: ui/accountcreationwizard.ui:97 -msgid "Add a new SIP account" +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." msgstr "" #: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Associer cet appareil avec un compte existant" +msgid "Add a new SIP account" +msgstr "" -#: ui/accountcreationwizard.ui:134 -msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." +#: ui/accountcreationwizard.ui:234 +msgid "Archive" msgstr "" -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "Entrer votre NIP :" +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." +msgstr "" -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" -msgstr "Ou importer une archive de compte Ring :" +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "NIP" -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "Entrer votre mot de passe :" +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." +msgstr "" + +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "Précédent" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Suivant" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Profil" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Compte" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "" -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Nom d'utilisateur" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Confirmer le mot de passe" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "Cette opération peut prendre plusieurs minutes." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "" - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "OK" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "Système" @@ -502,7 +542,7 @@ msgstr "Général" msgid "Media" msgstr "Média" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Réglages" @@ -589,6 +629,10 @@ msgstr "Mot de passe :" msgid "Enter archive password" msgstr "" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Annuler" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "" @@ -605,10 +649,6 @@ msgstr "Votre NIP généré :" msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "" @@ -1000,12 +1040,13 @@ msgid "Choose download folder" msgstr "" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "_Annuler" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "" @@ -1067,90 +1108,90 @@ msgstr "" msgid "Add account…" msgstr "" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "Appeler" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "Ouvrir le clavardage" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "Rechercher des contacts ou entrer le numéro" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Appel entrant" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Effacer l'historique" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1227,10 +1268,53 @@ msgstr "" msgid "- GNOME client for Jami" msgstr "" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "Les mots de passes en sont pas identiques" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Enregistrer le fichier" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "" + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1253,10 +1337,6 @@ msgstr "Jami est un logiciel libre de communication universel qui respecte la vi msgid "Send File" msgstr "" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Enregistrer le fichier" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1319,22 +1399,6 @@ msgstr "" msgid "New password" msgstr "Nouveau mot de passe" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "" - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "Mauvais mot de passe" diff --git a/po/fr_CH.po b/po/fr_CH.po index 037797b6..4f7ce8a8 100644 --- a/po/fr_CH.po +++ b/po/fr_CH.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" "Language-Team: French (Switzerland) (http://www.transifex.com/savoirfairelinux/jami/language/fr_CH/)\n" "MIME-Version: 1.0\n" @@ -176,7 +176,8 @@ msgstr "" msgid "RingID" msgstr "" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "" @@ -265,135 +266,174 @@ msgstr "" msgid "Transfer to" msgstr "" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Annuler" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "" -#: ui/accountcreationwizard.ui:97 -msgid "Add a new SIP account" +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." msgstr "" #: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" +msgid "Add a new SIP account" msgstr "" -#: ui/accountcreationwizard.ui:134 -msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." +#: ui/accountcreationwizard.ui:234 +msgid "Archive" msgstr "" -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." msgstr "" -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" +#: ui/accountcreationwizard.ui:287 +msgid "PIN" msgstr "" -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." msgstr "" -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" + +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "" -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "" -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "" - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "ok" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "" @@ -498,7 +538,7 @@ msgstr "Général" msgid "Media" msgstr "" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "" @@ -585,6 +625,10 @@ msgstr "" msgid "Enter archive password" msgstr "" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Annuler" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "" @@ -601,10 +645,6 @@ msgstr "" msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "" @@ -996,12 +1036,13 @@ msgid "Choose download folder" msgstr "" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "" @@ -1063,90 +1104,90 @@ msgstr "" msgid "Add account…" msgstr "" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1223,10 +1264,53 @@ msgstr "" msgid "- GNOME client for Jami" msgstr "" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "" + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1249,10 +1333,6 @@ msgstr "Jami est un logiciel libre de communication universel qui respecte la vi msgid "Send File" msgstr "" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1315,22 +1395,6 @@ msgstr "" msgid "New password" msgstr "" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "" - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "" diff --git a/po/fr_FR.po b/po/fr_FR.po index 534f5213..abb3cb4f 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" "Language-Team: French (France) (http://www.transifex.com/savoirfairelinux/jami/language/fr_FR/)\n" "MIME-Version: 1.0\n" @@ -175,7 +175,8 @@ msgstr "" msgid "RingID" msgstr "" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "" @@ -264,135 +265,174 @@ msgstr "Transférer" msgid "Transfer to" msgstr "" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "" -#: ui/accountcreationwizard.ui:97 -msgid "Add a new SIP account" +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." msgstr "" #: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" +msgid "Add a new SIP account" msgstr "" -#: ui/accountcreationwizard.ui:134 -msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" + +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." msgstr "" -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" +#: ui/accountcreationwizard.ui:287 +msgid "PIN" msgstr "" -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." msgstr "" -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." msgstr "" -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "compte" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "" -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "nom d'utilisateur" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "" -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "" - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "Système" @@ -497,7 +537,7 @@ msgstr "Général" msgid "Media" msgstr "" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "" @@ -584,6 +624,10 @@ msgstr "" msgid "Enter archive password" msgstr "" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "" @@ -600,10 +644,6 @@ msgstr "" msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "" @@ -995,12 +1035,13 @@ msgid "Choose download folder" msgstr "" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "" @@ -1062,90 +1103,90 @@ msgstr "" msgid "Add account…" msgstr "" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Vider l'historique" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1222,10 +1263,53 @@ msgstr "" msgid "- GNOME client for Jami" msgstr "" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "" + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1248,10 +1332,6 @@ msgstr "Jami est un logiciel libre de communication universel qui respecte la vi msgid "Send File" msgstr "" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1314,22 +1394,6 @@ msgstr "" msgid "New password" msgstr "Nouveau mot de passe" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "" - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "" diff --git a/po/he.po b/po/he.po index 73a4fbae..41a144a8 100644 --- a/po/he.po +++ b/po/he.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" "Language-Team: Hebrew (http://www.transifex.com/savoirfairelinux/jami/language/he/)\n" "MIME-Version: 1.0\n" @@ -177,7 +177,8 @@ msgstr "כינוי" msgid "RingID" msgstr "" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "סיסמה" @@ -266,135 +267,174 @@ msgstr "העבר" msgid "Transfer to" msgstr "" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "ביטול" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "" -#: ui/accountcreationwizard.ui:97 -msgid "Add a new SIP account" +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." msgstr "" #: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" +msgid "Add a new SIP account" msgstr "" -#: ui/accountcreationwizard.ui:134 -msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." +#: ui/accountcreationwizard.ui:234 +msgid "Archive" msgstr "" -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." msgstr "" -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" +#: ui/accountcreationwizard.ui:287 +msgid "PIN" msgstr "" -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." msgstr "" -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" + +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "קדימה" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "פרופיל" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "חשבון" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "" -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "שם משתמש" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "" -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "" - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "" @@ -499,7 +539,7 @@ msgstr "כלליות" msgid "Media" msgstr "מדיה" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "הגדרות" @@ -586,6 +626,10 @@ msgstr "" msgid "Enter archive password" msgstr "" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "ביטול" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "" @@ -602,10 +646,6 @@ msgstr "" msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "" @@ -997,12 +1037,13 @@ msgid "Choose download folder" msgstr "" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "_ביטול" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "" @@ -1064,90 +1105,90 @@ msgstr "" msgid "Add account…" msgstr "" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "חפש אנשי קשר או הזן מספר" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "קריאה נכנסת" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1224,10 +1265,53 @@ msgstr "" msgid "- GNOME client for Jami" msgstr "" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "סיסמאות לא תואמות" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "" + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1250,10 +1334,6 @@ msgstr "" msgid "Send File" msgstr "" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1316,22 +1396,6 @@ msgstr "" msgid "New password" msgstr "" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "" - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "סיסמה רעה" diff --git a/po/hr.po b/po/hr.po index e44ad3b5..bc8b1ecc 100644 --- a/po/hr.po +++ b/po/hr.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" -"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" +"Last-Translator: Ivica Kolić <ikoli@yahoo.com>\n" "Language-Team: Croatian (http://www.transifex.com/savoirfairelinux/jami/language/hr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -176,7 +176,8 @@ msgstr "Alias" msgid "RingID" msgstr "" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Lozinka" @@ -265,135 +266,174 @@ msgstr "Prenesi" msgid "Transfer to" msgstr "" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Poništi" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "" -#: ui/accountcreationwizard.ui:97 -msgid "Add a new SIP account" +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." msgstr "" #: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" +msgid "Add a new SIP account" msgstr "" -#: ui/accountcreationwizard.ui:134 -msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." +#: ui/accountcreationwizard.ui:234 +msgid "Archive" msgstr "" -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." msgstr "" -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "PIN" + +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." msgstr "" -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." msgstr "" -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Slijedeće" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Profil" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Račun" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "" -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Korisničko ime" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Potvrdi lozinku" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "Preskoči" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "" -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "" - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "U redu" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "Sustav" @@ -498,7 +538,7 @@ msgstr "Opće" msgid "Media" msgstr "Medij" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Postavke" @@ -585,6 +625,10 @@ msgstr "" msgid "Enter archive password" msgstr "" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Poništi" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "" @@ -601,10 +645,6 @@ msgstr "" msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "" @@ -996,12 +1036,13 @@ msgid "Choose download folder" msgstr "" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "" @@ -1063,90 +1104,90 @@ msgstr "" msgid "Add account…" msgstr "" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "Traži kontakt ili unesi broj" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Dolazni poziv" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Očisti povijest" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "Blokiraj kontakt" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1223,10 +1264,53 @@ msgstr "" msgid "- GNOME client for Jami" msgstr "" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Spremi datoteku" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "" + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1249,10 +1333,6 @@ msgstr "" msgid "Send File" msgstr "" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Spremi datoteku" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1315,22 +1395,6 @@ msgstr "" msgid "New password" msgstr "Nova lozinka" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "" - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "" diff --git a/po/hu.po b/po/hu.po index 5b91b5a0..d62ea6c2 100644 --- a/po/hu.po +++ b/po/hu.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" -"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" +"Last-Translator: . . <ovari123@zoho.com>\n" "Language-Team: Hungarian (http://www.transifex.com/savoirfairelinux/jami/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -178,7 +178,8 @@ msgstr "Álnév" msgid "RingID" msgstr "Jami azonosító" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Jelszó" @@ -267,135 +268,174 @@ msgstr "Átvitel" msgid "Transfer to" msgstr "Átirányítás" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "Isten hozott" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" -msgstr "Jami fiók létrehozása" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" +msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" -msgstr "Új Jami fiók létrehozása (új felhasználóknak)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" +msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" -msgstr "Fiók importálása" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" +msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" -msgstr "Fiók importálása PIN-kóddal vagy archívummal" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" +msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Mégse" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "Haladó…" -#: ui/accountcreationwizard.ui:97 +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." +msgstr "" + +#: ui/accountcreationwizard.ui:119 msgid "Add a new SIP account" msgstr "Új SIP fiók hozzáadása" -#: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Ezen eszköz egy létező fiókhoz kapcsolása" +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" + +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." +msgstr "" -#: ui/accountcreationwizard.ui:134 +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "PIN-kód" + +#: ui/accountcreationwizard.ui:349 msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." -msgstr "Az eszköz másik fiókhoz kapcsolásához kettő lehetőség van. Importálhatja fiókját a DHT-ből, de először PIN-kódra van szüksége. A PIN-kód előállításához menjen egy korábbi eszköz fiókkezelési beállításába, válassza ki a használandó Jami fiókot, és válassza a „Másik eszköz összekapcsolása ehhez a fiókhoz” lehetőséget. Meg fogja kapni az űrlap kitöltéséhez szükséges PIN-kódot. A PIN-kód csak 10 percig érvényes. Vagy közvetlenül importálhatja fiókját egy archívumból." - -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "Adja meg a PIN-kódját:" - -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" -msgstr "Vagy egy fájl importálása:" - -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "Adja meg a jelszót:" - -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." +msgstr "" + +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" + +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "Vissza" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Következő" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Profil" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Fiók" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "Felhasználónév bejegyeztetése" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "Ezt bejelölve, bejegyez egy egyedi felhasználónevet a Jami hálózaton. Az emberek ezt a Jami azonosítója (amely 40 karakter hosszú) helyett használhatják, hogy elérjék Önt." -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Felhasználónév" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "Ez a jelszó a fiókadatainak titkosítására lesz használva, és arra, hogy más eszközöket kapcsoljon a fiókjához." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Jelszó megerősítése" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "Jami fiók létrehozása…" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "Fiók exportálása" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "Átugrani" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "Felhasználónév bejegyeztetése…" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "Ez néhány percet is igénybe vehet." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "A Jami fiókja lekérése…" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "Hiba a fiók létrehozása/betöltése során." - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "OK" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "Rendszer" @@ -500,7 +540,7 @@ msgstr "Általános" msgid "Media" msgstr "Média" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Beállítások" @@ -522,7 +562,7 @@ msgstr "Hangkezelő:" #: ui/mediasettingsview.ui:52 msgid "Ringtone device:" -msgstr "Csengés eszköze:" +msgstr "Csengőhang eszköz:" #: ui/mediasettingsview.ui:64 msgid "Output device:" @@ -587,6 +627,10 @@ msgstr "Jelszó (kötelező):" msgid "Enter archive password" msgstr "Adja meg az archívum jelszót" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Mégse" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "Fiók exportálása a hálózaton" @@ -603,10 +647,6 @@ msgstr "Az előállított PIN:" msgid "Click to change password" msgstr "Kattintson a jelszó módosításához" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "Fiók exportálása" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "Fiók engedélyezése" @@ -998,12 +1038,13 @@ msgid "Choose download folder" msgstr "Letöltési mappa kiválasztása" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "_Mégse" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "_Mentés" @@ -1065,90 +1106,90 @@ msgstr "Felvett üzenet küldése" msgid "Add account…" msgstr "Fiók hozzáadása…" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "Hívás kezdeményezése" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "Csevegés megnyitása" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" -msgstr "" +msgstr "Jami - áttérés szükséges" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." -msgstr "" +msgstr "Az áttérés folyamatban van… Kérjük, ne zárja be ezt az ablakot." -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "Kapcsolatok keresése vagy szám beírása" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "A beállítási oldal elhagyása" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "Folyamatban lévő hívás(ok)" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr " hív!" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Bejövő hívás" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "Új kérés" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "Megbízható kérelem" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "Új üzenet" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "A jelenlegi hívás(ok) leállítása?" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "A hívás jelenleg folyamatban van. Be kívánja zárni az ablakot és az összes jelenlegi hívást?" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Előzmények törlése" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "Valóban szeretné törölni ennek a csevegésnek az előzményeit?" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "Társalgás törlése" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "Valóban szeretné törölni ezt a csevegését?" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "Kapcsolat letiltása" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "Valóban szeretné letiltani ezt a kapcsolatot?" @@ -1225,10 +1266,53 @@ msgstr "Visszaállítja a főablak rejtett állapotát (csak az elsődleges pél msgid "- GNOME client for Jami" msgstr "– GNOME ügyfél Jami számára" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "A jelszók nem egyeznek" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Fájl mentése" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "Meg kell adnia a jelszót, hogy exportálja a teljes archívumot." + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "Adja meg a jelszót az archívum exportálásához" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "A fiókot exportálták!" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "Fiók exportálási hiba." + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1251,10 +1335,6 @@ msgstr "A Jami (GNU csomag, korábban Ring) egy univerzális és elosztott közl msgid "Send File" msgstr "Fájl küldése" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Fájl mentése" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1317,22 +1397,6 @@ msgstr "Jelenlegi jelszó" msgid "New password" msgstr "Új jelszó" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "Meg kell adnia a jelszót, hogy exportálja a teljes archívumot." - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "Adja meg a jelszót az archívum exportálásához" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "A fiókot exportálták!" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "Fiók exportálási hiba." - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "Hibás jelszó" diff --git a/po/id.po b/po/id.po index a40c35a0..4595a188 100644 --- a/po/id.po +++ b/po/id.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" "Language-Team: Indonesian (http://www.transifex.com/savoirfairelinux/jami/language/id/)\n" "MIME-Version: 1.0\n" @@ -175,7 +175,8 @@ msgstr "" msgid "RingID" msgstr "" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "" @@ -264,135 +265,174 @@ msgstr "" msgid "Transfer to" msgstr "" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "" -#: ui/accountcreationwizard.ui:97 -msgid "Add a new SIP account" +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." msgstr "" #: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" +msgid "Add a new SIP account" msgstr "" -#: ui/accountcreationwizard.ui:134 -msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" + +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." msgstr "" -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" +#: ui/accountcreationwizard.ui:287 +msgid "PIN" msgstr "" -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." msgstr "" -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." msgstr "" -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Selanjutnya" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Profil" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Akun" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "" -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "" -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "" - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "" @@ -497,7 +537,7 @@ msgstr "" msgid "Media" msgstr "" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "" @@ -584,6 +624,10 @@ msgstr "" msgid "Enter archive password" msgstr "" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "" @@ -600,10 +644,6 @@ msgstr "" msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "" @@ -995,12 +1035,13 @@ msgid "Choose download folder" msgstr "" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "" @@ -1062,90 +1103,90 @@ msgstr "" msgid "Add account…" msgstr "" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1222,10 +1263,53 @@ msgstr "" msgid "- GNOME client for Jami" msgstr "" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "" + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1248,10 +1332,6 @@ msgstr "" msgid "Send File" msgstr "" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1314,22 +1394,6 @@ msgstr "" msgid "New password" msgstr "Kata sandi baru" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "" - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "" diff --git a/po/it.po b/po/it.po index 9ae1342f..e94277db 100644 --- a/po/it.po +++ b/po/it.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" "Language-Team: Italian (http://www.transifex.com/savoirfairelinux/jami/language/it/)\n" "MIME-Version: 1.0\n" @@ -179,7 +179,8 @@ msgstr "Alias" msgid "RingID" msgstr "RingID" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Password" @@ -268,135 +269,174 @@ msgstr "Trasferimento" msgid "Transfer to" msgstr "Trasferire a" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "Benvenuto a" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" -msgstr "Crea un account Jami" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" +msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" -msgstr "Crea un nuovo account Jami (per i nuovi utenti)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" +msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" -msgstr "Importa un account esistente" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" +msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" -msgstr "Importa un account con il tuo PIN o l'archivio del tuo account" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" +msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Cancella" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "Avanzate…" -#: ui/accountcreationwizard.ui:97 +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." +msgstr "" + +#: ui/accountcreationwizard.ui:119 msgid "Add a new SIP account" msgstr "Aggiungi un nuovo account SIP" -#: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Collega questo dispositivo a un account esistente" +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" + +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." +msgstr "" + +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "" + +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." +msgstr "" -#: ui/accountcreationwizard.ui:134 +#: ui/accountcreationwizard.ui:382 msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." -msgstr "Per collegare questo dispositivo a un altro account, hai due possibilità. Puoi importare il tuo account dal DHT, ma prima devi ottenere un codice PIN. Per generare il codice PIN, vai alle impostazioni di gestione dell'account di un dispositivo precedente, scegli l'account Jami da utilizzare e seleziona \"Collega un altro dispositivo a questo account\". Otterrai il PIN necessario per completare questo modulo. Il PIN è valido solo per 10 minuti. Oppure puoi importare direttamente il tuo account da un archivio." - -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "Inserisci il tuo pin:" - -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" -msgstr "O importa un file:" - -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "Inserisci la tua password:" - -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" + +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "Precedente" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Seguente" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Profilo" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Profilo" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "Registra il nome utente" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "Selezionando questo, registrerai un nome utente univoco sulla rete Jami. Le persone possono usarlo per contattarti invece di usare RingID, che è lungo 40 caratteri." -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Nome utente" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "Questa password verrà utilizzata per crittografare i dati del tuo account e per collegare nuovi dispositivi al tuo account." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Confermare password" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "Generare il tuo account Jami ..." -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "Esporta account" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "Registrazione nome utente ..." -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "Questo potrebbe richiedere alcuni minuti." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "Recupero del tuo account Jami ..." -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "Errore nella creazione / caricamento dell'account." - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "OK" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "Sistema" @@ -501,7 +541,7 @@ msgstr "Generale" msgid "Media" msgstr "Media" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Impostazioni" @@ -588,6 +628,10 @@ msgstr "Password (richiesto)" msgid "Enter archive password" msgstr "Digitare la password dell'archivio" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Cancella" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "Esporta sulla rete" @@ -604,10 +648,6 @@ msgstr "Il tuo pin generato:" msgid "Click to change password" msgstr "Clicca per cambiare la password" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "Esporta account" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "Abilita account" @@ -999,12 +1039,13 @@ msgid "Choose download folder" msgstr "Scegli la cartella di download" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "A_bbandonare" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "_Salva" @@ -1066,90 +1107,90 @@ msgstr "Invia un messaggio registrato" msgid "Add account…" msgstr "Aggiungi account…" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "Effettua chiamata" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "apri chat" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "Ricercare contatto o digitare un numero" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "Esci dalla pagina delle impostazioni" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "Ci sono chiamate attive" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "ti sta chiamando!" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Chiamata in arrivo" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "Nuova richiesta da" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "Richiesta fidata" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "Nuovo messaggio" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "Interrompe la chiamata corrente?" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "Una chiamata è attualmente in corso. Vuoi chiudere la finestra e interrompere tutte le chiamate correnti?" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Svuotare lo storico" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "Vuoi davvero cancellare la cronologia di questa conversazione?" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "Rimuovi conversazione" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "Vuoi davvero rimuovere questa conversazione?" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "Blocca contatto" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "Vuoi davvero bloccare questo contatto?" @@ -1226,10 +1267,53 @@ msgstr "Ristorare lo stato nascosto della finestra principale (applicabile solo msgid "- GNOME client for Jami" msgstr "- Client GNOME per Jami" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "Le password no corrispondono" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Salvare il file" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "È necessario inserire la password per esportare l'archivio completo." + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "Inserisci la password per esportare l'archivio" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "Account esportato!" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr " Esportazione account non riuscito." + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1252,10 +1336,6 @@ msgstr "Jami è un software gratuito per la comunicazione universale che rispett msgid "Send File" msgstr "Inviare file" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Salvare il file" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1318,22 +1398,6 @@ msgstr "Password attuale" msgid "New password" msgstr "Nuovo password" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "È necessario inserire la password per esportare l'archivio completo." - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "Inserisci la password per esportare l'archivio" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "Account esportato!" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr " Esportazione account non riuscito." - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "Cattiva password" diff --git a/po/it_IT.po b/po/it_IT.po index 14e59c5b..19477ee5 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" "Language-Team: Italian (Italy) (http://www.transifex.com/savoirfairelinux/jami/language/it_IT/)\n" "MIME-Version: 1.0\n" @@ -180,7 +180,8 @@ msgstr "Alias" msgid "RingID" msgstr "RingID" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Password" @@ -269,135 +270,174 @@ msgstr "Trasferisci" msgid "Transfer to" msgstr "Trasferire a" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "Benvenuto su" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" -msgstr "Crea un account Jami" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" +msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" -msgstr "Crea un nuovo account Jami (per i nuovi utenti)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" +msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" -msgstr "Importa un account esistente" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" +msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" -msgstr "Importa un account con il tuo PIN o l'archivio del tuo account" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" +msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Annulla" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "Avanzato..." -#: ui/accountcreationwizard.ui:97 +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." +msgstr "" + +#: ui/accountcreationwizard.ui:119 msgid "Add a new SIP account" msgstr "Aggiungi un nuovo account SIP" -#: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Collega questo dispositivo ad un account esistente" +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" + +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." +msgstr "" + +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "" + +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." +msgstr "" -#: ui/accountcreationwizard.ui:134 +#: ui/accountcreationwizard.ui:382 msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." -msgstr "Per collegare questo dispositivo a un altro account, hai due possibilità. Puoi importare il tuo account dal DHT, ma prima devi ottenere un codice PIN. Per generare il codice PIN, vai alle impostazioni di gestione dell'account di un dispositivo precedente, scegli l'account Jami da utilizzare e seleziona \"Collega un altro dispositivo a questo account\". Otterrai il PIN necessario per completare questo modulo. Il PIN è valido solo per 10 minuti. Oppure puoi importare direttamente il tuo account da un archivio." - -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "Inserire il pin:" - -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" -msgstr "O importa un file:" - -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "Inserire la password:" - -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" + +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "Precedente" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Prossimo" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Profilo" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Utente" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "Registra il nome utente" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "Controllando questo, registrerai un nome utente univoco sulla rete Jami. Le persone possono usarlo per contattarti invece di usare RingID, che è lungo 40 caratteri." -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Utente" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "Questa password verrà utilizzata per crittografare i tuoi dati dell'account e per collegare i nuovi dispositivi al tuo account." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Conferma password" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "Generare il tuo account Jami ..." -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "Esporta account" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "Registrazione nome utente ..." -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "Questa operazione potrebbe richiedere alcuni minuti." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "Recupero del tuo account Jami ..." -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "Errore di creazione/caricamento account." - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "OK" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "Sistema" @@ -502,7 +542,7 @@ msgstr "Generale" msgid "Media" msgstr "Media" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Opzioni" @@ -589,6 +629,10 @@ msgstr "Password (obbligatorio):" msgid "Enter archive password" msgstr "Immetti password archivio" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Annulla" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "Esporta sulla rete" @@ -605,10 +649,6 @@ msgstr "Il pin generato per te:" msgid "Click to change password" msgstr "Clicca per cambiare la password" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "Esporta account" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "Abilita account" @@ -1000,12 +1040,13 @@ msgid "Choose download folder" msgstr "Scegli la cartella di download" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "_Annulla" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "_Salva" @@ -1067,90 +1108,90 @@ msgstr "Invia un messaggio registrato" msgid "Add account…" msgstr "Aggiungi account…" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "chiama" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "apri chat" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "Cerca tra i contatti o inserisci un numero" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "Lascia la pagina delle impostazioni" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "Ci sono chiamate attive" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "ti sta chiamando!" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Chiamata in ingresso" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "Nuova richiesta da" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "Richiesta fidata" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "Nuovo messaggio" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "Interrompe la chiamata corrente?" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "Una chiamata è attualmente in corso. Vuoi chiudere la finestra e interrompere tutte le chiamate correnti?" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Elimina cronologia" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "Vuoi davvero cancellare la cronologia di questa conversazione?" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "Rimuovi conversazione" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "Vuoi davvero rimuovere questa conversazione?" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "Blocca contatto" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "Vuoi davvero bloccare questo contatto?" @@ -1227,10 +1268,53 @@ msgstr "Ripristina lo stato nascosto della finestra principale (applicabile solo msgid "- GNOME client for Jami" msgstr "- Client GNOME per Jami" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "Le password non coincidono" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Salva File" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "È necessario inserire la password per esportare l'archivio completo." + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "Inserisci la password per esportare l'archivio" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "Account esportato!" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "Esportazione account fallito." + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1253,10 +1337,6 @@ msgstr "Jami è un software gratuito per la comunicazione universale che rispett msgid "Send File" msgstr "Invia file" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Salva File" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1319,22 +1399,6 @@ msgstr "Password attuale" msgid "New password" msgstr "Nuova password" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "È necessario inserire la password per esportare l'archivio completo." - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "Inserisci la password per esportare l'archivio" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "Account esportato!" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "Esportazione account fallito." - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "Password scarsa" diff --git a/po/ja.po b/po/ja.po index ba054afa..b8e1a550 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" "Language-Team: Japanese (http://www.transifex.com/savoirfairelinux/jami/language/ja/)\n" "MIME-Version: 1.0\n" @@ -177,7 +177,8 @@ msgstr "別名" msgid "RingID" msgstr "RingID" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "パスワード" @@ -266,135 +267,174 @@ msgstr "転送" msgid "Transfer to" msgstr "" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "キャンセル" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "" -#: ui/accountcreationwizard.ui:97 -msgid "Add a new SIP account" +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." msgstr "" #: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" +msgid "Add a new SIP account" msgstr "" -#: ui/accountcreationwizard.ui:134 -msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." +#: ui/accountcreationwizard.ui:234 +msgid "Archive" msgstr "" -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." msgstr "" -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" +#: ui/accountcreationwizard.ui:287 +msgid "PIN" msgstr "" -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." msgstr "" -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" + +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "次へ" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "プロフィール" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "アカウント" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "" -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "ユーザー名" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "パスワードの再入力" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "" -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "" - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "OK" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "システム" @@ -499,7 +539,7 @@ msgstr "全般" msgid "Media" msgstr "メディア" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "設定" @@ -586,6 +626,10 @@ msgstr "" msgid "Enter archive password" msgstr "" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "キャンセル" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "" @@ -602,10 +646,6 @@ msgstr "" msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "" @@ -997,12 +1037,13 @@ msgid "Choose download folder" msgstr "" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "キャンセル(_C)" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "" @@ -1064,90 +1105,90 @@ msgstr "" msgid "Add account…" msgstr "" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "通話を開始" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "チャットを開く" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "連絡先または番号を検索" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "着信" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "履歴をクリア" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1224,10 +1265,53 @@ msgstr "メインウィンドウの隠し状態を復元します (最初のイ msgid "- GNOME client for Jami" msgstr "" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "パスワードが一致しません" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "" + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1250,10 +1334,6 @@ msgstr "" msgid "Send File" msgstr "" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1316,22 +1396,6 @@ msgstr "" msgid "New password" msgstr "新しいパスワード" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "" - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "パスワードが正しくありません" diff --git a/po/ko_KR.po b/po/ko_KR.po index c2ed8501..0139d85c 100644 --- a/po/ko_KR.po +++ b/po/ko_KR.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" "Language-Team: Korean (Korea) (http://www.transifex.com/savoirfairelinux/jami/language/ko_KR/)\n" "MIME-Version: 1.0\n" @@ -175,7 +175,8 @@ msgstr "별칭" msgid "RingID" msgstr "" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "암호" @@ -264,135 +265,174 @@ msgstr "보내기" msgid "Transfer to" msgstr "" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "취소" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "" -#: ui/accountcreationwizard.ui:97 -msgid "Add a new SIP account" +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." msgstr "" #: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" +msgid "Add a new SIP account" msgstr "" -#: ui/accountcreationwizard.ui:134 -msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." +#: ui/accountcreationwizard.ui:234 +msgid "Archive" msgstr "" -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." msgstr "" -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" +#: ui/accountcreationwizard.ui:287 +msgid "PIN" msgstr "" -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." msgstr "" -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" + +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "이전" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "다음" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "프로필" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "계정" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "" -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "사용자명" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "암호 확인" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "" -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "" - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "" @@ -497,7 +537,7 @@ msgstr "일반" msgid "Media" msgstr "" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "설정" @@ -584,6 +624,10 @@ msgstr "" msgid "Enter archive password" msgstr "" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "취소" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "" @@ -600,10 +644,6 @@ msgstr "" msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "" @@ -995,12 +1035,13 @@ msgid "Choose download folder" msgstr "" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "" @@ -1062,90 +1103,90 @@ msgstr "" msgid "Add account…" msgstr "" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1222,10 +1263,53 @@ msgstr "" msgid "- GNOME client for Jami" msgstr "" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "파일 저장" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "" + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1248,10 +1332,6 @@ msgstr "" msgid "Send File" msgstr "" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "파일 저장" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1314,22 +1394,6 @@ msgstr "" msgid "New password" msgstr "" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "" - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "" diff --git a/po/lt.po b/po/lt.po index 056cda1e..21d132d5 100644 --- a/po/lt.po +++ b/po/lt.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" -"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" +"Last-Translator: Moo\n" "Language-Team: Lithuanian (http://www.transifex.com/savoirfairelinux/jami/language/lt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -178,7 +178,8 @@ msgstr "Slapyvardis" msgid "RingID" msgstr "RingID" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Slaptažodis" @@ -267,135 +268,174 @@ msgstr "" msgid "Transfer to" msgstr "" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "Sveiki atvykę į" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" -msgstr "Susikurti Jami paskyrą" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" +msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" -msgstr "Susikurti naują Jami paskyrą (naujiems naudotojams)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" +msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" -msgstr "Importuoti esamą paskyrą" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" +msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" -msgstr "Importuoti paskyrą naudojant savo PIN ar paskyros archyvą" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" +msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Atsisakyti" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "Išplėstiniai…" -#: ui/accountcreationwizard.ui:97 +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." +msgstr "" + +#: ui/accountcreationwizard.ui:119 msgid "Add a new SIP account" msgstr "Pridėti naują SIP paskyrą" -#: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Susieti šį įrenginį su esama paskyra" +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" + +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." +msgstr "" + +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "PIN" + +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." +msgstr "" -#: ui/accountcreationwizard.ui:134 +#: ui/accountcreationwizard.ui:382 msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." -msgstr "Norėdami susieti šį įrenginį su kita paskyra, jūs turite dvi galimybes. Galite importuoti savo paskyrą iš DHT, bet iš pradžių, turėsite gauti PIN kodą. Norėdami sukurti PIN kodą, pereikite ankstesniame įrenginyje į paskyros tvarkymo nustatymą, pasirinkite norimą naudoti Jami paskyrą ir pasirinkite \"Susieti kitą įrenginį su šia paskyra\". Jūs gausite šiai formai užpildyti reikalingą PIN kodą. PIN kodas galioja tik 10 minučių. Arba galite tiesiogiai importuoti savo paskyrą iš archyvo." - -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "Įveskite savo pin:" - -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" -msgstr "Arba importuokite failą:" - -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "Įveskite savo slaptažodį:" - -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" + +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "Ankstesnis" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Kitas" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Profilis" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Paskyra" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "Registruoti naudotojo vardą" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "Tai pažymėję, jūs Jami tinkle užregistruosite unikalų naudotojo vardą. Norėdami su jumis susisiekti, žmonės galės jį naudoti vietoj jūsų RingID, kuris yra 40 simbolių ilgio." -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Naudotojo vardas" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "Šis slaptažodis bus naudojamas jūsų paskyros duomenų šifravimui ir, norint susieti naują įrenginį su jūsų paskyra." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Patvirtinkite slaptažodį" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "Kuriama jūsų Jami paskyra…" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "Eksportuoti paskyrą" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "Praleisti" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "Registruojamas naudotojo vardas…" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "Tai gali užtrukti kelias minutes." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "Gaunama jūsų Jami paskyra…" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "Klaida, kuriant/įkeliant paskyrą." - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "Gerai" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "Sistema" @@ -500,7 +540,7 @@ msgstr "Bendra" msgid "Media" msgstr "Medija" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Nustatymai" @@ -587,6 +627,10 @@ msgstr "Slaptažodis (būtinas):" msgid "Enter archive password" msgstr "Įveskite archyvo slaptažodį" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Atsisakyti" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "" @@ -603,10 +647,6 @@ msgstr "Jūsų sukurtas pin:" msgid "Click to change password" msgstr "Spustelėkite, norėdami pakeisti slaptažodį" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "Eksportuoti paskyrą" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "Įjungti paskyrą" @@ -998,12 +1038,13 @@ msgid "Choose download folder" msgstr "" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "_Atsisakyti" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "Į_rašyti" @@ -1065,90 +1106,90 @@ msgstr "" msgid "Add account…" msgstr "Pridėti paskyrą…" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "skambinti" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "atverti pokalbį" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "Ieškokite adresatų arba įveskite numerį" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "Išeiti iš nustatymų puslapio" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr " jums skambina!" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Gaunamasis skambutis" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "Nauja žinutė" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Išvalyti istoriją" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "Užblokuoti adresatą" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "Ar tikrai norite užblokuoti šį adresatą?" @@ -1225,10 +1266,53 @@ msgstr "Atkuria pagrindinio lango paslėptą būseną (pritaikoma tik pirminiam msgid "- GNOME client for Jami" msgstr "- GNOME kliento programa, skirta Jami" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "Slaptažodžiai nesutampa" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Įrašyti failą" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "Norėdami eksportuoti pilną archyvą, turite įvesti savo slaptažodį." + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "Norėdami eksportuoti archyvą, įveskite slaptažodį" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "Paskyra eksportuota!" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "Paskyros eksportavimas nepavyko." + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1251,10 +1335,6 @@ msgstr "Jami yra visuotiniam bendravimui skirta laisva programinė įranga, kuri msgid "Send File" msgstr "Siųsti failą" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Įrašyti failą" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1317,22 +1397,6 @@ msgstr "Dabartinis slaptažodis" msgid "New password" msgstr "Naujas slaptažodis" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "Norėdami eksportuoti pilną archyvą, turite įvesti savo slaptažodį." - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "Norėdami eksportuoti archyvą, įveskite slaptažodį" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "Paskyra eksportuota!" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "Paskyros eksportavimas nepavyko." - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "Blogas slaptažodis" diff --git a/po/ms.po b/po/ms.po index 64cee12e..28a2d7cc 100644 --- a/po/ms.po +++ b/po/ms.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" "Language-Team: Malay (http://www.transifex.com/savoirfairelinux/jami/language/ms/)\n" "MIME-Version: 1.0\n" @@ -175,7 +175,8 @@ msgstr "Nama panggilan" msgid "RingID" msgstr "" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Kara laluan" @@ -264,135 +265,174 @@ msgstr "Pindah" msgid "Transfer to" msgstr "" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Batal" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "" -#: ui/accountcreationwizard.ui:97 -msgid "Add a new SIP account" +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." msgstr "" #: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" +msgid "Add a new SIP account" msgstr "" -#: ui/accountcreationwizard.ui:134 -msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." +#: ui/accountcreationwizard.ui:234 +msgid "Archive" msgstr "" -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." msgstr "" -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" +#: ui/accountcreationwizard.ui:287 +msgid "PIN" msgstr "" -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." msgstr "" -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" + +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Akaun" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "" -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Nama pengguna" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Sahkan kata laluan" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "" -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "" - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "Sistem" @@ -497,7 +537,7 @@ msgstr "Utama" msgid "Media" msgstr "Media" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Aturan" @@ -584,6 +624,10 @@ msgstr "" msgid "Enter archive password" msgstr "" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Batal" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "" @@ -600,10 +644,6 @@ msgstr "" msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "" @@ -995,12 +1035,13 @@ msgid "Choose download folder" msgstr "" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "" @@ -1062,90 +1103,90 @@ msgstr "" msgid "Add account…" msgstr "" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Panggilan masuk" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Padamkan sejarah" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1222,10 +1263,53 @@ msgstr "" msgid "- GNOME client for Jami" msgstr "" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "" + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1248,10 +1332,6 @@ msgstr "" msgid "Send File" msgstr "" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1314,22 +1394,6 @@ msgstr "" msgid "New password" msgstr "Kata laluan baharu" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "" - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "" diff --git a/po/nb.po b/po/nb.po index 1fae5c2a..44f9d8cb 100644 --- a/po/nb.po +++ b/po/nb.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" -"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" +"Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/savoirfairelinux/jami/language/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -177,7 +177,8 @@ msgstr "Alias" msgid "RingID" msgstr "RingID" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Passord" @@ -266,135 +267,174 @@ msgstr "Overfør" msgid "Transfer to" msgstr "Overfør til" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "Velkommen til" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" -msgstr "Opprett Jami-konto" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" +msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" -msgstr "Opprett en ny Jami-konto (for nye brukere)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" +msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Avbryt" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" + +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "Avansert..." -#: ui/accountcreationwizard.ui:97 +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." +msgstr "" + +#: ui/accountcreationwizard.ui:119 msgid "Add a new SIP account" msgstr "Legg til ny SIP-konto" -#: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Lenk denne enheten til en eksisterende konto" +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" + +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." +msgstr "" + +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "PIN" -#: ui/accountcreationwizard.ui:134 +#: ui/accountcreationwizard.ui:349 msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." -msgstr "Du har to muligheter for å koble denne enheten til en annen konto. Du kan importere kontoen din fra DHT-en. Dette krever at du skaffer en PIN-kode. For å lage PIN-koden, besøk kontostyringsoppsettet på forrige enhet, velg Jami-kontoen som skal brukes og velg «Koble annen enhet til denne kontoen». Du får da PIN-koden som trengs for å fullføre denne dialogen. PIN-koden fungerer bare i 10 minutter. Alternativt kan du importere kontoen direkte fra et arkiv." - -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "Skriv inn din PIN:" - -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" -msgstr "Eller importer fil:" - -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "Skriv inn ditt passord:" - -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." +msgstr "" + +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" + +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "Forrige" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Neste" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Profil" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Konto" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "Registrer brukernavn" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "Ved å markere dette registrerer du et unikt brukernavn på Jami-nettverket. Folk kan bruke det for å kontakte deg i stedet for å bruke din 40tegns RingID." -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Brukernavn" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "Dette passordet vil brukes til å kryptere din kontodata og lenke nye enheter til din konto." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Bekreft passord" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "Oppretter Jami-kontoen din..." -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "Eksporter konto" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "Hopp over" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "Registrerer brukernavn..." -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "Dette kan ta noen minutter." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "Henter Jami-kontoen din" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "Feil ved oppretting/innlasting av konto." - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "OK" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "System" @@ -499,7 +539,7 @@ msgstr "Generell" msgid "Media" msgstr "Media" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Innstillinger" @@ -586,6 +626,10 @@ msgstr "Passord (påkrevd):" msgid "Enter archive password" msgstr "Skriv inn arkivpassord" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Avbryt" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "Eksporter på nettet" @@ -602,10 +646,6 @@ msgstr "Din genererte PIN:" msgid "Click to change password" msgstr "Klikk for å endre passord" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "Eksporter konto" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "Aktiver konto" @@ -997,12 +1037,13 @@ msgid "Choose download folder" msgstr "Velg nedlastingsmappe" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "_Avbryt" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "_Lagre" @@ -1064,90 +1105,90 @@ msgstr "Send innspilt melding" msgid "Add account…" msgstr "Legg til konto" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "utfør samtale" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "åpne sludring" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "Søk kontakter eller skriv inn nummer" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "Forlag oppsettside" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "Det er pågående samtaler" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "ringer deg!" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Innkommende samtale" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "Ny henvendelse fra" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "Stol på henvendelse" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "Ny melding" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "Stopp gjeldene samtale?" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "En samtale er oppkoblet. Ønsker du å lukke vinduet og avslutte alle samtaler?" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Slett historikk" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "Ønsker du virkelig å nullstille historikken for denne samtalen?" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "Fjern samtale" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "Ønsker du virkelig å fjerne denne samtalen?" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "Blokker kontakt" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "Ønsker du virkelig å blokkere denne kontakten?" @@ -1224,10 +1265,53 @@ msgstr "Tilbakestiller den skjulte tilstanden til hovedvinduet (gjelder kun for msgid "- GNOME client for Jami" msgstr "- GNOME-klient for Jami" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "Passordene er ikke like" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Lagre fil" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "Du må skrive inn passordet ditt for å eksportere hele arkivet." + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "Skriv inn passord for å eksportere arkiv" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "Konto eksportert!" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "Feil ved eksport av konto." + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1250,10 +1334,6 @@ msgstr "Jami er fri programvare for allsidig kommunikasjon som respekterer bruke msgid "Send File" msgstr "Send fil" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Lagre fil" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1316,22 +1396,6 @@ msgstr "Nåværende passord" msgid "New password" msgstr "Nytt passord" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "Du må skrive inn passordet ditt for å eksportere hele arkivet." - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "Skriv inn passord for å eksportere arkiv" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "Konto eksportert!" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "Feil ved eksport av konto." - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "Dårlig passord" diff --git a/po/nl.po b/po/nl.po index a52c50b5..a9723faa 100644 --- a/po/nl.po +++ b/po/nl.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" -"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" +"Last-Translator: Nathan Follens\n" "Language-Team: Dutch (http://www.transifex.com/savoirfairelinux/jami/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -178,7 +178,8 @@ msgstr "Alias" msgid "RingID" msgstr "Ring-ID" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Wachtwoord" @@ -267,135 +268,174 @@ msgstr "Overdracht" msgid "Transfer to" msgstr "Overdragen naar" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "Welkom bij" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" -msgstr "Jami-account aanmaken" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" +msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" -msgstr "Een nieuw Jami-account aanmaken (voor nieuwe gebruikers)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" +msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" -msgstr "Een bestaand account importeren" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" +msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" -msgstr "Importeer een account met uw pincode of het archief van uw account" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" +msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Annuleren" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "Geavanceerd…" -#: ui/accountcreationwizard.ui:97 +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." +msgstr "" + +#: ui/accountcreationwizard.ui:119 msgid "Add a new SIP account" msgstr "Voeg een nieuw SIP-account toe" -#: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Dit apparaat aan een bestaand account koppelen" +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" + +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." +msgstr "" -#: ui/accountcreationwizard.ui:134 +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "Pincode" + +#: ui/accountcreationwizard.ui:349 msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." -msgstr "Om dit apparaat aan een ander account te koppelen heeft u twee mogelijkheden. U kunt uw account importeren uit de DHT, maar eerst dient u een pincode te verkrijgen. Ga om de pincode te genereren naar de accountbeheerinstellingen van een vorig apparaat, kies het Ring-account dat u wilt gebruiken en selecteer ‘Een ander apparaat aan dit account koppelen’. U zult de pincode krijgen die u nodig heeft om dit proces te voltooien. De pincode is slechts 10 minuten geldig. U kunt uw account ook rechtstreeks uit een archiefbestand importeren." - -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "Voer uw pincode in:" - -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" -msgstr "Of importeer een bestand:" - -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "Voer uw wachtwoord in:" - -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." +msgstr "" + +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" + +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "Vorige" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Volgende" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Profiel" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Account" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "Gebruikersnaam registreren" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "Als u dit aanvinkt, zult u een unieke gebruikersnaam op het Jami-netwerk registreren. Andere personen kunnen deze gebruikersnaam gebruiken om u te bellen, in plaats van uw 40 tekens lange Ring-ID." -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Gebruikersnaam" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "Dit wachtwoord wordt gebruikt om uw accountgegevens te versleutelen en nieuwe apparaten aan uw account te koppelen." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Bevestig wachtwoord" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "Uw Jami-account wordt aangemaakt…" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "Account exporteren" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "Overslaan" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "Gebruikersnaam wordt geregistreerd…" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "Dit kan enkele minuten duren." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "Uw Jami-account wordt opgehaald…" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "Fout bij aanmaken/laden van account." - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "Oké" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "Systeem" @@ -500,7 +540,7 @@ msgstr "Algemeen" msgid "Media" msgstr "Media" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Instellingen" @@ -587,6 +627,10 @@ msgstr "Wachtwoord (vereist):" msgid "Enter archive password" msgstr "Voer archiefwachtwoord in" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Annuleren" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "Exporteren op het netwerk" @@ -603,10 +647,6 @@ msgstr "Uw gegenereerde pincode:" msgid "Click to change password" msgstr "Klik om het wachtwoord te wijzigen" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "Account exporteren" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "Account inschakelen" @@ -998,12 +1038,13 @@ msgid "Choose download folder" msgstr "Kies downloadmap" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "_Annuleren" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "Op_slaan" @@ -1065,90 +1106,90 @@ msgstr "Opgenomen bericht versturen" msgid "Add account…" msgstr "Account toevoegen…" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "oproep plaatsen" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "gesprek openen" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" -msgstr "" +msgstr "Jami - migratie vereist" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." -msgstr "" +msgstr "Migratie is bezig… Gelieve dit venster niet te sluiten." -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "Zoek contacten of voer een nummer in" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "Instellingspagina verlaten" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "Er zijn actieve oproepen" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "belt u!" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Inkomende oproep" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "Nieuw verzoek van" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "Vertrouwensverzoek" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "Nieuw bericht" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "Huidige oproep beëindigen?" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "U bent momenteel in gesprek. Wilt u het venster sluiten en alle huidige oproepen beëindigen?" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Geschiedenis wissen" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "Wilt u de geschiedenis van dit gesprek wissen?" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "Gesprek verwijderen" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "Wilt u dit gesprek echt verwijderen?" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "Contact blokkeren" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "Wilt u dit contact echt blokkeren?" @@ -1225,10 +1266,53 @@ msgstr "Herstelt de verborgen status van het hoofdscherm (alleen van toepassing msgid "- GNOME client for Jami" msgstr " - GNOME-cliënt voor Jami" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "Wachtwoorden komen niet overeen" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Bestand opslaan" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "U dient uw wachtwoord in te voeren om het volledige archief te exporteren." + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "Voer wachtwoord in om archief te exporteren" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "Account geëxporteerd!" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "Fout bij exporteren van account." + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1251,10 +1335,6 @@ msgstr "Jami is vrije software voor universele communicatie, die de vrijheden en msgid "Send File" msgstr "Bestand versturen" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Bestand opslaan" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1317,22 +1397,6 @@ msgstr "Huidig wachtwoord" msgid "New password" msgstr "Nieuw wachtwoord" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "U dient uw wachtwoord in te voeren om het volledige archief te exporteren." - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "Voer wachtwoord in om archief te exporteren" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "Account geëxporteerd!" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "Fout bij exporteren van account." - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "Slecht wachtwoord" diff --git a/po/nl_BE.po b/po/nl_BE.po index 712b6f0e..81748dcf 100644 --- a/po/nl_BE.po +++ b/po/nl_BE.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" "Language-Team: Dutch (Belgium) (http://www.transifex.com/savoirfairelinux/jami/language/nl_BE/)\n" "MIME-Version: 1.0\n" @@ -178,7 +178,8 @@ msgstr "Alias" msgid "RingID" msgstr "Ring-ID" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Paswoord" @@ -267,135 +268,174 @@ msgstr "Overdracht" msgid "Transfer to" msgstr "Overdragen naar" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "Welkom bij" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" -msgstr "Jami-account aanmaken" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" +msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" -msgstr "Een nieuwe Jami-account aanmaken (voor nieuwe gebruikers)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" +msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" -msgstr "Een bestaande account importeren" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" +msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" -msgstr "Importeer een account met uw pincode of het archief van uw account" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" +msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Annuleren" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "Geavanceerd…" -#: ui/accountcreationwizard.ui:97 +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." +msgstr "" + +#: ui/accountcreationwizard.ui:119 msgid "Add a new SIP account" msgstr "Voeg een nieuwe SIP-account toe" -#: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Dit apparaat aan een bestaande account koppelen" +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" + +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." +msgstr "" + +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "" + +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." +msgstr "" -#: ui/accountcreationwizard.ui:134 +#: ui/accountcreationwizard.ui:382 msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." -msgstr "Om dit apparaat aan een andere account te koppelen heeft u twee mogelijkheden. U kunt uw account importeren uit de DHT, maar eerst moet u een pincode verkrijgen. Ga om de pincode te genereren naar de accountbeheerinstellingen van een vorig apparaat, kies de Ring-account die u wilt gebruiken en selecteer ‘Een ander apparaat aan deze account koppelen’. U zult de pincode krijgen die u nodig heeft om dit proces te voltooien. De pincode is slechts 10 minuten geldig. U kunt uw account ook rechtstreeks uit een archiefbestand importeren." - -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "Geef uw pincode in:" - -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" -msgstr "Of importeer een bestand:" - -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "Geef uw paswoord in:" - -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" + +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "Vorige" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Volgende" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Profiel" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Account" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "Gebruikersnaam registreren" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "Als u dit aanvinkt, zult u een unieke gebruikersnaam op het Jami-netwerk registreren. Andere personen kunnen deze gebruikersnaam gebruiken om u te bellen, in plaats van uw 40 tekens lange Ring-ID." -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Gebruikersnaam" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "Dit paswoord wordt gebruikt om uw accountgegevens te versleutelen en nieuwe apparaten aan uw account te koppelen." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Bevestig paswoord" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "Uw Jami-account wordt aangemaakt…" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "Account exporteren" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "Gebruikersnaam wordt geregistreerd…" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "Dit kan enkele minuten duren." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "Uw Jami-account wordt opgehaald…" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "Fout bij aanmaken/laden van account." - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "Oké" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "Systeem" @@ -500,7 +540,7 @@ msgstr "Algemeen" msgid "Media" msgstr "Media" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Instellingen" @@ -587,6 +627,10 @@ msgstr "Paswoord (vereist):" msgid "Enter archive password" msgstr "Geef archiefpaswoord in" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Annuleren" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "Exporteren op het netwerk" @@ -603,10 +647,6 @@ msgstr "Uw gegenereerde pincode:" msgid "Click to change password" msgstr "Klik om het paswoord te wijzigen" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "Account exporteren" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "Account inschakelen" @@ -998,12 +1038,13 @@ msgid "Choose download folder" msgstr "Kies downloadmap" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "_Annuleren" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "Op_slaan" @@ -1065,90 +1106,90 @@ msgstr "Opgenomen bericht versturen" msgid "Add account…" msgstr "Account toevoegen…" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "oproep plaatsen" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "gesprek openen" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" -msgstr "" +msgstr "Jami - migratie vereist" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." -msgstr "" +msgstr "Migratie is bezig… Gelieve dit venster niet te sluiten." -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "Zoek contacten of geef een nummer in" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "Instellingsblad verlaten" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "Er zijn actieve oproepen" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "belt u!" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Inkomende oproep" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "Nieuw verzoek van" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "Vertrouwensverzoek" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "Nieuw bericht" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "Huidige oproep beëindigen?" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "U bent momenteel in gesprek. Wilt u het venster sluiten en alle huidige oproepen beëindigen?" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Geschiedenis wissen" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "Wilt u de geschiedenis van dit gesprek wissen?" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "Gesprek verwijderen" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "Wilt u dit gesprek echt verwijderen?" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "Contact blokkeren" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "Wilt u dit contact echt blokkeren?" @@ -1225,10 +1266,53 @@ msgstr "Herstelt de verborgen status van het hoofdscherm (alleen van toepassing msgid "- GNOME client for Jami" msgstr " - GNOME-cliënt voor Jami" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "Paswoorden komen niet overeen" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Bestand opslaan" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "U moet uw paswoord ingeven om het volledige archief te exporteren." + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "Geef paswoord in om archief te exporteren" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "Account geëxporteerd!" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "Fout bij exporteren van account." + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1251,10 +1335,6 @@ msgstr "Jami is vrije software voor universele communicatie, die de vrijheden en msgid "Send File" msgstr "Bestand versturen" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Bestand opslaan" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1317,22 +1397,6 @@ msgstr "Huidig paswoord" msgid "New password" msgstr "Nieuw paswoord" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "U moet uw paswoord ingeven om het volledige archief te exporteren." - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "Geef paswoord in om archief te exporteren" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "Account geëxporteerd!" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "Fout bij exporteren van account." - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "Slecht paswoord" diff --git a/po/nl_NL.po b/po/nl_NL.po index 0fc23b66..8fc88962 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" "Language-Team: Dutch (Netherlands) (http://www.transifex.com/savoirfairelinux/jami/language/nl_NL/)\n" "MIME-Version: 1.0\n" @@ -176,7 +176,8 @@ msgstr "" msgid "RingID" msgstr "" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Wachtwoord" @@ -265,135 +266,174 @@ msgstr "" msgid "Transfer to" msgstr "" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "" -#: ui/accountcreationwizard.ui:97 -msgid "Add a new SIP account" +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." msgstr "" #: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" +msgid "Add a new SIP account" msgstr "" -#: ui/accountcreationwizard.ui:134 -msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" + +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." msgstr "" -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" +#: ui/accountcreationwizard.ui:287 +msgid "PIN" msgstr "" -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." msgstr "" -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." msgstr "" -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "" -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Gebruikersnaam" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "" -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "" - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "" @@ -498,7 +538,7 @@ msgstr "Algemeen" msgid "Media" msgstr "Media" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Instellingen" @@ -585,6 +625,10 @@ msgstr "" msgid "Enter archive password" msgstr "" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "" @@ -601,10 +645,6 @@ msgstr "" msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "" @@ -996,12 +1036,13 @@ msgid "Choose download folder" msgstr "" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "" @@ -1063,90 +1104,90 @@ msgstr "" msgid "Add account…" msgstr "" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1223,10 +1264,53 @@ msgstr "" msgid "- GNOME client for Jami" msgstr "" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "" + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1249,10 +1333,6 @@ msgstr "" msgid "Send File" msgstr "" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1315,22 +1395,6 @@ msgstr "" msgid "New password" msgstr "" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "" - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "" diff --git a/po/pa.po b/po/pa.po index be1df05e..598131ba 100644 --- a/po/pa.po +++ b/po/pa.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" -"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" +"Last-Translator: Gursharnjit Singh <gursharnjitsingh13@gmail.com>\n" "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/savoirfairelinux/jami/language/pa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -176,7 +176,8 @@ msgstr "ਦੂਜਾ ਨਾਂ" msgid "RingID" msgstr "" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "ਪਾਸਵਰਡ" @@ -265,135 +266,174 @@ msgstr "ਤਬਾਦਲਾ" msgid "Transfer to" msgstr "" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "ਰੱਦ ਕਰੋ" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "" -#: ui/accountcreationwizard.ui:97 -msgid "Add a new SIP account" +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." msgstr "" #: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" +msgid "Add a new SIP account" msgstr "" -#: ui/accountcreationwizard.ui:134 -msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." +#: ui/accountcreationwizard.ui:234 +msgid "Archive" msgstr "" -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." msgstr "" -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "ਪਿੰਨ" + +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." msgstr "" -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." msgstr "" -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "ਅੱਗੇ" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "ਖਾਤਾ" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "" -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "ਵਰਤੋਂਕਾਰ ਨਾਂ" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "ਲੰਘਾਓ" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "" -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "" - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "ਸਿਸਟਮ" @@ -498,7 +538,7 @@ msgstr "ਸਧਾਰਨ" msgid "Media" msgstr "ਮੀਡੀਆ" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "ਸੈਟਿੰਗ" @@ -585,6 +625,10 @@ msgstr "" msgid "Enter archive password" msgstr "" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "ਰੱਦ ਕਰੋ" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "" @@ -601,10 +645,6 @@ msgstr "" msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "" @@ -996,12 +1036,13 @@ msgid "Choose download folder" msgstr "" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "" @@ -1063,90 +1104,90 @@ msgstr "" msgid "Add account…" msgstr "" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "ਆਉਂਦੀ ਕਾਲ" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "ਇਤਿਹਾਸ ਮਿਟਾਓ" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "ਸੰਪਰਕ ਬਲਾਕ ਕਰੋ" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1223,10 +1264,53 @@ msgstr "" msgid "- GNOME client for Jami" msgstr "" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "" + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1249,10 +1333,6 @@ msgstr "Jami ਦੁਨੀਆ ਭਰ ਵਿੱਚ ਸੰਚਾਰ ਕਰਨ ਲ msgid "Send File" msgstr "" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1315,22 +1395,6 @@ msgstr "" msgid "New password" msgstr "ਨਵਾਂ ਪਾਸਵਰਡ" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "" - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "" diff --git a/po/pl.po b/po/pl.po index a83506a4..ac732d9a 100644 --- a/po/pl.po +++ b/po/pl.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" -"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" +"Last-Translator: Jan Wielkiewicz <grzybowawspulnota@cock.li>\n" "Language-Team: Polish (http://www.transifex.com/savoirfairelinux/jami/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -178,7 +178,8 @@ msgstr "Alias" msgid "RingID" msgstr "ID Ring" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Hasło" @@ -267,135 +268,174 @@ msgstr "Przesyłanie" msgid "Transfer to" msgstr "Prześlij do" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "Witaj!" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" -msgstr "Stwórz Konto Jami" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" +msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" -msgstr "Stwórz nowe konto Jami (dla nowych użytkowników)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" +msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Anuluj" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" + +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "Zaawansowane..." -#: ui/accountcreationwizard.ui:97 +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." +msgstr "" + +#: ui/accountcreationwizard.ui:119 msgid "Add a new SIP account" msgstr "Dodaj nowe konto SIP" -#: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Połącz to urządzenie z istniejącym kontem" +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" + +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." +msgstr "" + +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "PIN" -#: ui/accountcreationwizard.ui:134 +#: ui/accountcreationwizard.ui:349 msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." -msgstr "By połączyć to urządzenie z innym kontem, masz dwie możliwości. Możesz zaimportować swoje konto z DHT(z sieci rozproszonej), ale najpierw musisz wygenerować kod PIN. Aby wygenerować kod PIN, przejdź do ustawień zarządzania kontem na wcześniejszym urządzeniu, wybierz konto Jami i zaznacz \"Połącz inne urządzenie z tym kontem\". Otrzymasz wtedy kod PIN potrzebny do wypełnienia tego formularza, który jest ważny przez 10 minut. Druga możliwość polega na zaimportowaniu pliku z kontem." - -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "Wpisz swój PIN:" - -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" -msgstr "Lub zaimportuj plik:" - -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "Wpisz swoje hasło:" - -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." +msgstr "" + +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" + +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "Poprzednie" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Następne" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Profil" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Konto" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "Zarejestruj nazwę użytkownika" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "Zaznaczając to, rejestrujesz niepowtarzalną nazwę użytkownika w sieci Jami. Użytkownicy mogą korzystać z niej aby kontaktować się z tobą zamiast korzystać z twojego ID które ma 40 znaków." -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Nazwa użytkownika" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "To hasło będzie używane do zaszyfrowania danych twojego konta i do łączenia nowych urządzeń do konta." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Potwierdź hasło" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "Tworzenie konta Jami..." -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "Wyeksportuj konto" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "Pomiń" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "Rejestrowanie nazwy użytkownika..." -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "To może potrwać kilka minut." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "Odzyskiwanie twojego konta Jami..." -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "Błąd podczas tworzenia/ładowania konta." - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "OK" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "System" @@ -500,7 +540,7 @@ msgstr "Generalne" msgid "Media" msgstr "Multimedia" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Ustawienia" @@ -587,6 +627,10 @@ msgstr "Hasło (wymagane):" msgid "Enter archive password" msgstr "Wpisz hasło do archiwum" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Anuluj" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "Wyeksportuj do sieci" @@ -603,10 +647,6 @@ msgstr "Twój wygenerowany PIN:" msgid "Click to change password" msgstr "Kliknij by zmienić hasło" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "Wyeksportuj konto" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "Aktywuj konto" @@ -998,12 +1038,13 @@ msgid "Choose download folder" msgstr "Wybierz folder pobierania" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "_Anuluj" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "_Zapisz" @@ -1065,90 +1106,90 @@ msgstr "Wyślij nagraną wiadomość" msgid "Add account…" msgstr "Dodaj konto..." -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "Zadzwoń" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "Otwórz chat" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "Szukaj kontakty lub wpisz numer" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "Opuść stronę ustawień" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "Są aktywne rozmowy" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "dzwoni do Ciebie!" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Połączenie przychodzące" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "Nowe zaproszenie od" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "Rządanie zaufania" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "Nowa wiadomość" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "Zatrzymać aktualną rozmowę?" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "Rozmowa jest w trakcie. Czy chcesz zamknąć okno i wyłączyć wszystkie bieżące rozmowy?" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Wyczyść historię" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "Czy na pewno chcesz wyczyścić historię tej rozmowy?" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "Usuń rozmowę" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "Czy na pewno chcesz usunąć tą rozmowę?" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "Blokuj kontakt" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "Czy na pewno chcesz zablokować ten kontakt?" @@ -1225,10 +1266,53 @@ msgstr "Przywraca ukryty stan głównego okna (dotyczy tylko pierwszej instancji msgid "- GNOME client for Jami" msgstr "- Klient GNOME dla Jami" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "Hasła nie pasują" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Zapisz plik" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "Potrzebujesz wprowadzić swoje hasło, by wyeksportować pełne archiwum" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "Wprowadź hasło, by wyeksportować archiwum" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "Konto wyeksportowane!" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "Błąd podczas eksportowania" + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1251,10 +1335,6 @@ msgstr "Jami jest wolnym oprogramowaniem do uniwersalnej komunikacji, respektuj msgid "Send File" msgstr "Wyślij plik" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Zapisz plik" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1317,22 +1397,6 @@ msgstr "Bieżące hasło" msgid "New password" msgstr "Nowe hasło" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "Potrzebujesz wprowadzić swoje hasło, by wyeksportować pełne archiwum" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "Wprowadź hasło, by wyeksportować archiwum" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "Konto wyeksportowane!" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "Błąd podczas eksportowania" - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "Złe hasło" diff --git a/po/pl_PL.po b/po/pl_PL.po index 0fea18d1..62bc453b 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" -"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" +"Last-Translator: Jan Wielkiewicz <grzybowawspulnota@cock.li>\n" "Language-Team: Polish (Poland) (http://www.transifex.com/savoirfairelinux/jami/language/pl_PL/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -176,7 +176,8 @@ msgstr "Alias" msgid "RingID" msgstr "ID Ring" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Hasło" @@ -265,135 +266,174 @@ msgstr "Przesyłanie" msgid "Transfer to" msgstr "Prześlij do" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "Witaj!" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" -msgstr "Stwórz Konto Jami" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" +msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" -msgstr "Stwórz nowe konto Jami (dla nowych użytkowników)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" +msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Anuluj" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" + +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "Zaawansowane..." -#: ui/accountcreationwizard.ui:97 +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." +msgstr "" + +#: ui/accountcreationwizard.ui:119 msgid "Add a new SIP account" msgstr "Dodaj nowe konto SIP" -#: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Połącz to urządzenie z istniejącym kontem" +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" + +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." +msgstr "" + +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "PIN" -#: ui/accountcreationwizard.ui:134 +#: ui/accountcreationwizard.ui:349 msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." -msgstr "By połączyć to urządzenie z innym kontem, masz dwie możliwości. Możesz zaimportować swoje konto z DHT(z sieci rozproszonej), ale najpierw musisz wygenerować kod PIN. Aby wygenerować kod PIN, przejdź do ustawień zarządzania kontem na wcześniejszym urządzeniu, wybierz konto Jami i zaznacz \"Połącz inne urządzenie z tym kontem\". Otrzymasz wtedy kod PIN potrzebny do wypełnienia tego formularza, który jest ważny przez 10 minut. Druga możliwość polega na zaimportowaniu pliku z kontem." - -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "Wpisz swój PIN:" - -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" -msgstr "Lub zaimportuj plik:" - -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "Wpisz swoje hasło:" - -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." +msgstr "" + +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" + +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "Poprzednie" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Następne" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Profil" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Konto" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "Zarejestruj nazwę użytkownika" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "Zaznaczając to, rejestrujesz niepowtarzalną nazwę użytkownika w sieci Jami. Użytkownicy mogą korzystać z niej aby kontaktować się z tobą zamiast korzystać z twojego ID które ma 40 znaków." -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Nazwa użytkownika" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "To hasło będzie używane do zaszyfrowania danych twojego konta i do łączenia nowych urządzeń do konta." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Potwierdź hasło" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "Tworzenie konta Jami..." -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "Wyeksportuj konto" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "Pomiń" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "Rejestrowanie nazwy użytkownika..." -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "To może potrwać kilka minut." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "Odzyskiwanie twojego konta Jami..." -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "Błąd podczas tworzenia/ładowania konta." - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "OK" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "System" @@ -498,7 +538,7 @@ msgstr "Generalne" msgid "Media" msgstr "Multimedia" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Ustawienia" @@ -585,6 +625,10 @@ msgstr "Hasło (wymagane):" msgid "Enter archive password" msgstr "Wpisz hasło do archiwum" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Anuluj" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "Wyeksportuj do sieci" @@ -601,10 +645,6 @@ msgstr "Twój wygenerowany PIN:" msgid "Click to change password" msgstr "Kliknij by zmienić hasło" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "Wyeksportuj konto" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "Aktywuj konto" @@ -996,12 +1036,13 @@ msgid "Choose download folder" msgstr "Wybierz folder pobierania" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "_Anuluj" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "_Zapisz" @@ -1063,90 +1104,90 @@ msgstr "Wyślij nagraną wiadomość" msgid "Add account…" msgstr "Dodaj konto..." -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "Zadzwoń" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "Otwórz chat" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "Szukaj kontakty lub wpisz numer" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "Opuść stronę ustawień" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "dzwoni do Ciebie!" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Połączenie przychodzące" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "Nowe zaproszenie od" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "Rządanie zaufania" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "Nowa wiadomość" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Wyczyść historię" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "Blokuj kontakt" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1223,10 +1264,53 @@ msgstr "Przywraca ukryty stan głównego okna (dotyczy tylko pierwszej instancji msgid "- GNOME client for Jami" msgstr "- Klient GNOME dla Jami" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "Hasła nie pasują" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Zapisz plik" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "Konto wyeksportowane!" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "Błąd podczas eksportowania" + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1249,10 +1333,6 @@ msgstr "Jami jest wolnym oprogramowaniem do uniwersalnej komunikacji, respektuj msgid "Send File" msgstr "Wyślij plik" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Zapisz plik" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1315,22 +1395,6 @@ msgstr "Bieżące hasło" msgid "New password" msgstr "Nowe hasło" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "Konto wyeksportowane!" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "Błąd podczas eksportowania" - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "Złe hasło" diff --git a/po/pt.po b/po/pt.po index 4e0538a3..645c0ff9 100644 --- a/po/pt.po +++ b/po/pt.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" -"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" +"Last-Translator: Rui <xymarior@yandex.com>\n" "Language-Team: Portuguese (http://www.transifex.com/savoirfairelinux/jami/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -178,7 +178,8 @@ msgstr "Apelido" msgid "RingID" msgstr "RingID" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Palavra-chave" @@ -267,135 +268,174 @@ msgstr "Transferir" msgid "Transfer to" msgstr "Transferir para" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "Bem-vindo(a) à" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" -msgstr "Criar Conta Jami" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" +msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" -msgstr "Criar uma nova conta Jami (para novos utilizadores)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" +msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" -msgstr "Importar uma conta existente" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" +msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" -msgstr "Importar uma conta com o seu PIN ou um arquivo da sua conta" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" +msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Cancelar" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "Avançado…" -#: ui/accountcreationwizard.ui:97 +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." +msgstr "" + +#: ui/accountcreationwizard.ui:119 msgid "Add a new SIP account" msgstr "Adicionar uma nova conta SIP" -#: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Associar este dispositivo a uma conta existente" +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" + +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." +msgstr "" + +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "PIN" + +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." +msgstr "" -#: ui/accountcreationwizard.ui:134 +#: ui/accountcreationwizard.ui:382 msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." -msgstr "Para conectar estes dispositivo a outra conta, tem duas opções. Pode importar a sua conta do DHT, mas primeiro, necessitará de obter um código PIN. Para gerar um código PIN, aceda à gestão de configurações da conta do dispositivo anterior, escolha a conta Jami que deseja usar e selecione \"Associar outro dispositivo a esta conta\" e irá receber o PIN necessário para completar este formulário. O PIN é válido por apenas 10 minutos. Ou pode importar a sua conta diretamente a partir de uma cópia de segurança." - -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "Introduza o seu PIN:" - -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" -msgstr "Ou importe de um ficheiro:" - -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "introduza a sua palavra-chave:" - -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" + +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "Anterior" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Próximo" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Perfil" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Conta" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "Registar nome de utilizador" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "Ao ativar esta opção, irá registar um nome de utilizador único na rede Jami. As pessoas poderão usá-lo para o contactar em vez de usarem o seu RingID, que possui uma sequência de 40 caracteres." -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Nome de utilizador" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "Esta palavra-chave irá ser usada para encriptar os dados da sua conta e para ligar novos dispositivos à sua conta." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Confirmar palavra-chave" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "A gerar a sua conta Jami..." -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "Exportar conta" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "Ignorar" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "A registar o nome de utilizador…" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "Isto pode levar alguns minutos." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "A obter a sua conta Jami..." -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "Erro ao criar/carregar conta." - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "OK" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "Sistema" @@ -500,7 +540,7 @@ msgstr "Geral" msgid "Media" msgstr "Média" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Configurações" @@ -587,6 +627,10 @@ msgstr "Palavra-chave (requerida):" msgid "Enter archive password" msgstr "Introduza a palavra-chave do arquivo" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Cancelar" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "Exportar na rede" @@ -603,10 +647,6 @@ msgstr "O seu PIN gerado:" msgid "Click to change password" msgstr "Clique para mudar a palavra-chave" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "Exportar conta" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "Ativar conta" @@ -998,12 +1038,13 @@ msgid "Choose download folder" msgstr "Escolher a pasta de ficheiros descarregados" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "_Cancelar" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "_Gravar" @@ -1065,90 +1106,90 @@ msgstr "Enviar mensagem gravada" msgid "Add account…" msgstr "Adicionar conta…" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "fazer chamada" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "abrir conversa" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "Pesquisar contactos ou introduza o número" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "Deixar página de configurações" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "Existem chamadas ativas" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "está a telefonar-lhe!" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Chamada recebida" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "Novo pedido de" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "Confiar no pedido" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "Nova mensagem" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "Parar a chamada atual?" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "Está a decorrer uma chamada. Quer fechar a janela e parar todas as chamadas?" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Limpar histórico" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "Quer mesmo eliminar o histórico desta conversação?" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "Remover conversação" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "Quer mesmo remover esta conversação?" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "Bloquear contacto" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "Quer mesmo bloquear este contacto?" @@ -1225,10 +1266,53 @@ msgstr "Restaura o estado oculto da janela principal (aplicável apenas à prime msgid "- GNOME client for Jami" msgstr "- cliente GNOME para o Jami" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "As palavras-chave não são iguais" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Gravar Ficheiro" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "Tem de introduzir a sua palavra-chave para exportar o arquivo completo." + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "Introduza a palavra-chave para exportar o arquivo" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "A conta foi exportada!" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "Falha ao exportar a conta." + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1251,10 +1335,6 @@ msgstr "O Jami é um programa livre para comunicação universal que respeita as msgid "Send File" msgstr "Enviar Ficheiro" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Gravar Ficheiro" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1317,22 +1397,6 @@ msgstr "Palavra-chave atual" msgid "New password" msgstr "Nova palavra-chave" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "Tem de introduzir a sua palavra-chave para exportar o arquivo completo." - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "Introduza a palavra-chave para exportar o arquivo" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "A conta foi exportada!" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "Falha ao exportar a conta." - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "Palavra-chave incorreta" diff --git a/po/pt_BR.po b/po/pt_BR.po index 378844cc..0fee039a 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -24,9 +24,9 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" -"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" +"Last-Translator: The Cat\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/savoirfairelinux/jami/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -192,7 +192,8 @@ msgstr "Apelido" msgid "RingID" msgstr "RingID" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Senha" @@ -281,135 +282,174 @@ msgstr "Transferência" msgid "Transfer to" msgstr "Transferir para" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "Bem-vindo à" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" -msgstr "Criar conta do Jami" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" +msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" -msgstr "Criar nova conta do Jami (para novos usuários)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" +msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Cancelar" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" + +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "Avançado…" -#: ui/accountcreationwizard.ui:97 +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." +msgstr "" + +#: ui/accountcreationwizard.ui:119 msgid "Add a new SIP account" msgstr "Adicionar uma nova conta SIP" -#: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Associar este dispositivo à uma conta existente" +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" + +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." +msgstr "" + +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "PIN" -#: ui/accountcreationwizard.ui:134 +#: ui/accountcreationwizard.ui:349 msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." -msgstr "Para conectar estes dispositivo a outra conta, você tem duas opções. Você pode importar sua conta do DHT, mas primeiro, você precisará obter um código PIN. Para gerar um código PIN, vá no gerenciamento de configurações da conta do seu outro dispositivo, escolha a conta do Jami que deseja usar e selecione \"Associar outro dispositivo à esta conta\" e você irá receber o PIN necessário para completar este formulário. O PIN é válido por apenas 10 minutos. Ou, você pode importar sua conta diretamente a partir de um backup." - -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "Insira o seu PIN:" - -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" -msgstr "Ou importe de arquivo:" - -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "Insira sua senha:" - -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." +msgstr "" + +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" + +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "Anterior" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Próximo" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Perfil" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Conta" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "Registrar nome de usuário" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "Ao confirmar esta opção, você irá registrar um nome de usuário único na rede Jami. Pessoas poderão usá-lo para lhe contactar ao invés de usar o seu ID, que possui uma sequência de 40 caracteres." -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Nome de usuário" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "Esta senha irá ser usada para encriptar os dados da sua conta e para ligar novos dispositivos a esta conta." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Confirmar senha" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "Gerando sua conta do Jami..." -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "Exportar conta" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "Pular" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "Registrando nome de usuário…" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "Isso pode levar alguns minutos." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "Recuperando sua conta do Jami..." -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "Erro ao criar/carregar conta." - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "OK" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "Sistema" @@ -514,7 +554,7 @@ msgstr "Geral" msgid "Media" msgstr "Mídia" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Configurações" @@ -601,6 +641,10 @@ msgstr "Senha (requerida):" msgid "Enter archive password" msgstr "Digite a senha do arquivo" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Cancelar" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "Exportar na rede" @@ -617,10 +661,6 @@ msgstr "Seu PIN gerado:" msgid "Click to change password" msgstr "Clique para mudar a senha" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "Exportar conta" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "Ativar conta" @@ -1012,12 +1052,13 @@ msgid "Choose download folder" msgstr "Escolha a pasta de arquivos baixados" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "_Cancelar" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "_Salvar" @@ -1079,90 +1120,90 @@ msgstr "Enviar mensagem gravada" msgid "Add account…" msgstr "Adicionar conta…" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "fazer ligação" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "abrir chat" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "Busque por contatos ou insira o número" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "Deixar a página de configurações" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "está chamando você!" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Chamada recebida" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "Nova requisição de" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "Confiar na requisição" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "Nova mensagem" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Limpar histórico" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "Bloquear contato" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1239,10 +1280,53 @@ msgstr "Restaurar o estado oculto da janela principal (aplicável apenas à prim msgid "- GNOME client for Jami" msgstr "- cliente GNOME para o Jami" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "Senhas não condizentes" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Salvar arquivo" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "Você precisa inserir sua senha para exportar o arquivo totalmente." + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "Digite a senha para exportar o arquivo" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "Conta exportada!" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "Falha ao exportar a conta." + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1265,10 +1349,6 @@ msgstr "Jami é um software livre para comunicação universal que respeita as l msgid "Send File" msgstr "Enviar arquivo" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Salvar arquivo" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1331,22 +1411,6 @@ msgstr "Senha atual" msgid "New password" msgstr "Nova senha" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "Você precisa inserir sua senha para exportar o arquivo totalmente." - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "Digite a senha para exportar o arquivo" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "Conta exportada!" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "Falha ao exportar a conta." - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "Senha incorreta" diff --git a/po/pt_PT.po b/po/pt_PT.po index fe20008f..fe02655e 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/savoirfairelinux/jami/language/pt_PT/)\n" "MIME-Version: 1.0\n" @@ -176,7 +176,8 @@ msgstr "Apelido" msgid "RingID" msgstr "RingID" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Palavra-chave" @@ -265,135 +266,174 @@ msgstr "Transferir" msgid "Transfer to" msgstr "Transferir para" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "Bem-vindo(a) à" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" -msgstr "Criar Conta Jami" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" +msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" -msgstr "Criar uma nova conta Jami (para novos utilizadores)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" +msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" -msgstr "Importar uma conta existente" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" +msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" -msgstr "Importar uma conta com o seu PIN ou um arquivo da sua conta" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" +msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Cancelar" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "Avançado…" -#: ui/accountcreationwizard.ui:97 +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." +msgstr "" + +#: ui/accountcreationwizard.ui:119 msgid "Add a new SIP account" msgstr "Adicionar uma nova conta SIP" -#: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Associar este dispositivo a uma conta existente" +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" + +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." +msgstr "" + +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "" + +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." +msgstr "" -#: ui/accountcreationwizard.ui:134 +#: ui/accountcreationwizard.ui:382 msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." -msgstr "Para conectar estes dispositivo a outra conta, tem duas opções. Pode importar a sua conta do DHT, mas primeiro, necessitará de obter um código PIN. Para gerar um código PIN, aceda à gestão de configurações da conta do dispositivo anterior, escolha a conta Jami que deseja usar e selecione \"Associar outro dispositivo a esta conta\" e irá receber o PIN necessário para completar este formulário. O PIN é válido por apenas 10 minutos. Ou pode importar a sua conta diretamente a partir de uma cópia de segurança." - -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "Introduza o seu PIN:" - -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" -msgstr "Ou importe de um ficheiro:" - -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "introduza a sua palavra-chave:" - -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" + +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "Anterior" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Próximo" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Perfil" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Conta" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "Registar nome de utilizador" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "Ao ativar esta opção, irá registar um nome de utilizador único na rede Jami. As pessoas poderão usá-lo para o contactar em vez de usarem o seu RingID, que possui uma sequência de 40 caracteres." -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Nome de utilizador" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "Esta palavra-chave irá ser usada para encriptar os dados da sua conta e para ligar novos dispositivos à sua conta." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Confirmar palavra-chave" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "A gerar a sua conta Jami..." -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "Exportar conta" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "A registar o nome de utilizador…" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "Isto pode levar alguns minutos." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "A obter a sua conta Jami..." -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "Erro ao criar/carregar conta." - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "OK" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "Sistema" @@ -498,7 +538,7 @@ msgstr "Geral" msgid "Media" msgstr "Média" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Configurações" @@ -585,6 +625,10 @@ msgstr "Palavra-chave (requerida):" msgid "Enter archive password" msgstr "Introduza a palavra-chave do arquivo" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Cancelar" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "Exportar na rede" @@ -601,10 +645,6 @@ msgstr "O seu PIN gerado:" msgid "Click to change password" msgstr "Clique para mudar a palavra-chave" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "Exportar conta" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "Ativar conta" @@ -996,12 +1036,13 @@ msgid "Choose download folder" msgstr "Escolher a pasta de ficheiros descarregados" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "_Cancelar" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "_Gravar" @@ -1063,90 +1104,90 @@ msgstr "Enviar mensagem gravada" msgid "Add account…" msgstr "Adicionar conta…" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "fazer chamada" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "abrir conversa" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "Pesquisar contactos ou introduza o número" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "Deixar página de configurações" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "Existem chamadas ativas" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "está a telefonar-lhe!" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Chamada recebida" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "Novo pedido de" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "Confiar no pedido" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "Nova mensagem" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "Parar a chamada atual?" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "Está a decorrer uma chamada. Quer fechar a janela e parar todas as chamadas?" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Limpar histórico" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "Quer mesmo eliminar o histórico desta conversação?" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "Remover conversação" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "Quer mesmo remover esta conversação?" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "Bloquear contacto" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "Quer mesmo bloquear este contacto?" @@ -1223,10 +1264,53 @@ msgstr "Restaura o estado oculto da janela principal (aplicável apenas à prime msgid "- GNOME client for Jami" msgstr "- cliente GNOME para o Jami" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "As palavras-chave não são iguais" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Gravar Ficheiro" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "Tem de introduzir a sua palavra-chave para exportar o arquivo completo." + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "Introduza a palavra-chave para exportar o arquivo" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "A conta foi exportada!" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "Falha ao exportar a conta." + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1249,10 +1333,6 @@ msgstr "O Jami é um programa livre para comunicação universal que respeita as msgid "Send File" msgstr "Enviar Ficheiro" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Gravar Ficheiro" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1315,22 +1395,6 @@ msgstr "Palavra-chave atual" msgid "New password" msgstr "Nova palavra-chave" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "Tem de introduzir a sua palavra-chave para exportar o arquivo completo." - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "Introduza a palavra-chave para exportar o arquivo" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "A conta foi exportada!" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "Falha ao exportar a conta." - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "Palavra-chave incorreta" diff --git a/po/ring-client-gnome.pot b/po/ring-client-gnome.pot index 6ecbdb33..1ce70871 100644 --- a/po/ring-client-gnome.pot +++ b/po/ring-client-gnome.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -175,7 +175,8 @@ msgstr "" msgid "RingID" msgstr "" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "" @@ -263,135 +264,174 @@ msgstr "" msgid "Transfer to" msgstr "" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "" -#: ui/accountcreationwizard.ui:97 -msgid "Add a new SIP account" +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." msgstr "" #: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" +msgid "Add a new SIP account" msgstr "" -#: ui/accountcreationwizard.ui:134 -msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous " -"device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" + +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." msgstr "" -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" +#: ui/accountcreationwizard.ui:287 +msgid "PIN" msgstr "" -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." msgstr "" -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." msgstr "" -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "" -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your " +"account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "" -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "" - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "" @@ -496,7 +536,7 @@ msgstr "" msgid "Media" msgstr "" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "" @@ -583,6 +623,10 @@ msgstr "" msgid "Enter archive password" msgstr "" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "" @@ -599,10 +643,6 @@ msgstr "" msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "" @@ -994,12 +1034,13 @@ msgid "Choose download folder" msgstr "" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "" @@ -1062,90 +1103,90 @@ msgstr "" msgid "Add account…" msgstr "" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the " "layout" msgid "Search contacts or enter number" msgstr "" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1222,10 +1263,53 @@ msgstr "" msgid "- GNOME client for Jami" msgstr "" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "" + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1248,10 +1332,6 @@ msgstr "" msgid "Send File" msgstr "" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1314,22 +1394,6 @@ msgstr "" msgid "New password" msgstr "" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "" - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "" diff --git a/po/ro.po b/po/ro.po index 1313c969..5deb0933 100644 --- a/po/ro.po +++ b/po/ro.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" "Language-Team: Romanian (http://www.transifex.com/savoirfairelinux/jami/language/ro/)\n" "MIME-Version: 1.0\n" @@ -175,7 +175,8 @@ msgstr "Alias" msgid "RingID" msgstr "" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Parola" @@ -264,135 +265,174 @@ msgstr "" msgid "Transfer to" msgstr "" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "" -#: ui/accountcreationwizard.ui:97 -msgid "Add a new SIP account" +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." msgstr "" #: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" +msgid "Add a new SIP account" msgstr "" -#: ui/accountcreationwizard.ui:134 -msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" + +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." msgstr "" -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" +#: ui/accountcreationwizard.ui:287 +msgid "PIN" msgstr "" -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." msgstr "" -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." msgstr "" -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "" -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Nume de utilizator" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Confirmă parola" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "" -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "" - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "" @@ -497,7 +537,7 @@ msgstr "General" msgid "Media" msgstr "Media" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Setari" @@ -584,6 +624,10 @@ msgstr "" msgid "Enter archive password" msgstr "" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "" @@ -600,10 +644,6 @@ msgstr "" msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "" @@ -995,12 +1035,13 @@ msgid "Choose download folder" msgstr "" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "" @@ -1062,90 +1103,90 @@ msgstr "" msgid "Add account…" msgstr "" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Apel de intrare" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1222,10 +1263,53 @@ msgstr "" msgid "- GNOME client for Jami" msgstr "" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "" + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1248,10 +1332,6 @@ msgstr "" msgid "Send File" msgstr "" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1314,22 +1394,6 @@ msgstr "" msgid "New password" msgstr "Parolă nouă" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "" - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "" diff --git a/po/ru.po b/po/ru.po index c027f5dc..86331207 100644 --- a/po/ru.po +++ b/po/ru.po @@ -27,9 +27,9 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" -"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" +"Last-Translator: Андрей Шевчук <andrei@shevchuk.co>\n" "Language-Team: Russian (http://www.transifex.com/savoirfairelinux/jami/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -195,7 +195,8 @@ msgstr "Псевдоним " msgid "RingID" msgstr "RingID" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Пароль" @@ -284,135 +285,174 @@ msgstr "Переадресация" msgid "Transfer to" msgstr "Переадресовать на" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "Добро пожаловать в" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" -msgstr "Создать аккаунт Jami" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" +msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" -msgstr "Создать новый аккаунт Jami (для новых пользователей)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" +msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" -msgstr "Импортировать существующую учётную запись" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" +msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Отмена" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" + +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "Дополнительно…" -#: ui/accountcreationwizard.ui:97 +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." +msgstr "" + +#: ui/accountcreationwizard.ui:119 msgid "Add a new SIP account" msgstr "Создать новый аккаунт SIP" -#: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Привязать это устройство к существующему аккаунту" +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" + +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." +msgstr "" -#: ui/accountcreationwizard.ui:134 +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "PIN" + +#: ui/accountcreationwizard.ui:349 msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." -msgstr "Чтобы привязать это устройство к аккаунту, у вас есть две возможности. Вы можете импортировать ваш аккаунт из сети DHT, но для этого вам необходимо сначала получить PIN код. Чтобы создать PIN код, зайдите в настройки аккаунта Jami на другом устройстве и выберите пункт \"Привязать другое устройство\". Будет создан PIN код, необходимый вам для продолжения. Имейте ввиду, что созданный PIN код действителен в течение 10 минут. Или же вы можете импортировать ваш аккаунт из архива." - -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "Введите ваш PIN:" - -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" -msgstr "Или импортируйте из файла:" - -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "Введите ваш пароль:" - -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." +msgstr "" + +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" + +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "Назад" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Далее" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Профиль" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Аккаунт" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "Зарегистрировать имя пользователя" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "Отмечая это, вы зарегистрируете уникальное имя пользователя в сети Jami. Другие пользователи смогут использовать его для связи с вами вместо RingID, который 40 символов длиной." -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Имя пользователя" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "Этот пароль будет использован для шифрования данных вашего аккаунта и для привязки новых устройств к вашему аккаунту." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Подтверждение пароля" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "Идёт создание вашего аккаунта Jami…" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "Экспортировать аккаунт" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "Пропустить" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "Идёт регистрация имени пользователя…" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "Это может занять несколько минут." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "Идёт извлечение вашего аккаунта Jami…" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "Ошибка создания/загрузки аккаунта." - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "OK" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "Система" @@ -517,7 +557,7 @@ msgstr "Общие" msgid "Media" msgstr "Медиа" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Настройки" @@ -604,6 +644,10 @@ msgstr "Пароль (обязательно):" msgid "Enter archive password" msgstr "Введите пароль архива" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Отмена" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "Экспортировать в сеть" @@ -620,10 +664,6 @@ msgstr "Ваш сгенерированный PIN:" msgid "Click to change password" msgstr "Нажмите для изменения пароля" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "Экспортировать аккаунт" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "Включить аккаунт" @@ -1015,12 +1055,13 @@ msgid "Choose download folder" msgstr "Выберите папку для загрузок" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "_Отмена" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "_Сохранить" @@ -1082,90 +1123,90 @@ msgstr "Отправить записанное сообщение" msgid "Add account…" msgstr "Добавить аккаунт…" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "позвонить" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "открыть чат" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "Найдите контакты или введите номер" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "Выйти из настроек" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "Есть активные звонки" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "звонит вам!" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Входящий вызов" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "Новый запрос от" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "Запрос доверия" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "Новое сообщение" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "Завершить текущий звонок?" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "В настоящее время идёт беседа. Хотите закрыть окно и остановить все текущие вызовы?" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Очистить историю" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "Вы действительно хотите очистить историю этой переписки? " -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "Удалить диалог" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "Вы действительно хотите удалить этой переписку? " -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "Заблокировать контакт" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "Вы действительно хотите заблокировать этот контакт?" @@ -1242,10 +1283,53 @@ msgstr "Восстанавливает скрытое состояние гла msgid "- GNOME client for Jami" msgstr "- клиент GNOME для Jami" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "Пароли не совпадают" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Сохранить файл" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "Для экспорта полного архива нужно ввести пароль." + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "Введите пароль для экспорта архива" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "Аккаунт экспортирован!" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "Экспорт аккаунта не выполнен." + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1268,10 +1352,6 @@ msgstr "Jami — свободная программа для связи, ува msgid "Send File" msgstr "Отправить файл" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Сохранить файл" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1334,22 +1414,6 @@ msgstr "Текущий пароль" msgid "New password" msgstr "Новый пароль" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "Для экспорта полного архива нужно ввести пароль." - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "Введите пароль для экспорта архива" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "Аккаунт экспортирован!" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "Экспорт аккаунта не выполнен." - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "Недопустимый пароль" diff --git a/po/ru_RU.po b/po/ru_RU.po index a7764a35..c02ad73a 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" "Language-Team: Russian (Russia) (http://www.transifex.com/savoirfairelinux/jami/language/ru_RU/)\n" "MIME-Version: 1.0\n" @@ -181,7 +181,8 @@ msgstr "Псевдоним" msgid "RingID" msgstr "RingID" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Пароль" @@ -270,135 +271,174 @@ msgstr "Перевод" msgid "Transfer to" msgstr "Переадресовать на" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "Добро пожаловать в" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" -msgstr "Создать аккаунт Jami" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" +msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" -msgstr "Создать новый аккаунт Jami (для новых пользователей)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" +msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Отмена" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" + +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "Дополнительно…" -#: ui/accountcreationwizard.ui:97 +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." +msgstr "" + +#: ui/accountcreationwizard.ui:119 msgid "Add a new SIP account" msgstr "Создать новый аккаунт SIP" -#: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Привязать это устройство к существующему аккаунту" +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" -#: ui/accountcreationwizard.ui:134 +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." +msgstr "" + +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "" + +#: ui/accountcreationwizard.ui:349 msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." -msgstr "Чтобы привязать это устройство к аккаунту, у вас есть две возможности. Вы можете импортировать ваш аккаунт из сети DHT, но для этого вам необходимо сначала получить PIN код. Чтобы создать PIN код, зайдите в настройки аккаунта Jami на другом устройстве и выберите пункт \"Привязать другое устройство\". Будет создан PIN код, необходимый вам для продолжения. Имейте ввиду, что созданный PIN код действителен в течение 10 минут. Или же вы можете импортировать ваш аккаунт из архива." - -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "Введите ваш PIN:" - -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" -msgstr "Или импортируйте из файла:" - -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "Введите ваш пароль:" - -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." +msgstr "" + +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" + +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "Назад" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Далее" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Профиль" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Учётная запись" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "Зарегистрировать имя пользователя" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "Отмечая это, вы зарегистрируете уникальное имя пользователя в сети Jami. Другие пользователи смогут использовать его для связи с вами вместо RingID, который 40 символов длиной." -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Имя пользователя" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "Этот пароль будет использован для шифрования данных вашего аккаунта и для привязки новых устройств к вашему аккаунту." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Подтверждение пароля" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "Идёт создание вашего аккаунта Jami…" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "Экспортировать аккаунт" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "Идёт регистрация имени пользователя…" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "Это может занять несколько минут." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "Идёт извлечение вашего аккаунта Jami…" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "Ошибка создания/загрузки аккаунта." - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "OK" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "Система" @@ -503,7 +543,7 @@ msgstr "Основные" msgid "Media" msgstr "Медиа" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Настройки" @@ -590,6 +630,10 @@ msgstr "Пароль (обязательно):" msgid "Enter archive password" msgstr "Введите пароль архива" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Отмена" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "Экспортировать в сеть" @@ -606,10 +650,6 @@ msgstr "Ваш сгенерированный PIN:" msgid "Click to change password" msgstr "Нажмите для изменения пароля" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "Экспортировать аккаунт" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "Включить аккаунт" @@ -1001,12 +1041,13 @@ msgid "Choose download folder" msgstr "Выберите папку для загрузок" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "_Отмена" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "_Сохранить" @@ -1068,90 +1109,90 @@ msgstr "Отправить записанное сообщение" msgid "Add account…" msgstr "Добавить аккаунт…" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "позвонить" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "открыть чат" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "Найдите контакты или введите номер" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "Выйти из настроек" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "Есть активные звонки" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "звонит вам!" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Входящий вызов" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "Новый запрос от " -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "Запрос доверия" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "Новое сообщение" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "Завершить текущий звонок?" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "В настоящее время идёт беседа. Хотите закрыть окно и остановить все текущие вызовы?" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1228,10 +1269,53 @@ msgstr "Восстанавливает скрытое состояние гла msgid "- GNOME client for Jami" msgstr "- клиент GNOME для Jami" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "Пароли не совпадают" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Сохранить файл" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "Для экспорта полного архива нужно ввести пароль." + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "Введите пароль для экспорта архива" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "Аккаунт экспортирован!" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "Экспорт аккаунта не выполнен." + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1254,10 +1338,6 @@ msgstr "Jami — свободная программа для связи, ува msgid "Send File" msgstr "Отправить файл" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Сохранить файл" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1320,22 +1400,6 @@ msgstr "Текущий пароль" msgid "New password" msgstr "Новый пароль" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "Для экспорта полного архива нужно ввести пароль." - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "Введите пароль для экспорта архива" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "Аккаунт экспортирован!" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "Экспорт аккаунта не выполнен." - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "Недопустимый пароль" diff --git a/po/sk_SK.po b/po/sk_SK.po index 81686edf..54fffa13 100644 --- a/po/sk_SK.po +++ b/po/sk_SK.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" -"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" +"Last-Translator: Tomáš Vavro <tomas.j.vavro@gmail.com>\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/savoirfairelinux/jami/language/sk_SK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -177,7 +177,8 @@ msgstr "Alias" msgid "RingID" msgstr "RingID" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Heslo" @@ -266,135 +267,174 @@ msgstr "Prenos" msgid "Transfer to" msgstr "Preniesť" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "Vitajte v" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" -msgstr "Vytvoriť Jami účet" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" +msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" -msgstr "Vytvoriť nový Jami účet (pre nových používateľov)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" +msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Zrušiť" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" + +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "Pokročilé..." -#: ui/accountcreationwizard.ui:97 +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." +msgstr "" + +#: ui/accountcreationwizard.ui:119 msgid "Add a new SIP account" msgstr "Pridať nový SIP účet" -#: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Prepojiť toto zariadenie s existujúcim účtom" +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" + +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." +msgstr "" + +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "PIN" -#: ui/accountcreationwizard.ui:134 +#: ui/accountcreationwizard.ui:349 msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." -msgstr "Máte dve možnosti ako prepojiť toto zariadenie s účtom. Prvá možnosť je import vášho účtu prostredníctvom DHT, na čo najprv potrebujete získať PIN kód. Na vygenerovanie PIN kódu musíte ísť do Nastavení účtu na zariadení, ktoré už s účtom prepojené je, a zvoliť možnosť \"Prepojiť ďalšie zariadenie s týmto účtom\". Potom obdržíte potrebný PIN, ktorý bude platný 10 minút. Druhá možnosť je priamo importovať účet z archívu." - -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "Zadajte váš PIN:" - -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" -msgstr "Alebo importujte súbor:" - -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "Zadajte vaše heslo:" - -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." +msgstr "" + +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" + +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "Predchádzajúci" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Ďalej" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Profil" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Účet" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "Registrovať používateľské meno" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "Zaškrtnutím tejto možnosti si zaregistrujete používateľské meno na sieti Jami. Ľudom na kontakt s vami postačí použiť toto meno namiesto vášho RingID, ktoré má 40 znakov." -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Používateľské meno" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "Bude používané na šifrovanie vašich údajov vášho účtu a pri prepájaní nových zariadení s vaším účtom." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Potvrďte heslo" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "Generovanie vášho Jami účtu..." -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "Exportovať účet" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "Preskočiť" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "Registrovanie používateľského mena..." -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "Chvíľu to potrvá." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "Sťahovanie vášho účtu Jami..." -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "Chyba vytvárania/načítania účtu" - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "Ok" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "Systém" @@ -499,7 +539,7 @@ msgstr "Všeobecné" msgid "Media" msgstr "Médiá" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Nastavenia" @@ -586,6 +626,10 @@ msgstr "Heslo (vyžadované):" msgid "Enter archive password" msgstr "Zadajte heslo archívu" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Zrušiť" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "Exportovať na sieť" @@ -602,10 +646,6 @@ msgstr "Váš vygenerovaný PIN:" msgid "Click to change password" msgstr "Kliknite pre zmenu hesla" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "Exportovať účet" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "Zapnúť účet" @@ -997,12 +1037,13 @@ msgid "Choose download folder" msgstr "Zvoliť priečinok na sťahovanie" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "_Zrušiť" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "_Uložiť" @@ -1064,90 +1105,90 @@ msgstr "Poslať zaznamenanú správu" msgid "Add account…" msgstr "Pridať účet..." -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "uskutočniť hovor" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "otvoriť chat" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "Hľadať v kontaktoch alebo zadať číslo" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "Opustiť nastavenia" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "vám volá!" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Prichádzajúci hovor" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "Nová žiadosť od" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "Veriť žiadosti" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "Nová správa" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Vymazať históriu" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "Zablokovať kontakt" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1224,10 +1265,53 @@ msgstr "Obnovuje skrytý stav hlavného okna (iba v prípade primárnej inštanc msgid "- GNOME client for Jami" msgstr "- GNOME klient pre Jami" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "Heslá sa nezhodujú" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Uložiť súbor" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "Musíte zadať vaše heslo na export celého archívu účtu." + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "Zadajte heslo na export archívu" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "Účet exportovaný!" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "Zlyhanie exportu účtu." + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1250,10 +1334,6 @@ msgstr "Jami je slobodný softvér na univerzálnu komunikáciu, ktorý rešpekt msgid "Send File" msgstr "Poslať súbor" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Uložiť súbor" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1316,22 +1396,6 @@ msgstr "Súčasné heslo" msgid "New password" msgstr "Nové heslo" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "Musíte zadať vaše heslo na export celého archívu účtu." - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "Zadajte heslo na export archívu" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "Účet exportovaný!" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "Zlyhanie exportu účtu." - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "Nesprávne heslo" diff --git a/po/sl.po b/po/sl.po index 631be58a..919ace01 100644 --- a/po/sl.po +++ b/po/sl.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" -"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" +"Last-Translator: Goran Kavrecic <goran.kavrecic@indea.si>\n" "Language-Team: Slovenian (http://www.transifex.com/savoirfairelinux/jami/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -176,7 +176,8 @@ msgstr "Alias" msgid "RingID" msgstr "RingID" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Geslo" @@ -265,135 +266,174 @@ msgstr "Prevezava" msgid "Transfer to" msgstr "" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "Dobrodošli v" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Prekliči" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" + +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "" -#: ui/accountcreationwizard.ui:97 -msgid "Add a new SIP account" +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." msgstr "" #: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Poveži to napravo k obstoječemu računu" +msgid "Add a new SIP account" +msgstr "" -#: ui/accountcreationwizard.ui:134 -msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." +#: ui/accountcreationwizard.ui:234 +msgid "Archive" msgstr "" -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "Vnesi svoj PIN:" +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." +msgstr "" + +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "PIN" -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." msgstr "" -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "Vnesi svoje geslo:" +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "Nazaj" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Naprej" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Profil" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Račun" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "" -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Uporabnik" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Potrdi geslo" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "To lahko traja nekaj minut." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "Napaka pri ustvarjanju/branju računa" - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "OK" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "Sistem" @@ -498,7 +538,7 @@ msgstr "Splošno" msgid "Media" msgstr "Mediji" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Nastavitve" @@ -585,6 +625,10 @@ msgstr "Geslo (zahtevano)" msgid "Enter archive password" msgstr "Vnesi arhivsko geslo" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Prekliči" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "" @@ -601,10 +645,6 @@ msgstr "Tvoj ustvarjen PIN:" msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "" @@ -996,12 +1036,13 @@ msgid "Choose download folder" msgstr "" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "_Prekliči" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "" @@ -1063,90 +1104,90 @@ msgstr "" msgid "Add account…" msgstr "" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "izvedi klic" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "odpri pogovor" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "Poišči stik ali vnesi številko" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Dohodni klic" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Pobriši zgodovino" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1223,10 +1264,53 @@ msgstr "" msgid "- GNOME client for Jami" msgstr "" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "Gesli nista enaki" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Shrani datoteko" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "" + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1249,10 +1333,6 @@ msgstr "" msgid "Send File" msgstr "" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Shrani datoteko" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1315,22 +1395,6 @@ msgstr "" msgid "New password" msgstr "Novo geslo" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "" - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "Neveljavno geslo" diff --git a/po/sq_AL.po b/po/sq_AL.po index a9b8de80..80835991 100644 --- a/po/sq_AL.po +++ b/po/sq_AL.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" -"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" +"Last-Translator: Besnik <besnik@programeshqip.org>\n" "Language-Team: Albanian (Albania) (http://www.transifex.com/savoirfairelinux/jami/language/sq_AL/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -176,7 +176,8 @@ msgstr "Alias" msgid "RingID" msgstr "RingID" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Krijoni llogari" @@ -265,135 +266,174 @@ msgstr "Shpërngule" msgid "Transfer to" msgstr "Shpërngule te" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "Mirë se vini te" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" -msgstr "Krijoni Llogari Jami" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" +msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" -msgstr "Krijoni një llogari të re Jami (për përdorues të rinj)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" +msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" -msgstr "Importo një llogari ekzistuese" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" +msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" -msgstr "Importoni një llogari me PIN-in tuaj ose arkivin e llogarisë tuaj" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" +msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Anuloje" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "Të mëtejshme…" -#: ui/accountcreationwizard.ui:97 +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." +msgstr "" + +#: ui/accountcreationwizard.ui:119 msgid "Add a new SIP account" msgstr "Shtoni një llogari SIP të re" -#: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Lidheni këtë pajisje me një llogari ekzistuese" +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" + +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." +msgstr "" -#: ui/accountcreationwizard.ui:134 +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "PIN" + +#: ui/accountcreationwizard.ui:349 msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." -msgstr "Për të lidhur këtë pajisje me një llogari tjetër, keni dy mundësi. Mund të importoni llogarinë tuaj nga DHT, por së pari lypset të merrni një kod PIN. Që të prodhohet kodi PIN, kaloni te ndarja e administrimit të llogarive, te pajisja e mëparshme, zgjidhni Llogari Jami që duhet përdorur dhe përzgjidhni \"Lidhni me këtë llogari një pajisje tjetër\". Do të merrni PIN-in e nevojshëm për të plotësuar këtë formular. PIN-i vlen vetëm për 10 minuta. Ose mund të importoni drejtpërsëdrejti llogarinë tuaj nga një arkiv." - -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "Jepni PIN-in tuaj:" - -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" -msgstr "Ose importoni një kartelë:" - -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "Jepni fjalëkalimin tuaj:" - -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." +msgstr "" + +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" + +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "I mëparshmi" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Pasuesi" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Profil" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Llogari" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "Regjistroni emër përdoruesi" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "Duke i vënë shenjë kësaj, do të regjistroni një emër përdoruesi unik në rrjetin Jami. Njerëzit mund ta përdorin për t’u lidhur me ju, në vend se të ID-së tuaj Ring, që është 40 shenja i gjatë." -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Emër përdoruesi" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "Ky fjalëkalim do të përdoret për të fshehtëzuar të dhënat e llogarisë tuaj dhe për të lidhur pajisje të reja në të." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Ripohoni fjalëkalimin" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "Po prodhohet llogaria juaj Jami…" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "Eksportoni llogari" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "Anashkaloje" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "Po regjistrohet emër përdoruesi…" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "Kjo mund të hajë pak minuta." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "Po merret llogaria juaj Jami…" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "Gabim në krijim/ngarkim llogarie." - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "OK" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "Sistem" @@ -498,7 +538,7 @@ msgstr "Të përgjithshme" msgid "Media" msgstr "Media" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Rregullime" @@ -585,6 +625,10 @@ msgstr "Fjalëkalim (i domosdoshëm):" msgid "Enter archive password" msgstr "Jepni fjalëkalim arkivi" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Anuloje" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "Eksportoje në rrjet" @@ -601,10 +645,6 @@ msgstr "PIN-i juaj i prodhuar:" msgid "Click to change password" msgstr "Klikoni që të ndryshohet fjalëkalimi" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "Eksportoni llogari" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "Aktivizoje llogarinë" @@ -996,12 +1036,13 @@ msgid "Choose download folder" msgstr "Zgjidhni dosje shkarkimesh" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "_Anuloje" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "_Ruaje" @@ -1063,90 +1104,90 @@ msgstr "Dërgo mesazhin e incizuar" msgid "Add account…" msgstr "Shtoni llogari…" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "bëni një thirrje" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "hape fjalosjen" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" -msgstr "" +msgstr "Jami - Lypset migrim" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." -msgstr "" +msgstr "Migrim në kryerje e sipër… ju lutemi, mos e mbyllni këtë dritare." -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "Përzgjidhni kontakte ose jepni një numër" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "Braktise faqen e rregullimeve" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "Ka thirrje aktive" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr " po ju thërret!" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Thirrje ardhëse" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "Kërkesë e re nga " -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "Kërkesë besueshmërie" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "Mesazh i ri" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "Të ndalet thirrja e tanishme?" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "Ka një thirrje në kryerje e sipër. Doni të mbyllet dritarja dhe të ndalen krejt thirrjet e tanishme?" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Pastroje historikun" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "Doni të pastrohet vërtet historiku i kësaj bisede?" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "Hiqe bisedën" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "Doni të hiqet vërtet kjo bisedë?" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "Bllokojeni kontaktin" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "Doni të bllokohet vërtet ky kontakt?" @@ -1223,10 +1264,53 @@ msgstr "Rikthen gjendjen e fshehur të dritares kryesore (e zbatueshme vetëm p msgid "- GNOME client for Jami" msgstr "- Klienti Jami për GNOME" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "Fjalëkalimet nuk përputhen" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Ruaje Kartelën" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "Lypset të jepni fjalëkalimin tuaj që të eksportohet arkivi i plotë." + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "Jepni fjalëkalimin që të eksportohet arkivi" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "Llogaria u eksportua!" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "Dështim eksportimi llogarie." + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1249,10 +1333,6 @@ msgstr "Jami është software i lirë për komunikim universal që respekton pri msgid "Send File" msgstr "Dërgo Kartelë" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Ruaje Kartelën" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1315,22 +1395,6 @@ msgstr "Fjalëkalimi i tanishëm" msgid "New password" msgstr "Fjalëkalim i ri" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "Lypset të jepni fjalëkalimin tuaj që të eksportohet arkivi i plotë." - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "Jepni fjalëkalimin që të eksportohet arkivi" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "Llogaria u eksportua!" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "Dështim eksportimi llogarie." - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "Fjalëkalim i gabuar" diff --git a/po/sv.po b/po/sv.po index 2b45baf7..34944a08 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-09 05:32+0000\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" "Last-Translator: Åke Engelbrektson\n" "Language-Team: Swedish (http://www.transifex.com/savoirfairelinux/jami/language/sv/)\n" "MIME-Version: 1.0\n" @@ -176,7 +176,8 @@ msgstr "Alias" msgid "RingID" msgstr "Ring-ID" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Lösenord" @@ -265,135 +266,174 @@ msgstr "Överför" msgid "Transfer to" msgstr "Överför till" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "Välkommen till" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" -msgstr "Skapa Jami-konto" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" +msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" -msgstr "Skapa ett nytt Jami-konto (för nya användare)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" +msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" -msgstr "Importera ett befintligt konto" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" +msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" -msgstr "Importera ett konto med din PIN-kod eller ditt kontoarkiv" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" +msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Avbryt" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "Avancerat..." -#: ui/accountcreationwizard.ui:97 +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." +msgstr "" + +#: ui/accountcreationwizard.ui:119 msgid "Add a new SIP account" msgstr "Lägg till nytt SIP-konto" -#: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Koppla den här enheten till ett befintligt konto" +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" + +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." +msgstr "" + +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "PIN-kod" + +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." +msgstr "" -#: ui/accountcreationwizard.ui:134 +#: ui/accountcreationwizard.ui:382 msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." -msgstr "För att länka denna enhet till ett annat konto, har du två alternativ. Du kan importera ditt konto från DHT, men måste först ha en PIN-kod. För att generera PIN-koden, går du till kontoinställningarna på en tidigare konfigurerad enhet, väljer det Jami-konto du vill använda och väljer \"Koppla en annan enhet till detta konto\". Där får du den nödvändiga PIN-koden för att avsluta detta formulär. PIN-koden är giltig i endast 10 minuter. Du kan också direktimportera ditt konto från en arkivfil." - -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "Ange din PIN-kod:" - -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" -msgstr "Eller importera en fil:" - -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "Ange ditt lösenord:" - -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" + +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "Föregående" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Nästa" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Profil" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Konto" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "Registrera användarnamn" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "Genom att aktivera detta, registrerar du ett unikt användarnamn på Jami-nätverket. Folk kan använda det för att kontakta dig, istället för att använda ditt Ring-ID, som är 40 tecken långt." -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Användarnamn" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "Detta lösenord kommer att användas för att kryptera din kontodata och för att länka nya enheter till ditt konto." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Bekräfta lösenord" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "Genererar ditt Jami-konto..." -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "Exportera konto" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "Hopa över" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "Registrerar användarnamn..." -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "Detta kan ta några få minuter." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "Hämtar ditt Jami-konto..." -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "Fel vid skapande/inläsning av konto." - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "OK" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "System" @@ -498,7 +538,7 @@ msgstr "Allmänt" msgid "Media" msgstr "Media" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Inställningar" @@ -585,6 +625,10 @@ msgstr "Lösenord (obligatoriskt):" msgid "Enter archive password" msgstr "Ange arkivlösenord" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Avbryt" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "Exportera på nätverket" @@ -601,10 +645,6 @@ msgstr "Din PIN-kod:" msgid "Click to change password" msgstr "Klicka för att byta lösenord" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "Exportera konto" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "Aktivera konto" @@ -996,12 +1036,13 @@ msgid "Choose download folder" msgstr "Välj nerladdningsmapp" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "_Avbryt" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "_Spara" @@ -1063,90 +1104,90 @@ msgstr "Skicka inspelat meddelande" msgid "Add account…" msgstr "Lägg till konto..." -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "starta samtal" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "öppna chatt" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "Jami - Migrering behövs" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "Migrering pågår... stäng inte detta fönster." -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "Sök i kontakter eller ange nummer" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "Lämna inställningssidan" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "Det finns aktiva samtal" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "ringer dig!" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Inkommande samtal" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "Ny förfrågan från" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "Lita på begäran" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "Nytt meddelande" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "Vill du stoppa aktuellt samtal?" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "Det finns ett pågående samtal. Vill du stänga fönstret och stoppa alla aktuella samtal?" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Rensa historik" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "Vill du verkligen ta bort historiken för den här konversationen?" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "Ta bort konversationen" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "Vill du verkligen ta bort den här konversationen?" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "Blockera kontakt" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "Vill du verkligen blockera den här kontakten?" @@ -1223,10 +1264,53 @@ msgstr "Återställer dold status för huvudfönstret (applicerbart endast på p msgid "- GNOME client for Jami" msgstr "- GNOME-klient för Jami" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "Lösenorden stämmer inte" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Spara fil" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "Du måste ange ditt lösenord för att exportera hela arkivet." + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "Ange lösenord för att exportera arkivet" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "Konto exporterat!" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "Kontoexport misslyckades." + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1249,10 +1333,6 @@ msgstr "Jami är fri mjukvara för universell kommunikation, med respekt för an msgid "Send File" msgstr "Skicka fil" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Spara fil" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1315,22 +1395,6 @@ msgstr "Aktuellt lösenord" msgid "New password" msgstr "Nytt lösenord" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "Du måste ange ditt lösenord för att exportera hela arkivet." - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "Ange lösenord för att exportera arkivet" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "Konto exporterat!" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "Kontoexport misslyckades." - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "Fel lösenord" diff --git a/po/tr.po b/po/tr.po index 690c1a51..d0c227a2 100644 --- a/po/tr.po +++ b/po/tr.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" "Language-Team: Turkish (http://www.transifex.com/savoirfairelinux/jami/language/tr/)\n" "MIME-Version: 1.0\n" @@ -181,7 +181,8 @@ msgstr "Takma ad" msgid "RingID" msgstr "Ring Kimliği" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Parola" @@ -270,135 +271,174 @@ msgstr "Aktarım" msgid "Transfer to" msgstr "Şuraya aktar" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "Hoş Geldiniz" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" -msgstr "Jami hesabı oluştur" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" +msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" -msgstr "Yeni bir Jami hesabı oluştur (yeni kullanıcılar için)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" +msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "İptal" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" + +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "Gelişmiş..." -#: ui/accountcreationwizard.ui:97 +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." +msgstr "" + +#: ui/accountcreationwizard.ui:119 msgid "Add a new SIP account" msgstr "Yeni bir SIP hesabı ekle" -#: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Bu aygıtı var olan bir hesaba bağla" +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" -#: ui/accountcreationwizard.ui:134 -msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." msgstr "" -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "Pin'inizi girin:" +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "" -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" -msgstr "veya bir dosya içe aktar" +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." +msgstr "" -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "Parolanızı girin:" +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "Önceki" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "İleri" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Profil" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Hesap" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "Kullanıcı adını kaydet" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "Bunu seçerek Jami ağı üzerinde benzersiz bir kullanıcı adı kayıt olacaksınız. İnsanlar 40 karakter uzunluğundaki Jami Kimliğiniz yerine bunu kullanarak sizinle iletişime geçebilecek." -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Kullanıcı adı" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "Bu parola hesap bilgilerinizi şifrelemek ve hesabınızı yeni aygıtlara bağlamak için kullanılacaktır" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Parolayı onayla" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "Jami hesabınız oluşturuluyor..." -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "Hesapları dışa aktar" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "Kullanıcı adı kaydediliyor..." -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "Bu bir kaç dakika sürebilir." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "Jami hesabınız alınıyor..." -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "Hesap oluşturma/yükleme hatası." - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "TAMAM" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "Düzen" @@ -503,7 +543,7 @@ msgstr "Genel" msgid "Media" msgstr "Ortam" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Ayarlar" @@ -590,6 +630,10 @@ msgstr "Parola (gerekli):" msgid "Enter archive password" msgstr "Arşiv parolası girin" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "İptal" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "Ağda dışa aktar" @@ -606,10 +650,6 @@ msgstr "Oluşturulan pin'iniz:" msgid "Click to change password" msgstr "Parola değiştirmek için tıkla" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "Hesapları dışa aktar" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "Hesabı etkinleştir" @@ -1001,12 +1041,13 @@ msgid "Choose download folder" msgstr "İndirme klasörünü seçin" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "_İptal" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "_Kaydet" @@ -1068,90 +1109,90 @@ msgstr "Kaydedilmiş iletiyi gönder" msgid "Add account…" msgstr "Hesap ekle..." -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "ara" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "konuşma aç" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "Kişileri ara veya numara gir" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "Ayarlar sayfasından ayrıl" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "seni arıyor!" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Gelen arama" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "Güven isteği" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "Yeni ileti" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Geçmişi temizle" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "Kişiyi engelle" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1228,10 +1269,53 @@ msgstr "Ana pencerenin gizli durumunu eski haline döndürür (sadece birincil o msgid "- GNOME client for Jami" msgstr "" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "Parolalar uyuşmuyor" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Dosyayı Kaydet" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "Hesap dışa aktarıldı!" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "Hesap dışa aktarımı başarısız." + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1254,10 +1338,6 @@ msgstr "Jami, kullanıcılarının özgürlüklerine ve gizliliğine önem veren msgid "Send File" msgstr "" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Dosyayı Kaydet" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1320,22 +1400,6 @@ msgstr "Şimdiki parola" msgid "New password" msgstr "Yeni parola" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "Hesap dışa aktarıldı!" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "Hesap dışa aktarımı başarısız." - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "Geçersiz parola" diff --git a/po/uk.po b/po/uk.po index 6cae64c6..616a2a29 100644 --- a/po/uk.po +++ b/po/uk.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" -"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" +"Last-Translator: Roman Riabenko\n" "Language-Team: Ukrainian (http://www.transifex.com/savoirfairelinux/jami/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -183,7 +183,8 @@ msgstr "Додаткове ім’я" msgid "RingID" msgstr "Ідентифікатор Ring" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "Пароль" @@ -272,135 +273,174 @@ msgstr "Переадресація" msgid "Transfer to" msgstr "" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "Вітаємо у" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" -msgstr "Створіть обліковий запис Джамі" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" +msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" -msgstr "Створити новий обліковий запис Джамі (для нових користувачів)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" +msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "Відміна" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" + +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "" -#: ui/accountcreationwizard.ui:97 -msgid "Add a new SIP account" +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." msgstr "" #: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "Зв'язати цей пристрій з наявним обліковим записом" +msgid "Add a new SIP account" +msgstr "" + +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" + +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." +msgstr "" + +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "PIN-код" -#: ui/accountcreationwizard.ui:134 +#: ui/accountcreationwizard.ui:349 msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." -msgstr "Щоб прив'язати цей пристрій до іншого облікового запису, у вас є дві можливості. Ви можете завантажити свій обліковий запис з DHT, але спершу, вам необхідно отримати PIN-код. Щоб згенерувати PIN-код, перейдіть до налаштувань управління обліковим записом попереднього пристрою, виберіть обліковий запис Джамі й оберіть «Прив'язати інший пристрій до цього облікового запису». Ви отримаєте PIN-код, який потрібно ввести тут. PIN-код дійсний протягом 10 хвилин. Або ж ви можете завантажити свій обліковий запис безпосередньо з архіву." - -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "Введіть ваш PIN-код:" - -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" -msgstr "Або завантажте з файлу:" - -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "Введіть ваш пароль:" - -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." +msgstr "" + +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" + +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "Попереднє" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "Наступний" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "Профіль" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "Аккаунт" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "Увімкнувши цю опцію, ви зареєструєте унікальне ім'я користувача в мережі Джамі. Люди можуть використовувати його замість вашого 40-значного ідентифікатора." -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Ім’я" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "Цей пароль буде використано для шифрування відомостей вашого облікового запису та прив'язування нових пристроїв до вашого облікового запису." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "Підтвердити пароль" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "Створення вашого облікового запису Джамі…" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "Пропустити" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "Це може зайняти кілька хвилин." -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "Дістаю ваш обліковий запис Джамі…" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "Збій створення чи завантаження облікового запису." - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "OK" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "Система" @@ -505,7 +545,7 @@ msgstr "Головні" msgid "Media" msgstr "Медіа" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "Налаштування" @@ -592,6 +632,10 @@ msgstr "Пароль (вимагається):" msgid "Enter archive password" msgstr "Введіть пароль архіву" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "Відміна" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "" @@ -608,10 +652,6 @@ msgstr "Ваш новий PIN-код:" msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "" @@ -1003,12 +1043,13 @@ msgid "Choose download folder" msgstr "" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "_Скасувати" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "" @@ -1070,90 +1111,90 @@ msgstr "" msgid "Add account…" msgstr "" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "розпочати дзвінок" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "відкрити розмову" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "Пошук контактів чи введіть номер" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "Вхідний дзвінок" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "Видалити історію" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "Заблокувати контакт" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1230,10 +1271,53 @@ msgstr "Відновлює сховане головне вікно (діє ті msgid "- GNOME client for Jami" msgstr "- GNOME клієнт для Джамі" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "Паролі не збігаються" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "Зберегти файл" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "" + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1256,10 +1340,6 @@ msgstr "Джамі — це вільне програмне забезпече msgid "Send File" msgstr "" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "Зберегти файл" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1322,22 +1402,6 @@ msgstr "Поточний пароль" msgid "New password" msgstr "Новий пароль" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "" - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "Неправильний пароль" diff --git a/po/zh.po b/po/zh.po index 6886a8b2..c9806a01 100644 --- a/po/zh.po +++ b/po/zh.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" "Language-Team: Chinese (http://www.transifex.com/savoirfairelinux/jami/language/zh/)\n" "MIME-Version: 1.0\n" @@ -178,7 +178,8 @@ msgstr "別名" msgid "RingID" msgstr "" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "密码" @@ -267,135 +268,174 @@ msgstr "傳送" msgid "Transfer to" msgstr "" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "取消" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "" -#: ui/accountcreationwizard.ui:97 -msgid "Add a new SIP account" +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." msgstr "" #: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" +msgid "Add a new SIP account" msgstr "" -#: ui/accountcreationwizard.ui:134 -msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." +#: ui/accountcreationwizard.ui:234 +msgid "Archive" msgstr "" -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." msgstr "" -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" +#: ui/accountcreationwizard.ui:287 +msgid "PIN" msgstr "" -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." msgstr "" -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" + +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "下一步" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "個人檔案" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "帳號" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "" -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "使用者名" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "" -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "" - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "" @@ -500,7 +540,7 @@ msgstr "通用" msgid "Media" msgstr "媒體" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "設定" @@ -587,6 +627,10 @@ msgstr "" msgid "Enter archive password" msgstr "" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "取消" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "" @@ -603,10 +647,6 @@ msgstr "" msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "" @@ -998,12 +1038,13 @@ msgid "Choose download folder" msgstr "" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "" @@ -1065,90 +1106,90 @@ msgstr "" msgid "Add account…" msgstr "" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "從通訊錄尋找或是輸入號碼" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "來電" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1225,10 +1266,53 @@ msgstr "" msgid "- GNOME client for Jami" msgstr "" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "儲存檔案" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "" + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1251,10 +1335,6 @@ msgstr "" msgid "Send File" msgstr "" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "儲存檔案" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1317,22 +1397,6 @@ msgstr "" msgid "New password" msgstr "" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "" - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 99141a96..f230c007 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" -"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" +"Last-Translator: Ling-Xiao Yang <ling-xiao.yang@mail.mcgill.ca>\n" "Language-Team: Chinese (China) (http://www.transifex.com/savoirfairelinux/jami/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -179,7 +179,8 @@ msgstr "别名" msgid "RingID" msgstr "RingID" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "密码" @@ -268,135 +269,174 @@ msgstr "已转接" msgid "Transfer to" msgstr "" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "欢迎来到" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "取消" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "" -#: ui/accountcreationwizard.ui:97 -msgid "Add a new SIP account" +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." msgstr "" #: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "将此设备与已有帐户进行连接" +msgid "Add a new SIP account" +msgstr "" -#: ui/accountcreationwizard.ui:134 -msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" + +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." msgstr "" -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "输入您的PIN：" +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "PIN" -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." msgstr "" -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "输入您的密码：" +#: ui/accountcreationwizard.ui:382 +msgid "" +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "上一步" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "下一步" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "帐户资料" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "帐户" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "" -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "用户名" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "该密码用于加密您的帐户数据，以及将其他设备与您的帐户进行连接。" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "确认密码" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "跳过" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "可能需要数分钟。" -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "创建或载入帐户时发生错误。" - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "确定" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "系统" @@ -501,7 +541,7 @@ msgstr "通用" msgid "Media" msgstr "媒体" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "设置" @@ -588,6 +628,10 @@ msgstr "密码（必填）：" msgid "Enter archive password" msgstr "输入档案密码" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "取消" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "" @@ -604,10 +648,6 @@ msgstr "您的PIN：" msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "" @@ -999,12 +1039,13 @@ msgid "Choose download folder" msgstr "" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "取消(_C)" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "" @@ -1066,90 +1107,90 @@ msgstr "" msgid "Add account…" msgstr "" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "拨出" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "发起聊天" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "查找通讯录或输入号码" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "来电" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "清除历史记录" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "屏蔽联系人" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "" @@ -1226,10 +1267,53 @@ msgstr "恢复主窗口的隐藏状态（仅应用于主实例）" msgid "- GNOME client for Jami" msgstr "" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "密码不匹配" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "保存文件" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "" + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1252,10 +1336,6 @@ msgstr "Jami是一种自由通信软件，它尊重用户的自由和隐私。" msgid "Send File" msgstr "" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "保存文件" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1318,22 +1398,6 @@ msgstr "" msgid "New password" msgstr "新密码" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "" - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "密码错误" diff --git a/po/zh_TW.po b/po/zh_TW.po index 6d9ef9d8..adb0ccb0 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: Jami\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-09 03:09-0400\n" -"PO-Revision-Date: 2019-09-08 21:49+0000\n" -"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n" +"POT-Creation-Date: 2019-09-16 03:09-0400\n" +"PO-Revision-Date: 2019-09-16 07:09+0000\n" +"Last-Translator: 黃柏諺 <s8321414@gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/savoirfairelinux/jami/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -179,7 +179,8 @@ msgstr "別名" msgid "RingID" msgstr "RingID" -#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 +#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:191 +#: ui/accountcreationwizard.ui:624 ui/accountcreationwizard.ui:1018 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 msgid "Password" msgstr "密碼" @@ -268,135 +269,174 @@ msgstr "轉送" msgid "Transfer to" msgstr "轉移至" -#: ui/accountcreationwizard.ui:30 +#: ui/accountcreationwizard.ui:42 msgid "Welcome to" msgstr "歡迎來到" -#: ui/accountcreationwizard.ui:64 -msgid "Create Jami Account" -msgstr "建立 Jami 帳號" +#: ui/accountcreationwizard.ui:76 +msgid "Create local account" +msgstr "" -#: ui/accountcreationwizard.ui:65 -msgid "Create a new Jami account (for new users)" -msgstr "建立新的 Jami 帳號（為新使用者）" +#: ui/accountcreationwizard.ui:77 +msgid "Create a new Jami account on this device (for new users)" +msgstr "" -#: ui/accountcreationwizard.ui:72 -msgid "Import an existing account" -msgstr "匯入既有的帳號" +#: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591 +msgid "Import from device" +msgstr "" -#: ui/accountcreationwizard.ui:73 -msgid "Import an account with your PIN or your account's archive" -msgstr "以您的 PIN 碼或您的帳號封存匯入帳號" +#: ui/accountcreationwizard.ui:85 +msgid "Import an account with your PIN generated on another device" +msgstr "" -#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:889 -msgid "Cancel" -msgstr "取消" +#: ui/accountcreationwizard.ui:92 +msgid "Import from archive backup" +msgstr "" + +#: ui/accountcreationwizard.ui:93 +msgid "Import an account via your archive" +msgstr "" -#: ui/accountcreationwizard.ui:86 +#: ui/accountcreationwizard.ui:100 msgid "Advanced…" msgstr "進階……" -#: ui/accountcreationwizard.ui:97 +#: ui/accountcreationwizard.ui:111 +msgid "Connect to account manager" +msgstr "" + +#: ui/accountcreationwizard.ui:112 +msgid "Get your account via your credentials." +msgstr "" + +#: ui/accountcreationwizard.ui:119 msgid "Add a new SIP account" msgstr "新增新的 SIP 帳號" -#: ui/accountcreationwizard.ui:119 -msgid "Link this device to an existing account" -msgstr "連結此裝置到既有的帳號" +#: ui/accountcreationwizard.ui:234 +msgid "Archive" +msgstr "" + +#: ui/accountcreationwizard.ui:240 ui/accountcreationwizard.ui:293 +msgid "Informations." +msgstr "" + +#: ui/accountcreationwizard.ui:287 +msgid "PIN" +msgstr "PIN 碼" + +#: ui/accountcreationwizard.ui:349 +msgid "" +"You can obtain an archive by clicking on \"Export account\" in the account " +"settings. This will create a .gz file on your device." +msgstr "" -#: ui/accountcreationwizard.ui:134 +#: ui/accountcreationwizard.ui:382 msgid "" -"To link this device to another account, you have two possibilities. You can " -"import your account from the DHT, but first, you need to obtain a PIN code. " -"To generate the PIN code, go to the account management setting of a previous" -" device, choose the Jami Account to use and select \"Link another device to " -"this account\". You will get the necessary PIN to complete this form. The " -"PIN is only valid for 10 minutes. Or, you can directly import your account " -"from an archive." -msgstr "要連結此裝置到其他帳號，有兩種可能的做法。您可以從 DHT 匯入您的帳號，但首先您必須取得 PIN 碼。要生成 PIN 碼，到前一個裝置的帳號管理設定，選擇 Jami 帳號使用並選擇「連結其他裝置到此帳號」。您將需要取得 PIN 碼來完成這個表單。PIN 碼的有效期限只有10分鐘。或是您也可以直接從歸檔中匯入您的帳號。" - -#: ui/accountcreationwizard.ui:162 -msgid "Enter your pin:" -msgstr "輸入您的 PIN 碼：" - -#: ui/accountcreationwizard.ui:188 -msgid "Or import a file:" -msgstr "或是匯入檔案：" - -#: ui/accountcreationwizard.ui:207 -msgid "Enter your password:" -msgstr "輸入您的密碼：" - -#: ui/accountcreationwizard.ui:227 ui/accountcreationwizard.ui:530 +"To obtain a PIN (valid for 10 minutes), you need to open the account " +"settings on the other device and click on \"Link to another device\"." +msgstr "" + +#: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703 +#: ui/accountcreationwizard.ui:1084 msgid "Previous" msgstr "前一個" -#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:538 +#: ui/accountcreationwizard.ui:410 ui/accountcreationwizard.ui:711 +#: ui/accountcreationwizard.ui:1092 msgid "Next" msgstr "下一個" -#: ui/accountcreationwizard.ui:269 ui/profile.ui:7 +#: ui/accountcreationwizard.ui:442 ui/profile.ui:7 #: ui/newaccountsettingsview.ui:334 msgid "Profile" msgstr "設定檔" -#: ui/accountcreationwizard.ui:350 ui/ringmainwindow.ui:113 +#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113 #: ui/newaccountsettingsview.ui:414 msgid "Account" msgstr "帳號" -#: ui/accountcreationwizard.ui:387 +#: ui/accountcreationwizard.ui:560 msgid "Register username" msgstr "註冊使用者名稱" -#: ui/accountcreationwizard.ui:388 +#: ui/accountcreationwizard.ui:561 msgid "" "By checking this, you will register a unique username on the Jami network. " "People can use it to contact you instead of using your RingID, which is 40 " "characters long." msgstr "透過勾選這個，您將會在 Jami 網路上註冊一個獨一無二的使用者名稱。人們可以使用它來聯絡您，而不必使用長達 40 個字元的您的 RingID。" -#: ui/accountcreationwizard.ui:424 ui/profile.ui:73 -#: ui/newaccountsettingsview.ui:503 ui/newaccountsettingsview.ui:733 +#: ui/accountcreationwizard.ui:597 ui/accountcreationwizard.ui:982 +#: ui/profile.ui:73 ui/newaccountsettingsview.ui:503 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "使用者名稱" -#: ui/accountcreationwizard.ui:452 +#: ui/accountcreationwizard.ui:625 msgid "" "This password will be used to encrypt your account data and to link new " "devices to your account." msgstr "這個密碼將會用於加密您的帳號資料與連結新的裝置到您的帳號。" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:879 +#: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:879 msgid "Confirm password" msgstr "確認密碼" -#: ui/accountcreationwizard.ui:562 +#: ui/accountcreationwizard.ui:735 msgid "Generating your Jami account…" msgstr "正在生成您的 Jami 帳號……" -#: ui/accountcreationwizard.ui:588 +#: ui/accountcreationwizard.ui:766 +msgid "Backup your account!" +msgstr "" + +#: ui/accountcreationwizard.ui:782 +msgid "" +"This account only exists on this device. If you lost your device or " +"uninstall the application, your account will be deleted. You can backup your" +" account now or later." +msgstr "" + +#: ui/accountcreationwizard.ui:789 +msgid "Never show me this again" +msgstr "" + +#: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:566 +#: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2048 +msgid "Export account" +msgstr "匯出帳號" + +#: ui/accountcreationwizard.ui:813 +msgid "Skip" +msgstr "略過" + +#: ui/accountcreationwizard.ui:839 msgid "Registering username…" msgstr "正在註冊使用者名稱……" -#: ui/accountcreationwizard.ui:595 +#: ui/accountcreationwizard.ui:846 msgid "This may take a few minutes." msgstr "這將會耗費數分鐘。" -#: ui/accountcreationwizard.ui:621 +#: ui/accountcreationwizard.ui:872 msgid "Retrieving your Jami account…" msgstr "正在擷取您的 Jami 帳號……" -#: ui/accountcreationwizard.ui:647 -msgid "Error creating/loading account." -msgstr "建立／載入帳號時發生錯誤。" - -#: ui/accountcreationwizard.ui:652 ui/newaccountsettingsview.ui:266 +#: ui/accountcreationwizard.ui:913 ui/newaccountsettingsview.ui:266 #: ui/newaccountsettingsview.ui:289 msgid "OK" msgstr "確定" +#: ui/accountcreationwizard.ui:938 +msgid "Sign in" +msgstr "" + +#: ui/accountcreationwizard.ui:1057 +msgid "Account manager" +msgstr "" + #: ui/generalsettingsview.ui:51 msgid "System" msgstr "系統" @@ -501,7 +541,7 @@ msgstr "一般" msgid "Media" msgstr "媒體" -#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1786 +#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1809 msgid "Settings" msgstr "設定" @@ -588,6 +628,10 @@ msgstr "密碼（必要）：" msgid "Enter archive password" msgstr "輸入檔案密碼" +#: ui/newaccountsettingsview.ui:183 src/newaccountsettingsview.cpp:889 +msgid "Cancel" +msgstr "取消" + #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" msgstr "在網路上匯出" @@ -604,10 +648,6 @@ msgstr "您的已生成 PIN 碼：" msgid "Click to change password" msgstr "點選以變更密碼" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2048 -msgid "Export account" -msgstr "匯出帳號" - #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:901 msgid "Enable account" msgstr "啟用帳號" @@ -999,12 +1039,13 @@ msgid "Choose download folder" msgstr "選擇下載資料夾" #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414 -#: src/chatview.cpp:207 src/newaccountsettingsview.cpp:932 +#: src/accountcreationwizard.cpp:757 src/chatview.cpp:207 +#: src/newaccountsettingsview.cpp:932 msgid "_Cancel" msgstr "取消(_C)" -#: src/generalsettingsview.cpp:226 src/chatview.cpp:209 -#: src/newaccountsettingsview.cpp:934 +#: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759 +#: src/chatview.cpp:209 src/newaccountsettingsview.cpp:934 msgid "_Save" msgstr "儲存(_S)" @@ -1066,90 +1107,90 @@ msgstr "傳送已錄製的訊息" msgid "Add account…" msgstr "新增帳號……" -#: src/ringmainwindow.cpp:778 +#: src/ringmainwindow.cpp:797 msgctxt "button next to search entry will place a new call" msgid "place call" msgstr "開始通話" -#: src/ringmainwindow.cpp:781 +#: src/ringmainwindow.cpp:800 msgctxt "button next to search entry will open chat" msgid "open chat" msgstr "開啟聊天" -#: src/ringmainwindow.cpp:993 +#: src/ringmainwindow.cpp:1012 msgid "Jami - Migration needed" msgstr "" -#: src/ringmainwindow.cpp:1006 +#: src/ringmainwindow.cpp:1025 msgid "Migration in progress... please do not close this window." msgstr "" -#: src/ringmainwindow.cpp:1298 +#: src/ringmainwindow.cpp:1317 msgctxt "" "Please try to make the translation 50 chars or less so that it fits into the" " layout" msgid "Search contacts or enter number" msgstr "搜尋聯絡人或輸入號碼" -#: src/ringmainwindow.cpp:1761 +#: src/ringmainwindow.cpp:1784 msgid "Leave settings page" msgstr "離開設定頁面" -#: src/ringmainwindow.cpp:2158 +#: src/ringmainwindow.cpp:2181 msgid "There are active calls" msgstr "有活躍的通話" -#: src/ringmainwindow.cpp:2212 +#: src/ringmainwindow.cpp:2235 msgid " is calling you!" msgstr "正在與您通話！" -#: src/ringmainwindow.cpp:2213 +#: src/ringmainwindow.cpp:2236 msgid "Incoming call" msgstr "來電" -#: src/ringmainwindow.cpp:2357 +#: src/ringmainwindow.cpp:2380 msgid "New request from " msgstr "新請求從" -#: src/ringmainwindow.cpp:2358 +#: src/ringmainwindow.cpp:2381 msgid "Trust request" msgstr "信任請求" -#: src/ringmainwindow.cpp:2419 +#: src/ringmainwindow.cpp:2442 msgid "New message" msgstr "新訊息" -#: src/ringmainwindow.cpp:2482 +#: src/ringmainwindow.cpp:2505 msgid "Stop current call?" msgstr "停止目前的通話？" -#: src/ringmainwindow.cpp:2483 +#: src/ringmainwindow.cpp:2506 msgid "" "A call is currently ongoing. Do you want to close the window and stop all " "current calls?" msgstr "通話進行中。您想要關閉視窗並停止目前所有的通話嗎？" -#: src/ringmainwindow.cpp:2550 +#: src/ringmainwindow.cpp:2573 msgid "Clear history" msgstr "清除記錄" -#: src/ringmainwindow.cpp:2551 +#: src/ringmainwindow.cpp:2574 msgid "Do you really want to clear the history of this conversation?" msgstr "您真的想要清除此對話的歷史嗎？" -#: src/ringmainwindow.cpp:2566 +#: src/ringmainwindow.cpp:2589 msgid "Remove conversation" msgstr "移除對話" -#: src/ringmainwindow.cpp:2567 +#: src/ringmainwindow.cpp:2590 msgid "Do you really want to remove this conversation?" msgstr "您真的想要移除此對話嗎？" -#: src/ringmainwindow.cpp:2582 +#: src/ringmainwindow.cpp:2605 msgid "Block contact" msgstr "阻擋連絡人" -#: src/ringmainwindow.cpp:2583 +#: src/ringmainwindow.cpp:2606 msgid "Do you really want to block this contact?" msgstr "您真的想要封鎖此聯絡人嗎？" @@ -1226,10 +1267,53 @@ msgstr "還原主視窗的隱藏狀態(只適用於主程序)" msgid "- GNOME client for Jami" msgstr "- Jami 的 GNOME 用戶端" -#: src/accountcreationwizard.cpp:343 +#: src/accountcreationwizard.cpp:289 +msgid "An error occured during the account creation." +msgstr "" + +#: src/accountcreationwizard.cpp:293 +msgid "Cannot retrieve any account, please verify your PIN and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:297 +msgid "" +"annot retrieve any account, please verify your archive and your password." +msgstr "" + +#: src/accountcreationwizard.cpp:301 +msgid "" +"Cannot connect to provided account manager. Please check your credentials." +msgstr "" + +#: src/accountcreationwizard.cpp:487 msgid "Passwords don't match" msgstr "密碼不相符" +#: src/accountcreationwizard.cpp:610 +msgid "Import from backup" +msgstr "" + +#: src/accountcreationwizard.cpp:754 src/chatview.cpp:204 +#: src/newaccountsettingsview.cpp:929 +msgid "Save File" +msgstr "儲存檔案" + +#: src/accountcreationwizard.cpp:783 src/newaccountsettingsview.cpp:956 +msgid "You need to enter your password to export the full archive." +msgstr "您需要輸入您的密碼以匯出完整壓縮檔。" + +#: src/accountcreationwizard.cpp:784 src/newaccountsettingsview.cpp:957 +msgid "Enter password to export archive" +msgstr "輸入密碼以匯出壓縮檔" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Account exported!" +msgstr "帳號已匯出！" + +#: src/accountcreationwizard.cpp:807 src/newaccountsettingsview.cpp:980 +msgid "Export account failure." +msgstr "匯出帳號失敗。" + #: src/ringwelcomeview.cpp:88 msgid "" "This is your Jami username.\n" @@ -1252,10 +1336,6 @@ msgstr "Jami 是一套通用通訊的自由軟體，其尊重使用者的自由 msgid "Send File" msgstr "傳送檔案" -#: src/chatview.cpp:204 src/newaccountsettingsview.cpp:929 -msgid "Save File" -msgstr "儲存檔案" - #: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:995 msgid "" "Warning! This action will remove this account on this device!\n" @@ -1318,22 +1398,6 @@ msgstr "目前的密碼" msgid "New password" msgstr "新密碼" -#: src/newaccountsettingsview.cpp:956 -msgid "You need to enter your password to export the full archive." -msgstr "您需要輸入您的密碼以匯出完整壓縮檔。" - -#: src/newaccountsettingsview.cpp:957 -msgid "Enter password to export archive" -msgstr "輸入密碼以匯出壓縮檔" - -#: src/newaccountsettingsview.cpp:980 -msgid "Account exported!" -msgstr "帳號已匯出！" - -#: src/newaccountsettingsview.cpp:980 -msgid "Export account failure." -msgstr "匯出帳號失敗。" - #: src/newaccountsettingsview.cpp:1755 msgid "Bad password" msgstr "密碼錯誤" -- GitLab