diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/ar.po ring-20190215.1.f152c98~ds1/client-gnome/po/ar.po --- ring-20190110.1.e572469~ds1/client-gnome/po/ar.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/ar.po 2019-02-15 23:58:05.000000000 +0000 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Arabic (http://www.transifex.com/savoirfairelinux/ring/language/ar/)\n" "MIME-Version: 1.0\n" @@ -36,7 +36,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "الاسم المستعار" @@ -46,7 +46,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "كلمة السر" @@ -56,7 +55,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "" @@ -155,7 +154,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "ألغِ" @@ -223,8 +222,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "اسم المستخدم" @@ -234,7 +232,7 @@ "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "" @@ -263,67 +261,63 @@ msgid "OK" msgstr "موافق" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "النظام" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." +#: ui/generalsettingsview.ui:336 +msgid "Chatview" msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "إعرض الدردشة على اليمين" - -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "إعرض الدردشة في الأسفل" +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "إعدادات التاريخ" +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "" -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "أبقي على التاريخ ل (أيام):" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "تاريخ" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "(ضع صفر لتاريخ غير محدود)" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" +msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "أزل كل التاريخ" @@ -442,7 +436,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "" @@ -459,7 +453,6 @@ msgstr "كلمة السر" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "الوكيل" @@ -801,116 +794,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "حفظ الملف" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "النوع" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "اسم المضيف" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "اكشف كلمة السر" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "رقم البريد الصوتي" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -1105,7 +1008,11 @@ msgid "Send File" msgstr "" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "حفظ الملف" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1116,70 +1023,121 @@ msgid "Auto" msgstr "آلي" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/bg.po ring-20190215.1.f152c98~ds1/client-gnome/po/bg.po --- ring-20190110.1.e572469~ds1/client-gnome/po/bg.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/bg.po 2019-02-15 23:58:05.000000000 +0000 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Bulgarian (http://www.transifex.com/savoirfairelinux/ring/language/bg/)\n" "MIME-Version: 1.0\n" @@ -36,7 +36,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Псевдоним" @@ -46,7 +46,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Парола" @@ -56,7 +55,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "" @@ -155,7 +154,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Отказ" @@ -223,8 +222,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Потребителско име" @@ -234,7 +232,7 @@ "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Потвърдете паролата" @@ -263,67 +261,63 @@ msgid "OK" msgstr "Добре" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "Система" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." -msgstr "Включване на известията за входящи повиквания." - -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." -msgstr "Включване на известията за нови съобщения." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" +msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" +#: ui/generalsettingsview.ui:336 +msgid "Chatview" msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "Показване на съобщенията отдясно." +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" +msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "Показване на съобщенията отдолу." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Настройки на историята" +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "" -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "Пазене на историята (в дни):" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "История" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "(0 означава безкрайна история)" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" +msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Изчистване на цялата история" @@ -442,7 +436,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "" @@ -459,7 +453,6 @@ msgstr "парола" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Прокс" @@ -801,116 +794,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "Това действие е разрушително! Сигурни ли сте, че искате да изтриете цялата история на съобщенията и обажданията?" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "_Откажи" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "Грешна парола" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "Мрежова грешка, опитай отново" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "Запазване на файла" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Вид" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Име на сървъра" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "Показване на паролата" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Номер на гласова поща" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -1105,7 +1008,11 @@ msgid "Send File" msgstr "" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "Запазване на файла" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1116,70 +1023,121 @@ msgid "Auto" msgstr "Авт." -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Нова парола" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "Грешна парола" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "Мрежова грешка, опитай отново" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "Извън линия" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "На линия" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/ca.po ring-20190215.1.f152c98~ds1/client-gnome/po/ca.po --- ring-20190110.1.e572469~ds1/client-gnome/po/ca.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/ca.po 2019-02-15 23:58:05.000000000 +0000 @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Catalan (http://www.transifex.com/savoirfairelinux/ring/language/ca/)\n" "MIME-Version: 1.0\n" @@ -38,7 +38,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Àlies" @@ -48,7 +48,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Contrasenya" @@ -58,7 +57,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "" @@ -157,7 +156,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Cancel·la" @@ -225,8 +224,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Nom d'usuari" @@ -236,7 +234,7 @@ "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "" @@ -265,67 +263,63 @@ msgid "OK" msgstr "D'acord" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "Sistema" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." -msgstr "Activa notificacions per trucades entrants." - -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." -msgstr "Activa notificacions per missatges de xat nous" +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" +msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." -msgstr "Mostra imatges i vídeos a la finestra de xat" +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" +msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" +#: ui/generalsettingsview.ui:336 +msgid "Chatview" msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "Mostra el cat a la dreta." +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" +msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "Mostra el xat a la part inferior." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Preferències d'historial" +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "" -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "Guarda l'historial durant (dies):" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "Historial" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "(posar a 0 per a historial il·limitat)" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" +msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Neteja l'historial" @@ -444,7 +438,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "" @@ -461,7 +455,6 @@ msgstr "contrasenya" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Intermediari" @@ -803,116 +796,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "Açò és una operació destructiva. Esteu segur que voleu esborrar tot l'historial de xats i trucades?" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "_Cancel·la" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "Mala contrasenya" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "Error de xarxa, proveu de nou" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "Revoca el dispositiu" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Tipus" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Nom d'amfitrió" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "Mostra la contrasenya" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Nombre de correu de veu" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -1107,7 +1010,11 @@ msgid "Send File" msgstr "" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1118,70 +1025,121 @@ msgid "Auto" msgstr "" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "Revoca el dispositiu" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Nova contrasenya" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "Mala contrasenya" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "Error de xarxa, proveu de nou" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/cs_CZ.po ring-20190215.1.f152c98~ds1/client-gnome/po/cs_CZ.po --- ring-20190110.1.e572469~ds1/client-gnome/po/cs_CZ.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/cs_CZ.po 2019-02-15 23:58:05.000000000 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/savoirfairelinux/ring/language/cs_CZ/)\n" "MIME-Version: 1.0\n" @@ -37,7 +37,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Přezdívka" @@ -47,7 +47,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Heslo" @@ -57,7 +56,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "" @@ -156,7 +155,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Zrušit" @@ -224,8 +223,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Uživatelské jméno" @@ -235,7 +233,7 @@ "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:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Potvrdit heslo" @@ -264,67 +262,63 @@ msgid "OK" msgstr "Budiž" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "Systém" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." -msgstr "Povolit upozornění na příchozí hovory." - -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." -msgstr "Povolit upozornění na příchozí zprávy." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" +msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." -msgstr "Zadání čísla do pole vyhledávání jej vytočí." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" +msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" +#: ui/generalsettingsview.ui:336 +msgid "Chatview" msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "Ukázat zprávy napravo." +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" +msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "Ukázat zprávy dole." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Nastavení historie" +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "" -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "Kolik dnů uchovat historii:" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "Historie" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "(nastavte na 0 pro neomezenou historii)" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" +msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Vymazat celou historii" @@ -443,7 +437,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "" @@ -460,7 +454,6 @@ msgstr "heslo" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Proxy" @@ -802,116 +795,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "Toto je destruktivní akce. Skutečně chcete odstranit veškerou svou historii zpráv a volání?" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "_Zrušit" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "Nesprávné heslo" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "Chyba v síti, zkuste to znovu" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "Uložit soubor" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "Odebrat zařízení" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Typ" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Hostitelské jméno" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "Ukázat heslo" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Číslo hlasové schránky" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -1106,7 +1009,11 @@ msgid "Send File" msgstr "" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "Uložit soubor" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1117,70 +1024,121 @@ msgid "Auto" msgstr "Automaticky" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "Odebrat zařízení" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Nové heslo" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "Nesprávné heslo" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "Chyba v síti, zkuste to znovu" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "Nepřipojen" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "Připojen" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/da.po ring-20190215.1.f152c98~ds1/client-gnome/po/da.po --- ring-20190110.1.e572469~ds1/client-gnome/po/da.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/da.po 2019-02-15 23:58:05.000000000 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Danish (http://www.transifex.com/savoirfairelinux/ring/language/da/)\n" "MIME-Version: 1.0\n" @@ -37,7 +37,7 @@ msgid "This account is malformed, please enter your password" msgstr "Kontoen er forkert udformet - indtast venligst din adgangskode" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Alias" @@ -47,7 +47,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Adgangskode" @@ -57,7 +56,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "Slet konto" @@ -156,7 +155,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Annuller" @@ -224,8 +223,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Brugernavn" @@ -235,7 +233,7 @@ "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:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Bekræft adgangskode" @@ -264,67 +262,63 @@ msgid "OK" msgstr "OK" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "System" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." -msgstr "Aktiver notifikationer for indgående opkald" - -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." -msgstr "Aktiver notifikationer for afventende anmodninger." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" +msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." -msgstr "Aktiver notifikationer for nye beskeder." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" +msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." -msgstr "Vis billeder og videoer i chat-vindue." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" +msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." -msgstr "Indtastning af et nummer i søge-feltet vil foretage et opkald." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" +msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" -msgstr "Downloadmappe:" +#: ui/generalsettingsview.ui:336 +msgid "Chatview" +msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "Vis chat på højre side." +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" +msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "Vis chat i bunden." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Historik-indstillinger" +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "" -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "Behold historik i (dage):" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "Historik" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "(brug 0 for uendelig historik)" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" +msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Slet al historik" @@ -443,7 +437,7 @@ msgid "Click to change password" msgstr "Klik for at skifte adgangskode" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "Eksporter konto" @@ -460,7 +454,6 @@ msgstr "adgangskode" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Stedfortræder" @@ -802,116 +795,26 @@ msgid "Registration in progress…" msgstr "Igangværende registrering…" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "Dette er en destruktiv handling. Er du sikker på, at du vil slette al historik for beskeder og opkald?" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "Vælg downloadmappe" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "_Annuller" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "_Gem" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "Forkert adgangskode" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "Netværksfejl, prøv igen" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "Skift adgangskode" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "Gem fil" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "Fil eksporteret til destination:" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "Advarsel! Handlingen vil tilbagetrække enheden!\nBemærk: handlingen kan ikke fortrydes." - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "Indtast adgangskode for at tilbagetrække enhed" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "Ny adgangskode og dens bekræftelse er forskellige" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "Adgangskode ændret!" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "Forkert adgangskode" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "Gem navn" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "Tilbagetræk enheden" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "Fejl under tilbagetrækning af enhed" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Type" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "Generer automatisk…" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Værtsnavn" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "Vis adgangskode" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Telefonsvarernummer" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "Fejl: forkert adgangskode!" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "Fejl: ukendt enhed!" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "Del _skærmområde" @@ -1106,7 +1009,11 @@ msgid "Send File" msgstr "Send fil" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "Gem fil" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1117,70 +1024,121 @@ msgid "Auto" msgstr "Auto" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "Advarsel! Handlingen vil tilbagetrække enheden!\nBemærk: handlingen kan ikke fortrydes." + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "Indtast adgangskode for at tilbagetrække enhed" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "Rediger navn" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "Tilbagetræk enheden" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "Fejl under tilbagetrækning af enhed" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "Fjern blokering" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "Skift adgangskode" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "Ny adgangskode og dens bekræftelse er forskellige!" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "Forkert adgangskode!" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "Bemærk: dette vil kun ændre adgangskoden på denne enhed." -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "Nuværende adgangskode" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Ny adgangskode" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "Konto eksporteret!" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "Eksport af konto mislykkedes." -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "Forkert adgangskode" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "Netværksfejl, prøv igen" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "Ukendt fejl" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "Fejl: forkert adgangskode!" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "Fejl: ukendt enhed!" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "Initialiserer..." -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "Ingen forbindelse" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "Opretter forbindelse…" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "Forbundet" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "Ukendt status" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "••••••••" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "der er ikke indstillet nogen adgangskode" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/de_DE.po ring-20190215.1.f152c98~ds1/client-gnome/po/de_DE.po --- ring-20190110.1.e572469~ds1/client-gnome/po/de_DE.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/de_DE.po 2019-02-15 23:58:05.000000000 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: German (Germany) (http://www.transifex.com/savoirfairelinux/ring/language/de_DE/)\n" "MIME-Version: 1.0\n" @@ -37,7 +37,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Alias" @@ -47,7 +47,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Passwort" @@ -57,7 +56,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "" @@ -156,7 +155,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Abbrechen" @@ -224,8 +223,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Benutzername" @@ -235,7 +233,7 @@ "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Konto bestätigen" @@ -264,67 +262,63 @@ msgid "OK" msgstr "Okay" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "" - -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" -msgstr "" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "System" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" +#: ui/generalsettingsview.ui:336 +msgid "Chatview" msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" +#: ui/generalsettingsview.ui:449 +msgid "Download folder" msgstr "" -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "Verlauf" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Gesamten Verlauf löschen" @@ -443,7 +437,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "" @@ -460,7 +454,6 @@ msgstr "Passwort" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Proxy" @@ -802,116 +795,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "Schwaches Passwort" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "Gerät widerrufen" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Type" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Hostname" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "Kennwort anzeigen" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Voicemail-Rufnummer" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -1106,7 +1009,11 @@ msgid "Send File" msgstr "" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1117,70 +1024,121 @@ msgid "Auto" msgstr "" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "Gerät widerrufen" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Neues Passwort" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "Schwaches Passwort" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "Offline" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "Online" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/de.po ring-20190215.1.f152c98~ds1/client-gnome/po/de.po --- ring-20190110.1.e572469~ds1/client-gnome/po/de.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/de.po 2019-02-15 23:58:05.000000000 +0000 @@ -22,9 +22,9 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" -"Last-Translator: Alexandre Lision\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-23 07:08+0000\n" +"Last-Translator: nautilusx\n" "Language-Team: German (http://www.transifex.com/savoirfairelinux/ring/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -48,7 +48,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Alias" @@ -58,7 +58,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Passwort" @@ -68,7 +67,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "Konto löschen" @@ -167,7 +166,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Abbrechen" @@ -235,8 +234,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Benutzername" @@ -246,7 +244,7 @@ "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:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Passwort bestätigen" @@ -275,67 +273,63 @@ msgid "OK" msgstr "OK" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "System" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." -msgstr "Benachrichtigungen für eingehende Anrufe aktivieren." - -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." -msgstr "Benachrichtigungen für neue Chatnachrichten aktivieren." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" +msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." -msgstr "Bilder und Videos im Chat Fenster anzeigen" +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" +msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." -msgstr "Die Eingabe einer Nummer in der Suche startet einen neuen Anruf" +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" +msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" +#: ui/generalsettingsview.ui:336 +msgid "Chatview" msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "Chat rechts anzeigen" +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" +msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "Chat unten anzeigen" +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Verlaufseinstellungen" +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "" -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "Verlauf behalten für (Tage)" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "Verlauf" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "(auf 0 setzen für unbegrenzten Verlauf)" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" +msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Kompletten Verlauf leer" @@ -454,7 +448,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "Konten exportieren" @@ -471,7 +465,6 @@ msgstr "Passwort" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Proxy" @@ -813,116 +806,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "Das ist eine destruktive Operation. Sind Sie sicher, dass Sie die ganze Chat- und Rufgeschichte löschen wollen?" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "_Abbrechen" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "Unsicheres Passwort" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "Netzwerkfehler, bitte nochmal versuchen" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "Passwort ändern" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "Datei speichern" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "Das neue Passwort und die Bestätigung sind unterschiedlich" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "Passwort geändert!" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "Falsches Passwort" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "Gerät widerrufen" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Typ" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Rechnername" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "Passwort anzeigen" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Nummer des Anrufbeantworters" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -1111,13 +1014,17 @@ msgid "" "Jami is free software for universal communication which respects the " "freedoms and privacy of its users." -msgstr "" +msgstr "Jami ist eine freie Software für universelle Kommunikation und respektiert die Freiheiten und Privatsphäre der Benutzer." #: src/chatview.cpp:175 msgid "Send File" msgstr "" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "Datei speichern" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1128,70 +1035,121 @@ msgid "Auto" msgstr "Automatisch" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "Gerät widerrufen" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "Passwort ändern" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "Hinweis: Dies wird das Passwort nur auf diesem Gerät ändern." -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "Aktuelles Passwort" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Neues Passwort" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "Unsicheres Passwort" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "Netzwerkfehler, bitte nochmal versuchen" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "Unbekannter Fehler" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "Offline" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "Online" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/el.po ring-20190215.1.f152c98~ds1/client-gnome/po/el.po --- ring-20190110.1.e572469~ds1/client-gnome/po/el.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/el.po 2019-02-15 23:58:05.000000000 +0000 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Greek (http://www.transifex.com/savoirfairelinux/ring/language/el/)\n" "MIME-Version: 1.0\n" @@ -36,7 +36,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Ψευδώνυμο" @@ -46,7 +46,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Συνθηματικό" @@ -56,7 +55,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "" @@ -155,7 +154,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Ακύρωση" @@ -223,8 +222,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Όνομα χρήστη" @@ -234,7 +232,7 @@ "devices to your account." msgstr "Αυτό το συνθηματικό θα χρησιμοποιηθεί για να κρυπτογραφήσει τα δεδομένα του λογαριασμού σας και να συνδέσει νέες συσκευές στο λογαριασμό σας." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "" @@ -263,67 +261,63 @@ msgid "OK" msgstr "OK" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "Σύστημα" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." -msgstr "Ενεργοποίηση ειδοποιήσεων για εισερχόμενες κλήσεις." - -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." -msgstr "Ενεργοποίηση ειδοποιήσεων για νέα μηνύματα συνομιλιών." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" +msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." -msgstr "Η εισαγωγή αριθμού στην γραμμή αναζήτησης θα ξεκινήσει νέα κλήση." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" +msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" +#: ui/generalsettingsview.ui:336 +msgid "Chatview" msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "Εμφάνιση συνομιλίας στα δεξιά." +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" +msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "Εμφάνιση συνομιλίας κάτω." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Ρυθμίσεις ιστορικού" +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "" -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "Διατήρηση ιστορικού για (ημέρες):" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "Ιστορικό" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "(ορίστε σε 0 για ιστορικό χωρίς όριο)" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" +msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Καθαρισμός όλου του ιστορικού" @@ -442,7 +436,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "" @@ -459,7 +453,6 @@ msgstr "συνθηματικό" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Διαμεσολαβητής" @@ -801,116 +794,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "Αυτή είναι μια καταστροφική λειτουργία. Είστε σίγουροι ότι θέλετε να διαγράψετε όλες τις συζήτησης σας και το ιστορικό κλήσεων;" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "Άκυρο" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "Λανθασμένο συνθηματικό" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "Σφάλμα δικτύου, δοκιμάστε ξανά" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "Αποθήκευση αρχείου" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Τύπος" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Hostname" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "Εμφάνιση συνθηματικού" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Αριθμός Voicemail" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -1105,7 +1008,11 @@ msgid "Send File" msgstr "" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "Αποθήκευση αρχείου" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1116,70 +1023,121 @@ msgid "Auto" msgstr "" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Νέο συνθηματικό" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "Λανθασμένο συνθηματικό" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "Σφάλμα δικτύου, δοκιμάστε ξανά" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/eo.po ring-20190215.1.f152c98~ds1/client-gnome/po/eo.po --- ring-20190110.1.e572469~ds1/client-gnome/po/eo.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/eo.po 2019-02-15 23:58:05.000000000 +0000 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Esperanto (http://www.transifex.com/savoirfairelinux/ring/language/eo/)\n" "MIME-Version: 1.0\n" @@ -36,7 +36,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Kaŝnomo" @@ -46,7 +46,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Pasvorto" @@ -56,7 +55,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "" @@ -155,7 +154,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Rezigni" @@ -223,8 +222,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Uzantnomo" @@ -234,7 +232,7 @@ "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Konfirmu pasvorton" @@ -263,67 +261,63 @@ msgid "OK" msgstr "Okej" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "Sistemo" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." -msgstr "Ŝalti sciigojn por envenaj vokoj." - -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." -msgstr "Ŝalti sciigojn por novaj babilmesaĝoj." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" +msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." -msgstr "Enigi numeron en la serĉejon vokos la numeron." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" +msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" +#: ui/generalsettingsview.ui:336 +msgid "Chatview" msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "Montru babilon dekstre." +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" +msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "Montru babilon sube." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Historiaj agordoj" +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "" -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "Konservi historian dum (tagoj):" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "Historio" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "(Agordu 0 por senlima historio)" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" +msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Vakigi tutan historion" @@ -442,7 +436,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "" @@ -459,7 +453,6 @@ msgstr "pasvorto" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Prokura servilo" @@ -801,116 +794,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "Tiu ĉi ago estas detrua. Ĉu vi certe volas forigi ĉiom da via babila kaj voka historio?" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "_Rezigni" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "Malĝusta pasvorto" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "Reteraro, reprovu poste" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "Konservi Dosieron" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Tipo" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Nomo de gastiga komputilo" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "Montru pasvorton" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Parolita mesaĝo" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -1105,7 +1008,11 @@ msgid "Send File" msgstr "" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "Konservi Dosieron" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1116,70 +1023,121 @@ msgid "Auto" msgstr "Aŭtomata" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Nova pasvorto" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "Malĝusta pasvorto" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "Reteraro, reprovu poste" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/es_AR.po ring-20190215.1.f152c98~ds1/client-gnome/po/es_AR.po --- ring-20190110.1.e572469~ds1/client-gnome/po/es_AR.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/es_AR.po 2019-02-15 23:58:05.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/savoirfairelinux/ring/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -34,7 +34,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Alias" @@ -44,7 +44,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Contraseña" @@ -54,7 +53,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "" @@ -153,7 +152,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Cancelar" @@ -221,8 +220,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Nombre de usuario" @@ -232,7 +230,7 @@ "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Confirmar contraseña" @@ -261,67 +259,63 @@ msgid "OK" msgstr "Ok" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "Sistema" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." +#: ui/generalsettingsview.ui:336 +msgid "Chatview" msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." +#: ui/generalsettingsview.ui:449 +msgid "Download folder" msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Ajustes de Historial" - -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "Historial" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "" @@ -440,7 +434,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "" @@ -457,7 +451,6 @@ msgstr "contraseña" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Proxy" @@ -799,116 +792,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "Cambiar contraseña" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "Revocar dispositivo" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Tipo" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Nombre del anfitrión" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "Mostrar contraseña" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -1103,7 +1006,11 @@ msgid "Send File" msgstr "" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1114,70 +1021,121 @@ msgid "Auto" msgstr "" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "Revocar dispositivo" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "Cambiar contraseña" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Nueva contraseña" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "Error desconocido" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/es.po ring-20190215.1.f152c98~ds1/client-gnome/po/es.po --- ring-20190110.1.e572469~ds1/client-gnome/po/es.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/es.po 2019-02-15 23:58:05.000000000 +0000 @@ -14,6 +14,7 @@ # fgp , 2016 # Gabriel Molina , 2017 # Jelid Leon , 2017 +# Jose Esparza , 2019 # jsagarribay , 2016 # jsagarribay , 2016 # Juanjo Faico , 2016 @@ -36,9 +37,9 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-18 14:35+0000\n" -"Last-Translator: Pier Jose Gotta Perez \n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-22 04:01+0000\n" +"Last-Translator: Jose Esparza \n" "Language-Team: Spanish (http://www.transifex.com/savoirfairelinux/ring/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -62,7 +63,7 @@ msgid "This account is malformed, please enter your password" msgstr "Esta cuenta tiene un formato incorrecto, introduzca su contraseña" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Alias" @@ -72,7 +73,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Contraseña" @@ -82,7 +82,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "Borrar cuenta" @@ -181,7 +181,7 @@ msgstr "Vincular este dispositivo con una cuenta Jami creada en otro dispositivo" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Cancelar" @@ -249,8 +249,7 @@ 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/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Nombre de usuario" @@ -260,7 +259,7 @@ "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:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Confirmar contraseña" @@ -289,67 +288,63 @@ msgid "OK" msgstr "OK" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "Configuraciones de Jami" - -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" -msgstr "Ejecutar Jami al iniciar la sesión" - -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." -msgstr "Mostrar el icono de Jami en el área de notificación (systray)." - -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." -msgstr "Mostrar Jami al recibir llamadas" - -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." -msgstr "Habilitar notificación de llamada entrante." - -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." -msgstr "Habilite las notificaciones sobre peticiones pendientes." - -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." -msgstr "Habilitar notificación de mensajes de chat" - -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." -msgstr "Mostrar imágenes y videos en la ventana de conversación" - -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." -msgstr "Teclear un número en el cuadro de búsqueda hará una llamada." - -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" -msgstr "Carpeta de descargas:" - -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "Mostrar chat a la derecha" - -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "Mostrar chat abajo" - -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Configuración del Historial" - -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "Guardar historial por (días):" - -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "(0 para historial ilimitado)" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "Sistema" + +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" +msgstr "Iniciar aplicación al iniciar sesión" + +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" +msgstr "Mostrar el ícono de Jami (systray) en el área de programas en ejecución" + +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" +msgstr "Traer a Jami a primer plano en llamadas entrantes" + +#: ui/generalsettingsview.ui:189 +msgid "Notifications" +msgstr "Notificaciones" + +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" +msgstr "Habilitar notificaciones para llamadas entrantes." + +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" +msgstr "Activar notificaciones para solicitudes pendientes" + +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" +msgstr "Activar notificaciones para nuevos mensajes en el chat" + +#: ui/generalsettingsview.ui:336 +msgid "Chatview" +msgstr "Vista de chat" + +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" +msgstr "Mostrar imágenes y vídeos dentro de la vista de chat" + +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "Mostrar la vista de chat a la derecha (en la parte inferior si esta desactivado)" + +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "Descargar carpeta" + +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "Historial" + +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" +msgstr "Mantener el historial por (días, 0 = ilimitado)" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Limpiar todo el historial" @@ -468,7 +463,7 @@ msgid "Click to change password" msgstr "Haga clic para cambiar la contraseña" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "Exportar la cuenta" @@ -485,7 +480,6 @@ msgstr "contraseña" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Proxy" @@ -827,116 +821,26 @@ msgid "Registration in progress…" msgstr "Registro en curso..." -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "Esta es una operación irreversible. ¿Estás seguro de eliminar todo el historial de chat y llamadas?" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "Elegir la carpeta de descargas" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "_Cancelar" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "_Guardar" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "Contraseña errónea" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "Error en la red, inténtalo de nuevo" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "No se ha podido exportar al Jami, inténtalo de nuevo" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "Cambiar contraseña" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "Guardar fichero" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "Archivo exportado al destino:" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "¡Advertencia! ¡Esta acción anulará el dispositivo!\nNota: esta acción no puede deshacerse." - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "Introduzca la contraseña para anular el dispositivo" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "Nueva contraseña y su confirmación es diferente" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "Contraseña cambiada!" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "Contraseña incorrecta" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "Guardar nombre" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "Anular dispositivo" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "Error al anular el dispositivo" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Tipo" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "auto-generando..." - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Nombre del servidor" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "Mostrar contraseña" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Número de Mensaje de Voz" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "Error: ¡Contraseña incorrecta!" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "Error: ¡dispositivo desconocido!" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "Compartir el área de _pantalla" @@ -1131,7 +1035,11 @@ msgid "Send File" msgstr "Enviar archivo" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "Guardar fichero" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1142,70 +1050,121 @@ msgid "Auto" msgstr "Auto" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "¡Advertencia! ¡Esta acción anulará el dispositivo!\nNota: esta acción no puede deshacerse." + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "Introduzca la contraseña para anular el dispositivo" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "Editar nombre" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "Anular dispositivo" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "Error al anular el dispositivo" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "Desbloquear" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "Cambiar contraseña" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "¡La nueva contraseña y su confirmación es diferente!" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "¡Contraseña incorrecta!" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "Nota: esto cambiará la contraseña solo en este dispositivo" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "Contraseña actual" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Contraseña nueva" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +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:955 +msgid "Enter password to export archive" +msgstr "Ingresa tu contraseña para exportar el archivo" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "¡Cuenta exportada!" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "Fallo al exportar la cuenta." -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "Contraseña errónea" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "Error en la red, inténtalo de nuevo" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "Error desconocido" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "No se ha podido exportar al Jami, inténtalo de nuevo" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "Error: ¡Contraseña incorrecta!" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "Error: ¡dispositivo desconocido!" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "Inicializando…" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "Desconectado" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "Conectando..." -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "En línea" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "Estado desconocido" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "••••••••" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "sin contraseña establecida" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/eu.po ring-20190215.1.f152c98~ds1/client-gnome/po/eu.po --- ring-20190110.1.e572469~ds1/client-gnome/po/eu.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/eu.po 2019-02-15 23:58:05.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Basque (http://www.transifex.com/savoirfairelinux/ring/language/eu/)\n" "MIME-Version: 1.0\n" @@ -34,7 +34,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "" @@ -44,7 +44,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "" @@ -54,7 +53,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "" @@ -153,7 +152,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Ezeztatu" @@ -221,8 +220,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "" @@ -232,7 +230,7 @@ "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "" @@ -261,67 +259,63 @@ msgid "OK" msgstr "" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" +#: ui/generalsettingsview.ui:43 +msgid "System" msgstr "" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." +#: ui/generalsettingsview.ui:336 +msgid "Chatview" msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." +#: ui/generalsettingsview.ui:449 +msgid "Download folder" msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" +#: ui/generalsettingsview.ui:486 +msgid "History" msgstr "" -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" msgstr "" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "" - -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "" @@ -440,7 +434,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "" @@ -457,7 +451,6 @@ msgstr "" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "" @@ -799,116 +792,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -1103,7 +1006,11 @@ msgid "Send File" msgstr "" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1114,70 +1021,121 @@ msgid "Auto" msgstr "" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/fa_IR.po ring-20190215.1.f152c98~ds1/client-gnome/po/fa_IR.po --- ring-20190110.1.e572469~ds1/client-gnome/po/fa_IR.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/fa_IR.po 2019-02-15 23:58:05.000000000 +0000 @@ -4,7 +4,7 @@ # # Translators: # Amin Mahmudian, 2017 -# Danial Behzadi , 2016-2017 +# Danial Behzadi , 2016-2017,2019 # Hasan Hejdari Nasab , 2017 # Hessam Shahpouri, 2016 # Reza Ghasemi, 2018 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Persian (Iran) (http://www.transifex.com/savoirfairelinux/ring/language/fa_IR/)\n" "MIME-Version: 1.0\n" @@ -39,7 +39,7 @@ msgid "This account is malformed, please enter your password" msgstr "این حساب کاربری نادرست می باشد. لطفا گذرواژه خود را وارد کنید" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "نام مستعار" @@ -49,7 +49,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "گذرواژه" @@ -59,7 +58,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "حذف حساب" @@ -143,7 +142,7 @@ #: ui/accountcreationwizard.ui:64 msgid "Create Jami Account" -msgstr "" +msgstr "ایجاد حساب جمی" #: ui/accountcreationwizard.ui:65 msgid "Create a new Jami account (for new users)" @@ -158,7 +157,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "لغو" @@ -191,7 +190,7 @@ #: ui/accountcreationwizard.ui:188 msgid "Or import a file:" -msgstr "" +msgstr "یا درون‌ریزی یک پرونده:" #: ui/accountcreationwizard.ui:207 msgid "Enter your password:" @@ -226,8 +225,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "نام کاربری" @@ -237,7 +235,7 @@ "devices to your account." msgstr "از این گذرواژه برای رمزنگاری داده های حساب شما و برای پیوند دادن دستگاه های جدید به حساب شما استفاده خواهد شد." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "تأیید گذرواژه" @@ -266,67 +264,63 @@ msgid "OK" msgstr "خب" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "سیستم" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." -msgstr "فعال سازی نوتیفیکیشن ها برای تماس های دریافتی" +#: ui/generalsettingsview.ui:189 +msgid "Notifications" +msgstr "آگاهی‌ها" -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." -msgstr "فعال سازی نوتیفیکیشن ها برای پیام های چت جدید" - -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." -msgstr "نمایش تصاویر و ویدیو ها در پنجره چت" +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" +msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" -msgstr "پوشه دانلود:" +#: ui/generalsettingsview.ui:336 +msgid "Chatview" +msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "نمایش چت در سمت راست." +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" +msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "نمایش چت در پایین." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "تنظیمات تاریخچه" +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "شاخهٔ بارگیری" -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "نگه داشتن تاریخچه برای (روز):" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "تاریخچه" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "پاکسازی تمام تاریخچه" @@ -445,7 +439,7 @@ msgid "Click to change password" msgstr "برای تغییر گذرواژه کلیک کنید" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "برون‌ریزی حساب" @@ -462,7 +456,6 @@ msgstr "گذرواژه" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "پراکسی" @@ -472,7 +465,7 @@ #: ui/newaccountsettingsview.ui:952 msgid "Known devices linked to this Jami account" -msgstr "" +msgstr "افزاره‌های شناخته شدهٔ پیوسته به این حساب جمی" #: ui/newaccountsettingsview.ui:960 msgid "Link another device" @@ -508,7 +501,7 @@ #: ui/newaccountsettingsview.ui:1288 msgid "Name server" -msgstr "" +msgstr "کارساز نام" #: ui/newaccountsettingsview.ui:1325 ui/newaccountsettingsview.ui:2478 msgid "Address" @@ -716,7 +709,7 @@ #: ui/incomingcallview.ui:173 msgid "Reject" -msgstr "" +msgstr "رد" #: ui/avatarmanipulation.ui:92 ui/avatarmanipulation.ui:125 msgid "Take photo" @@ -744,13 +737,13 @@ #: src/ring_client.cpp:117 msgid "Jami Error" -msgstr "" +msgstr "خطای جمی" #: src/ring_client.cpp:260 msgctxt "" "In the status icon menu, toggle action to show or hide the Jami main window" msgid "Show Jami" -msgstr "" +msgstr "نمایش جمی" #: src/ring_client.cpp:264 msgid "Quit" @@ -804,116 +797,26 @@ msgid "Registration in progress…" msgstr "در حال انجام ثبت نام..." -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "این یک عملیات مخرب است. آیا مطمئن هستید که می‌خواهید تمام گفت‌وگو‌ها و تاریخ‌چه تماس‌تان را پاک کنید؟" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "انتخاب پوشه دانلود" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "_لغو" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "_ذخیره" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "گذرواژهٔ بد" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "خطای شبکه، دوباره تلاش کنید" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "تغییر رمز عبور" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "ذخیره فایل" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "گذرواژه تغییر یافت!" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "گذرواژه ناصحیح" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "ذخیره نام" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "باطل کردن دستگاه" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "نوع" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "نام هاست" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "نمایش گذرواژه" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "شماره پست صوتی" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "خطا: گذرواژه اشتباه!" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "خطا: دستگاه ناشناس!" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -991,7 +894,7 @@ #: src/ringmainwindow.cpp:1578 msgid "Leave settings page" -msgstr "" +msgstr "خروج از صفحهٔ تنظیمات" #: src/ringmainwindow.cpp:1948 msgid " is calling you!" @@ -1016,7 +919,7 @@ #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95 msgctxt "Name of error window (dialog)" msgid "Jami Error" -msgstr "" +msgstr "خطای جمی" #: src/native/dbuserrorhandler.cpp:57 msgid "Trying to reconnect to the Jami daemon (dring)…" @@ -1102,13 +1005,17 @@ msgid "" "Jami is free software for universal communication which respects the " "freedoms and privacy of its users." -msgstr "" +msgstr "جمی نرم‌افزار آزاد برای ارتباط جهانی است که به آزادی‌ها و محرمانگی کاربرانش احترام می‌گذارد." #: src/chatview.cpp:175 msgid "Send File" msgstr "ارسال فایل" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "ذخیره فایل" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1119,70 +1026,121 @@ msgid "Auto" msgstr "خودکار" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "ویرایش نام" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "باطل کردن دستگاه" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "تغییر رمز عبور" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "گذرواژه و تاییدیه آن با هم فرق میکنند!" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "گذرواژه اشتباه!" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "توجه: این فقط گذرواژه روی این دستگاه را تغییر می دهد." -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "گذرواژه فعلی" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "گذرواژهٔ نو" -#: src/newaccountsettingsview.cpp:949 -msgid "Account exported!" +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 +msgid "Account exported!" +msgstr "حساب صادر شد!" + +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "گذرواژهٔ بد" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "خطای شبکه، دوباره تلاش کنید" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "خطای ناشناخته" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "خطا: گذرواژه اشتباه!" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "خطا: دستگاه ناشناس!" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "‌خط" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "در حال اتصال..." -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "برخط" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "وضعیت ناشناخته" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "••••••••" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "هیچ گذرواژه ای تنظیم نشده است" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/fi.po ring-20190215.1.f152c98~ds1/client-gnome/po/fi.po --- ring-20190110.1.e572469~ds1/client-gnome/po/fi.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/fi.po 2019-02-15 23:58:05.000000000 +0000 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Finnish (http://www.transifex.com/savoirfairelinux/ring/language/fi/)\n" "MIME-Version: 1.0\n" @@ -35,7 +35,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Lempinimi" @@ -45,7 +45,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Salasana" @@ -55,7 +54,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "" @@ -154,7 +153,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Peru" @@ -222,8 +221,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Käyttäjänimi" @@ -233,7 +231,7 @@ "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Varmista salasana" @@ -262,67 +260,63 @@ msgid "OK" msgstr "OK" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "Järjestelmä" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." +#: ui/generalsettingsview.ui:336 +msgid "Chatview" msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "Näytä keskustelu oikealla." - -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "Näytä keskustelu alhaalla." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Historian asetukset" +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "" -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "Pidä historia tallessa (päivää):" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "Historia" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "(aseta 0 rajoittamattomalle historialle)" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" +msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Tyhjennä koko historia" @@ -441,7 +435,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "" @@ -458,7 +452,6 @@ msgstr "salasana" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Välityspalvelin" @@ -800,116 +793,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "Vaihda salasana" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "Tallenna tiedosto" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "Tiedosto viety kohteeseen:" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Tyyppi" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Yhteysosoite" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "Näytä salasana" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Vastaajan numero" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -1104,7 +1007,11 @@ msgid "Send File" msgstr "" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "Tallenna tiedosto" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1115,70 +1022,121 @@ msgid "Auto" msgstr "Automaattinen" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "Vaihda salasana" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Uusi salasana" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "salasanaa ei ole asetettu" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/fr_CA.po ring-20190215.1.f152c98~ds1/client-gnome/po/fr_CA.po --- ring-20190110.1.e572469~ds1/client-gnome/po/fr_CA.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/fr_CA.po 2019-02-15 23:58:05.000000000 +0000 @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: French (Canada) (http://www.transifex.com/savoirfairelinux/ring/language/fr_CA/)\n" "MIME-Version: 1.0\n" @@ -38,7 +38,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Alias" @@ -48,7 +48,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Mot de passe" @@ -58,7 +57,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "" @@ -157,7 +156,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Annuler" @@ -225,8 +224,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Nom d'utilisateur" @@ -236,7 +234,7 @@ "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Confirmer le mot de passe" @@ -265,67 +263,63 @@ msgid "OK" msgstr "OK" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "Système" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." -msgstr "Activer les notifications pour les appels entrants." - -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" +#: ui/generalsettingsview.ui:336 +msgid "Chatview" msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Paramètres de l'historique" - -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" +#: ui/generalsettingsview.ui:449 +msgid "Download folder" msgstr "" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "historique" + +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Effacer tout l'historique" @@ -444,7 +438,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "" @@ -461,7 +455,6 @@ msgstr "mot de passe" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Proxy" @@ -803,116 +796,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "Êtes-vous certain de vouloir supprimer tout l'historique de votre clavardage et de vos appels? Cette opération est destructrice." -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "_Annuler" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "Mauvais mot de passe" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "Erreur réseau, réessayez" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "Changer mot de passe" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "Enregistrer le fichier" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "Le nouveau mot de passe et sa confirmation ne sont pas identiques" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "Mot de passe modifié" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "Mot de passe incorrect" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "Révoquer l'appareil" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Type" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Nom d'hôte" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "Afficher le mot de passe" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Numéro de boîte vocale" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -1107,7 +1010,11 @@ msgid "Send File" msgstr "" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "Enregistrer le fichier" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1118,70 +1025,121 @@ msgid "Auto" msgstr "Auto" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "Révoquer l'appareil" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "Changer mot de passe" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Nouveau mot de passe" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "Mauvais mot de passe" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "Erreur réseau, réessayez" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "Hors ligne" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "En ligne" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/fr_FR.po ring-20190215.1.f152c98~ds1/client-gnome/po/fr_FR.po --- ring-20190110.1.e572469~ds1/client-gnome/po/fr_FR.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/fr_FR.po 2019-02-15 23:58:05.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: French (France) (http://www.transifex.com/savoirfairelinux/ring/language/fr_FR/)\n" "MIME-Version: 1.0\n" @@ -33,7 +33,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "" @@ -43,7 +43,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "" @@ -53,7 +52,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "" @@ -152,7 +151,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "" @@ -220,8 +219,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "nom d'utilisateur" @@ -231,7 +229,7 @@ "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "" @@ -260,67 +258,63 @@ msgid "OK" msgstr "" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" +#: ui/generalsettingsview.ui:43 +msgid "System" msgstr "" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." +#: ui/generalsettingsview.ui:336 +msgid "Chatview" msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." +#: ui/generalsettingsview.ui:449 +msgid "Download folder" msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "" - -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "Historique" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "" @@ -439,7 +433,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "" @@ -456,7 +450,6 @@ msgstr "" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "" @@ -798,116 +791,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "changer le mot de passe" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "nom d'hôte" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "boite vocale " - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -1102,7 +1005,11 @@ msgid "Send File" msgstr "" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1113,70 +1020,121 @@ msgid "Auto" msgstr "" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "changer le mot de passe" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Nouveau mot de passe" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/fr.po ring-20190215.1.f152c98~ds1/client-gnome/po/fr.po --- ring-20190110.1.e572469~ds1/client-gnome/po/fr.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/fr.po 2019-02-15 23:58:05.000000000 +0000 @@ -12,7 +12,7 @@ # Baptiste Jonglez, 2016 # Breizh , 2016 # Bruno Pagani , 2015 -# Cyrille Béraud , 2015,2017-2018 +# Cyrille Béraud , 2015,2017-2019 # Guillaume Roguez, 2015-2016 # Guillaume Roguez, 2016-2017 # Guillaume Roguez, 2015 @@ -25,8 +25,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-30 15:41+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 18:01+0000\n" "Last-Translator: Cyrille Béraud \n" "Language-Team: French (http://www.transifex.com/savoirfairelinux/ring/language/fr/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgid "This account is malformed, please enter your password" msgstr "Ce compte est inconsistant, veuillez entrer votre mot de passe" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Nom du compte" @@ -61,7 +61,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Mot de passe" @@ -71,7 +70,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "Supprimer le compte" @@ -170,7 +169,7 @@ msgstr "Associer cet appareil à un compte Jami créé sur un autre appareil" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Annuler" @@ -238,8 +237,7 @@ 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/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Nom d’utilisateur" @@ -249,7 +247,7 @@ "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:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Confirmer le mot de passe" @@ -278,67 +276,63 @@ msgid "OK" msgstr "OK" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "Paramètres Jami" - -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" -msgstr "Lancer Jami à la connexion" - -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." -msgstr "Afficher l’icône de Jami dans la zone de notification" - -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." -msgstr "Afficher Jami en avant plan en cas d'appels entrants" - -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." -msgstr "Activer les notifications d'appel entrant" - -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." -msgstr "Activer les notifications pour les invitations" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "Système" + +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" +msgstr "Lancer Jami à l’ouverture de session" + +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" +msgstr "Montrer l'icône de Jami dans la zone de notification" + +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" +msgstr "Ramener Jami à l’avant-plan en cas d’appel entrant" + +#: ui/generalsettingsview.ui:189 +msgid "Notifications" +msgstr "Notifications" + +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" +msgstr "Activer les notifications sur appels entrants" + +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" +msgstr "Activer les notifications pour les invitations en attente" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" msgstr "Activer les notifications de nouveaux messages" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." -msgstr "Afficher les images et vidéos dans le fenêtre de clavardage." - -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." -msgstr "Pour appeler, entrer le numéro de téléphone dans la zone de recherche." - -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" -msgstr "Dossier de téléchargement :" - -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "Afficher les discussions texte à droite" - -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "Afficher les discussions texte en bas" - -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Paramètres de l’historique" - -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "Garder l’historique pendant (jours) :" - -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "(mettre à 0 pour garder indéfiniment)" +#: ui/generalsettingsview.ui:336 +msgid "Chatview" +msgstr "Vue dicussions" + +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" +msgstr "Afficher les images et les vidéos dans la vue des discussions" + +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "Afficher les discussions texte à droite (par défaut en bas)" + +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "Répertoire de téléchargement" + +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "Historique" + +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" +msgstr "Garder l’historique pendant (jours, 0 = illimité)" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Effacer tout l’historique" @@ -457,7 +451,7 @@ msgid "Click to change password" msgstr "Cliquer ici pour changer le mot de passe" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "Exporter compte" @@ -474,7 +468,6 @@ msgstr "mot de passe" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Serveur mandataire" @@ -816,116 +809,26 @@ msgid "Registration in progress…" msgstr "Enregistrement en cours ..." -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "Cette opération est irréversible. Êtes-vous sûr de vouloir effacer toutes vos conversations ainsi que votre historique d'appel ?" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "Choisissez le dossier de téléchargement" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "_Annuler" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "_Sauvegarder" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "Mot de passe incorrect" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "Erreur réseau, veuillez réessayer." - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "Impossible de lancer l'exportation vers Jami, réessayez" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "changer le mot de passe" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "Sauvegarder" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "Fichier exporté à destination :" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "Avertissement ! Cette action révoquera l'appareil. Cette opération est irréversible." - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "Entrer le mot de passe pour révoquer l'appareil" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "Les mots de passe saisis sont différents" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "Mot de passe modifié !" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "Mot de passe incorrecte" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "Sauvegarder le nom" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "Révoquer l'appareil" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "Erreur au cours de la révocation d'un appareil" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Type" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "Génération automatique …" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Nom d’hôte" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "Afficher le mot de passe" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Numéro de boîte vocale" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "Erreur : mot de passe incorrect" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "Erreur : appareil inconnu" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "Partager une partie de votre écran" @@ -1120,7 +1023,11 @@ msgid "Send File" msgstr "Envoyez un fichier" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "Sauvegarder" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1131,70 +1038,121 @@ msgid "Auto" msgstr "Auto" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "Avertissement ! Cette action révoquera l'appareil. Cette opération est irréversible." + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "Entrer le mot de passe pour révoquer l'appareil" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "Modifier le nom" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "Révoquer l'appareil" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "Erreur au cours de la révocation d'un appareil" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "Ré-autoriser" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "changer le mot de passe" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "Les deux mots de passe sont différents !" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "Mot de passe incorrect !" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "Note : cette opération modifiera votre mot de passe uniquement sur cet appareil." -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "Mot de passe actuel" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Nouveau mot de passe" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +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:955 +msgid "Enter password to export archive" +msgstr "Entrer le mot de passe pour exporter l'archive" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "Le compte a été exporté." -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "Échec de l'export de compte." -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "Mot de passe incorrect" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "Erreur réseau, veuillez réessayer." + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "Erreur inconnue" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "Impossible de lancer l'exportation vers Jami, réessayez" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "Erreur : mot de passe incorrect" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "Erreur : appareil inconnu" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "Initialisation ..." -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "Déconnecté" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "En cours de connexion ..." -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "En ligne" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "État inconnu" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "••••••••" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "Pas de mot de passe" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/he.po ring-20190215.1.f152c98~ds1/client-gnome/po/he.po --- ring-20190110.1.e572469~ds1/client-gnome/po/he.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/he.po 2019-02-15 23:58:05.000000000 +0000 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Hebrew (http://www.transifex.com/savoirfairelinux/ring/language/he/)\n" "MIME-Version: 1.0\n" @@ -35,7 +35,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "כינוי" @@ -45,7 +45,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "סיסמה" @@ -55,7 +54,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "" @@ -154,7 +153,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "ביטול" @@ -222,8 +221,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "שם משתמש" @@ -233,7 +231,7 @@ "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "" @@ -262,67 +260,63 @@ msgid "OK" msgstr "" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" +#: ui/generalsettingsview.ui:43 +msgid "System" msgstr "" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." +#: ui/generalsettingsview.ui:336 +msgid "Chatview" msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." +#: ui/generalsettingsview.ui:449 +msgid "Download folder" msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "הגדרות היסטוריה" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "היסטוריה" -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "שמור היסטוריה למשך (ימים):" - -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "טהר היסטוריה" @@ -441,7 +435,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "" @@ -458,7 +452,6 @@ msgstr "סיסמה" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "פרוקסי" @@ -800,116 +793,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "_ביטול" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "סיסמה רעה" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "טיפוס" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "שם מארח" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "הצג סיסמה" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "מספר תא קולי" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -1104,7 +1007,11 @@ msgid "Send File" msgstr "" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1115,70 +1022,121 @@ msgid "Auto" msgstr "" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "סיסמה רעה" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/hr.po ring-20190215.1.f152c98~ds1/client-gnome/po/hr.po --- ring-20190110.1.e572469~ds1/client-gnome/po/hr.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/hr.po 2019-02-15 23:58:05.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Croatian (http://www.transifex.com/savoirfairelinux/ring/language/hr/)\n" "MIME-Version: 1.0\n" @@ -34,7 +34,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Alias" @@ -44,7 +44,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Lozinka" @@ -54,7 +53,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "" @@ -153,7 +152,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Poništi" @@ -221,8 +220,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Korisničko ime" @@ -232,7 +230,7 @@ "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Potvrdi lozinku" @@ -261,67 +259,63 @@ msgid "OK" msgstr "U redu" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "Sustav" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." +#: ui/generalsettingsview.ui:336 +msgid "Chatview" msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." +#: ui/generalsettingsview.ui:449 +msgid "Download folder" msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Postavke povijesti" - -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "Zadrži povijest (dana):" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "Povijest" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "(postavi na 0 za neograničenu povijest)" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" +msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Očisti svu povijest" @@ -440,7 +434,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "" @@ -457,7 +451,6 @@ msgstr "lozinka" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Proxy" @@ -799,116 +792,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "Spremi datoteku" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Vrsta" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Ime poslužitelja" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "Prikaži lozinku" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Broj govorne pošte" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -1103,7 +1006,11 @@ msgid "Send File" msgstr "" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "Spremi datoteku" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1114,70 +1021,121 @@ msgid "Auto" msgstr "" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Nova lozinka" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/hu.po ring-20190215.1.f152c98~ds1/client-gnome/po/hu.po --- ring-20190110.1.e572469~ds1/client-gnome/po/hu.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/hu.po 2019-02-15 23:58:05.000000000 +0000 @@ -4,14 +4,14 @@ # # Translators: # Balázs Meskó , 2017 -# . . , 2017-2018 +# . . , 2017-2019 # Zsolt , 2016 msgid "" msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-31 05:00+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-24 23:19+0000\n" "Last-Translator: . . \n" "Language-Team: Hungarian (http://www.transifex.com/savoirfairelinux/ring/language/hu/)\n" "MIME-Version: 1.0\n" @@ -30,13 +30,13 @@ #: ui/accountmigrationview.ui:20 msgid "Account migration required" -msgstr "Fiók migrálás szükséges" +msgstr "Fiók átvitel szükséges" #: ui/accountmigrationview.ui:31 msgid "This account is malformed, please enter your password" msgstr "Ez a fiók meghibásodott, kérjük, adja meg a jelszavát" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Álnév" @@ -46,17 +46,16 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Jelszó" #: ui/accountmigrationview.ui:198 msgid "Migrate account" -msgstr "Fiók áttelepítése" +msgstr "Fiók átvitel" #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "Fiók törlése" @@ -155,7 +154,7 @@ msgstr "Csatlakoztassa az eszközöket egy másik eszközön létrehozott Jami fiókhoz" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Mégse" @@ -223,8 +222,7 @@ msgstr "Ezt bejelölve, regisztrál 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/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Felhasználónév" @@ -234,7 +232,7 @@ "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:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Jelszó megerősítése" @@ -263,67 +261,63 @@ msgid "OK" msgstr "OK" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "A Jami beállításai" - -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" -msgstr "A Jami indítása bejelentkezéskor" - -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." -msgstr "A Jami ikon megjelenítése az értesítési területen (rendszertálca)." - -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." -msgstr "A Jami előtérbe hozása bejövő hívások esetén." - -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." -msgstr "Értesítések engedélyezése a bejövő hívásokhoz." - -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." -msgstr "A függőben lévő kérelmekre vonatkozó értesítések engedélyezése." - -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." -msgstr "Értesítések engedélyezése az új csevegési üzenetekhez." - -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." -msgstr "Képek és videók megjelenítése a csevegőablakban." - -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." -msgstr "A keresőmezőbe írt szám új hívást fog indítani." - -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" -msgstr "Letöltés mappa:" - -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "Csevegés mutatása a jobb oldalon." - -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "Csevegés mutatása alul." - -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Előzmények beállításai" - -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "Előzmények megtartása ennyi napig:" - -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "(állítsa 0-ra a korlátlan előzményekért)" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "Rendszer" + +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" +msgstr "Indítása bejelentkezéskor" + +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" +msgstr "Jami ikon megjelenítése a tálcán területen" + +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" +msgstr "Hozd Jami-t a bejövő hívások előtérbe" + +#: ui/generalsettingsview.ui:189 +msgid "Notifications" +msgstr "Értesítések" + +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" +msgstr "Értesítések engedélyezése a bejövő hívásokhoz" + +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" +msgstr "Értesítések engedélyezése függőben lévő kérések esetén" + +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" +msgstr "Új csevegőüzenetek értesítéseinek engedélyezése" + +#: ui/generalsettingsview.ui:336 +msgid "Chatview" +msgstr "Csevegés nézet" + +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" +msgstr "Képek és videók megjelenítése a csevegés nézetben" + +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "A jobb oldali csevegés megtekintése (alul, ha ki van kapcsolva)" + +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "Letöltés mappa" + +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "Előzmények" + +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" +msgstr "Előzmények megtartása (nap, 0 = korlátlan)" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Az összes előzmény törlése" @@ -442,7 +436,7 @@ msgid "Click to change password" msgstr "Kattintson a jelszó módosításához" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "Felhasználó fiók exportálása" @@ -459,7 +453,6 @@ msgstr "jelszó" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Proxy" @@ -801,116 +794,26 @@ msgid "Registration in progress…" msgstr "Regisztráció folyamatban…" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "Ez egy destruktív művelet. Biztosan törli az összes csevegést és híváselőzményt?" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "Letöltési mappa kiválasztása" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "_Mégse" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "_Mentés" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "Hibás jelszó" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "Hálózati hiba, próbálja újra" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "A Jami export elindítása nem sikerült, próbálja újra" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "Jelszó megváltoztatása" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "Fájl mentése" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "Fájlok mentése:" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "Figyelmeztetés! Ez a művelet visszavonja az eszközt!\nMegjegyzés: ez a művelet nem vonható vissza." - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "Jelszó megadása az eszköz visszavonásához" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "Az új jelszó és megerősítése más" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "Jelszó megváltozott!" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "Hibás jelszó" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "Név mentése" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "Eszköz visszavonása" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "Hiba történt az eszköz visszavonásakor" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Típus" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "automatikus generálás…" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Kiszolgálónév" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "Jelszó megjelenítése" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Hangpostaszám" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "Hiba: hibás jelszó!" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "Hiba: ismeretlen eszköz!" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "_Képernyő részének megosztása" @@ -1099,13 +1002,17 @@ msgid "" "Jami is free software for universal communication which respects the " "freedoms and privacy of its users." -msgstr "Jami a szabad szoftver az egyetemes közléshez, amely tiszteletben tartja a felhasználók szabadságát és magánéletét." +msgstr "A Jami (GNU csomag, korábban Ring) egy univerzális és elosztott kommunikációs platform, amely tiszteletben tartja a felhasználók szabadságait és magánéletét." #: src/chatview.cpp:175 msgid "Send File" msgstr "Fájl küldése" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "Fájl mentése" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1116,70 +1023,121 @@ msgid "Auto" msgstr "Automatikus" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "Figyelmeztetés! Ez a művelet visszavonja az eszközt!\nMegjegyzés: ez a művelet nem vonható vissza." + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "Adja meg a jelszót az eszköz visszavonásához" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "Név szerkesztése" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "Eszköz visszavonása" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "Hiba történt az eszköz visszavonásakor" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "Letiltás visszavonása" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "Jelszó megváltoztatása" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "Az új jelszó és a megerősítése különböző!" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "Hibás jelszó!" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "Megjegyzés: a jelszó megváltoztatása csak ezen az eszközön." -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "Jelenlegi jelszó" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Új jelszó" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +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:955 +msgid "Enter password to export archive" +msgstr "Adja meg a jelszót az archívum exportálásához" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "A fiókot exportálták!" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "Fiók exportálási hiba." -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "Hibás jelszó" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "Hálózati hiba, próbálja újra" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "Ismeretlen hiba" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "A Jami export elindítása nem sikerült, próbálja újra" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "Hiba: hibás jelszó!" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "Hiba: ismeretlen eszköz!" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "Szignál…" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "Nem elérhető" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "Kapcsolódás…" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "Elérhető" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "Ismeretlen állapot" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "••••••••" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "nincs jelszó beállítva" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/id.po ring-20190215.1.f152c98~ds1/client-gnome/po/id.po --- ring-20190110.1.e572469~ds1/client-gnome/po/id.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/id.po 2019-02-15 23:58:05.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Indonesian (http://www.transifex.com/savoirfairelinux/ring/language/id/)\n" "MIME-Version: 1.0\n" @@ -33,7 +33,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "" @@ -43,7 +43,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "" @@ -53,7 +52,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "" @@ -152,7 +151,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "" @@ -220,8 +219,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "" @@ -231,7 +229,7 @@ "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "" @@ -260,67 +258,63 @@ msgid "OK" msgstr "" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" +#: ui/generalsettingsview.ui:43 +msgid "System" msgstr "" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." +#: ui/generalsettingsview.ui:336 +msgid "Chatview" msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." +#: ui/generalsettingsview.ui:449 +msgid "Download folder" msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "" - -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "Riwayat" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "" @@ -439,7 +433,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "" @@ -456,7 +450,6 @@ msgstr "" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "" @@ -798,116 +791,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -1102,7 +1005,11 @@ msgid "Send File" msgstr "" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1113,70 +1020,121 @@ msgid "Auto" msgstr "" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Kata sandi baru" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/it_IT.po ring-20190215.1.f152c98~ds1/client-gnome/po/it_IT.po --- ring-20190110.1.e572469~ds1/client-gnome/po/it_IT.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/it_IT.po 2019-02-15 23:58:05.000000000 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Italian (Italy) (http://www.transifex.com/savoirfairelinux/ring/language/it_IT/)\n" "MIME-Version: 1.0\n" @@ -37,7 +37,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Alias" @@ -47,7 +47,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Password" @@ -57,7 +56,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "" @@ -156,7 +155,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Annulla" @@ -224,8 +223,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Utente" @@ -235,7 +233,7 @@ "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:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Conferma password" @@ -264,67 +262,63 @@ msgid "OK" msgstr "OK" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "Sistema" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." -msgstr "Abilita le notifiche per le chiamate in entrata." - -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." -msgstr "Abilita le notifiche per i nuovi messaggi della chat." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" +msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." -msgstr "L'immissione di un numero nel campo di ricerca effettuerà una chiamata" +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" +msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" +#: ui/generalsettingsview.ui:336 +msgid "Chatview" msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "Mostra chat sulla destra." +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" +msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "Mostra la chat in basso." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Impostazioni Cronologia" +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "" -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "Mantieni la cronologia per (giorni):" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "Cronologia" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "(imposta 0 per cronologia illimitata)" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" +msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Pulisci la cronologia" @@ -443,7 +437,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "" @@ -460,7 +454,6 @@ msgstr "password" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Proxy" @@ -802,116 +795,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "Questa è un'operazione distruttiva. Sei sicuro di voler eliminare tutte le tue chat e cronologia chiamate?" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "_Annulla" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "Password scarsa" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "Errore di rete, riprova" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "Salva File" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "Revoca dispositivo" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Tipo" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Hostname" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "Visualizza password" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Numero voicemail" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -1106,7 +1009,11 @@ msgid "Send File" msgstr "" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "Salva File" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1117,70 +1024,121 @@ msgid "Auto" msgstr "Auto" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "Revoca dispositivo" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Nuova password" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "Password scarsa" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "Errore di rete, riprova" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "Disconnesso" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "In linea" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/it.po ring-20190215.1.f152c98~ds1/client-gnome/po/it.po --- ring-20190110.1.e572469~ds1/client-gnome/po/it.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/it.po 2019-02-15 23:58:05.000000000 +0000 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Italian (http://www.transifex.com/savoirfairelinux/ring/language/it/)\n" "MIME-Version: 1.0\n" @@ -35,7 +35,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Alias" @@ -45,7 +45,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Password" @@ -55,7 +54,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "" @@ -154,7 +153,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Cancella" @@ -222,8 +221,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Nome utente" @@ -233,7 +231,7 @@ "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Confermare password" @@ -262,67 +260,63 @@ msgid "OK" msgstr "" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "Sistema" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." +#: ui/generalsettingsview.ui:336 +msgid "Chatview" msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "Mostrare la chat a destra." - -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "Mostrare la chat in basso." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Impostazioni storico" +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "" -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "Tenere lo storico per (giorni):" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "Cronologia" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "(digitare 0 per uno storico senza limiti)" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" +msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Cancellare tutto lo storico" @@ -441,7 +435,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "" @@ -458,7 +452,6 @@ msgstr "password" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Proxy" @@ -800,116 +793,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "A_bbandonare" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "Revoca dispositivo" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Tipo" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Nome Host" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "Mostrare la password" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Numero di segreteria telefonica" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -1104,7 +1007,11 @@ msgid "Send File" msgstr "" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1115,70 +1022,121 @@ msgid "Auto" msgstr "" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "Revoca dispositivo" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Nuovo password" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/ja.po ring-20190215.1.f152c98~ds1/client-gnome/po/ja.po --- ring-20190110.1.e572469~ds1/client-gnome/po/ja.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/ja.po 2019-02-15 23:58:05.000000000 +0000 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Japanese (http://www.transifex.com/savoirfairelinux/ring/language/ja/)\n" "MIME-Version: 1.0\n" @@ -35,7 +35,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "別名" @@ -45,7 +45,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "パスワード" @@ -55,7 +54,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "" @@ -154,7 +153,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "キャンセル" @@ -222,8 +221,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "ユーザー名" @@ -233,7 +231,7 @@ "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "パスワードの再入力" @@ -262,67 +260,63 @@ msgid "OK" msgstr "OK" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "システム" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." +#: ui/generalsettingsview.ui:336 +msgid "Chatview" msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." +#: ui/generalsettingsview.ui:449 +msgid "Download folder" msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "履歴の設定" - -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "履歴" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "履歴をすべて削除" @@ -441,7 +435,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "" @@ -458,7 +452,6 @@ msgstr "" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "プロキシ" @@ -800,116 +793,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "この操作は取り消すことができません。本当にあなたのすべてのチャットと通話の履歴を削除しますか？" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "キャンセル(_C)" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "パスワードが正しくありません" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "ネットワークエラーが発生しました。もう一度試してください。" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "デバイスを取り消し" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "種類" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "ホスト名" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "パスワードを表示" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "ボイスメール番号" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -1104,7 +1007,11 @@ msgid "Send File" msgstr "" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1115,70 +1022,121 @@ msgid "Auto" msgstr "" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "デバイスを取り消し" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "新しいパスワード" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "パスワードが正しくありません" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "ネットワークエラーが発生しました。もう一度試してください。" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "オフライン" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "オンライン" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/ko_KR.po ring-20190215.1.f152c98~ds1/client-gnome/po/ko_KR.po --- ring-20190110.1.e572469~ds1/client-gnome/po/ko_KR.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/ko_KR.po 2019-02-15 23:58:05.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Korean (Korea) (http://www.transifex.com/savoirfairelinux/ring/language/ko_KR/)\n" "MIME-Version: 1.0\n" @@ -33,7 +33,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "별칭" @@ -43,7 +43,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "암호" @@ -53,7 +52,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "" @@ -152,7 +151,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "취소" @@ -220,8 +219,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "사용자명" @@ -231,7 +229,7 @@ "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "암호 확인" @@ -260,67 +258,63 @@ msgid "OK" msgstr "" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" +#: ui/generalsettingsview.ui:43 +msgid "System" msgstr "" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." +#: ui/generalsettingsview.ui:336 +msgid "Chatview" msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." +#: ui/generalsettingsview.ui:449 +msgid "Download folder" msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "이력 설정" - -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" +#: ui/generalsettingsview.ui:486 +msgid "History" msgstr "" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "" @@ -439,7 +433,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "" @@ -456,7 +450,6 @@ msgstr "" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "프록시" @@ -798,116 +791,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "파일 저장" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "유형" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "호스트명" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "음성메일 번호" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -1102,7 +1005,11 @@ msgid "Send File" msgstr "" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "파일 저장" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1113,70 +1020,121 @@ msgid "Auto" msgstr "자동" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/lt.po ring-20190215.1.f152c98~ds1/client-gnome/po/lt.po --- ring-20190110.1.e572469~ds1/client-gnome/po/lt.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/lt.po 2019-02-15 23:58:05.000000000 +0000 @@ -5,13 +5,13 @@ # Translators: # Guillaume Roguez, 2015 # Mantas Kriaučiūnas , 2015 -# Moo, 2015-2018 +# Moo, 2015-2019 msgid "" msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Lithuanian (http://www.transifex.com/savoirfairelinux/ring/language/lt/)\n" "MIME-Version: 1.0\n" @@ -36,7 +36,7 @@ msgid "This account is malformed, please enter your password" msgstr "Ši paskyra yra netaisyklinga, įveskite savo slaptažodį" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Slapyvardis" @@ -46,7 +46,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Slaptažodis" @@ -56,7 +55,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "Ištrinti paskyrą" @@ -140,11 +139,11 @@ #: ui/accountcreationwizard.ui:64 msgid "Create Jami Account" -msgstr "" +msgstr "Susikurti Jami paskyrą" #: ui/accountcreationwizard.ui:65 msgid "Create a new Jami account (for new users)" -msgstr "" +msgstr "Susikurti naują Jami paskyrą (naujiems naudotojams)" #: ui/accountcreationwizard.ui:72 msgid "Link this device to an account" @@ -152,10 +151,10 @@ #: ui/accountcreationwizard.ui:73 msgid "Link this devices to a Jami account created on another device" -msgstr "" +msgstr "Susieti šį įrenginį su kitame įrenginyje sukurta Jami paskyra" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Atsisakyti" @@ -223,8 +222,7 @@ 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/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Naudotojo vardas" @@ -234,13 +232,13 @@ "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:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Patvirtinkite slaptažodį" #: ui/accountcreationwizard.ui:562 msgid "Generating your Jami account…" -msgstr "" +msgstr "Kuriama jūsų Jami paskyra…" #: ui/accountcreationwizard.ui:588 msgid "Registering username…" @@ -263,67 +261,63 @@ msgid "OK" msgstr "Gerai" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "Jami nustatymai" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "Sistema" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" -msgstr "Paleisti Jami įjungus kompiuterį" - -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." -msgstr "Rodyti Jami piktogramą pranešimų srityje (sistemos dėkle)." - -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." -msgstr "Esant gaunamiesiems skambučiams, rodyti Jami priekiniame plane." +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" +msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." -msgstr "Įjungti pranešimus gaunamiesiems skambučiams." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" +msgstr "" -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." -msgstr "Įjungti pranešimus naujoms pokalbio žinutėms." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" +msgstr "Pranešimai" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." -msgstr "Rodyti pokalbių lange paveikslus ir vaizdo įrašus." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" +msgstr "Įjungti pranešimus gaunamiesiems skambučiams" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." -msgstr "Įvedus numerį į paieškos įrašą, bus pradedama skambinti." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" +msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" -msgstr "Atsiuntimų aplankas:" +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" +msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "Rodyti pokalbį dešinėje." +#: ui/generalsettingsview.ui:336 +msgid "Chatview" +msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "Rodyti pokalbį apačioje." +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" +msgstr "" + +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Istorijos nustatymai" +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "" -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "Laikyti istoriją (dienų):" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "Istorija" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "(nustatykite 0 neribotai istorijai)" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" +msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Išvalyti visą istoriją" @@ -442,7 +436,7 @@ msgid "Click to change password" msgstr "Spustelėkite, norėdami pakeisti slaptažodį" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "Eksportuoti paskyrą" @@ -459,7 +453,6 @@ msgstr "slaptažodis" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Įgaliotasis serveris" @@ -469,7 +462,7 @@ #: ui/newaccountsettingsview.ui:952 msgid "Known devices linked to this Jami account" -msgstr "" +msgstr "Žinomi, su šia Jami paskyra susieti, įrenginiai" #: ui/newaccountsettingsview.ui:960 msgid "Link another device" @@ -799,118 +792,28 @@ #: src/usernameregistrationbox.cpp:344 msgid "Registration in progress…" -msgstr "" +msgstr "Vyksta registracija…" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "Tai yra naikinamasis veiksmas. Ar tikrai norite ištrinti visą savo pokalbių ir skambučių istoriją?" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "_Atsisakyti" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "Į_rašyti" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "Blogas slaptažodis" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "Tinklo klaida, bandykite dar kartą" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "Pakeisti slaptažodį" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "Įrašyti failą" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "Įspėjimas! Šis veiksmas panaikins įrenginį!\nPastaba: šio veiksmo neįmanoma bus atšaukti." - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "Naujas slaptažodis ir jo patvirtinimas nesutampa" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "Slaptažodis pakeistas!" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "Neteisingas slaptažodis" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "Panaikinti įrenginį" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "Klaida, panaikinant įrenginį" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Tipas" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Kompiuterio vardas" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "Rodyti slaptažodį" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Balso pašto numeris" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "Klaida: neteisingas slaptažodis!" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "Klaida: nežinomas įrenginys!" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "Bendrinti _ekrano sritį" @@ -945,13 +848,13 @@ msgid "" "\"Live Free or Die\"\n" "built on %.25s" -msgstr "" +msgstr "\"Live Free or Die\"\nsukurta ties %.25s" #: src/dialogs.c:137 msgid "" "The GNOME client for Jami.\n" "Jami is free software for universal communication which respects the freedoms and privacy of its users." -msgstr "" +msgstr "GNOME klientas, skirtas Jami.\nJami yra visuotiniam bendravimui skirta laisva programinė įranga, kuri gerbia savo naudotojų laisves ir privatumą." #: src/messagingwidget.cpp:223 msgid "Contact appears to be busy. Leave a message ?" @@ -1087,7 +990,7 @@ msgid "" "This is your Jami username.\n" "Copy and share it with your friends!" -msgstr "" +msgstr "Tai yra jūsų Jami naudotojo vardas.\nNukopijuokite ir dalinkitės juo su draugais!" #: src/ringwelcomeview.cpp:96 msgid "" @@ -1099,87 +1002,142 @@ msgid "" "Jami is free software for universal communication which respects the " "freedoms and privacy of its users." -msgstr "" +msgstr "Jami yra visuotiniam bendravimui skirta laisva programinė įranga, kuri gerbia savo naudotojų laisves ir privatumą." #: src/chatview.cpp:175 msgid "Send File" msgstr "Siųsti failą" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "Įrašyti failą" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" -msgstr "" +msgstr "Įspėjimas! Šis veiksmas pašalins šią paskyrą šiame įrenginyje!\nPastaba: šio veiksmo neįmanoma bus atšaukti. Be to, gali būti prarastas jūsų registruotas vardas!" #: src/currentcallview.cpp:974 msgctxt "Enable automatic video quality" msgid "Auto" msgstr "Automatinė" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "Įspėjimas! Šis veiksmas panaikins įrenginį!\nPastaba: šio veiksmo neįmanoma bus atšaukti." + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "Panaikinti įrenginį" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "Klaida, panaikinant įrenginį" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "Pakeisti slaptažodį" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "Naujas slaptažodis ir jo patvirtinimas nesutampa!" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "Neteisingas slaptažodis!" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "Pastaba: tai pakeis slaptažodį tik šiame įrenginyje." -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "Dabartinis slaptažodis" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Naujas slaptažodis" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "Paskyra eksportuota!" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "Paskyros eksportavimas nepavyko." -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "Blogas slaptažodis" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "Tinklo klaida, bandykite dar kartą" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "Nežinoma klaida" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "Klaida: neteisingas slaptažodis!" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "Klaida: nežinomas įrenginys!" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "Inicijuojama…" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "Atsijungęs" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "Jungiamasi…" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "Prisijungęs" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "Nežinoma būsena" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "••••••••" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "slaptažodis nėra nustatytas" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/ms.po ring-20190215.1.f152c98~ds1/client-gnome/po/ms.po --- ring-20190110.1.e572469~ds1/client-gnome/po/ms.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/ms.po 2019-02-15 23:58:05.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Malay (http://www.transifex.com/savoirfairelinux/ring/language/ms/)\n" "MIME-Version: 1.0\n" @@ -33,7 +33,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Nama panggilan" @@ -43,7 +43,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Kara laluan" @@ -53,7 +52,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "" @@ -152,7 +151,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Batal" @@ -220,8 +219,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Nama pengguna" @@ -231,7 +229,7 @@ "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Sahkan kata laluan" @@ -260,67 +258,63 @@ msgid "OK" msgstr "" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "" - -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" -msgstr "" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "Sistem" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" +#: ui/generalsettingsview.ui:336 +msgid "Chatview" msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" +#: ui/generalsettingsview.ui:449 +msgid "Download folder" msgstr "" -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "Sejarah" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "" @@ -439,7 +433,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "" @@ -456,7 +450,6 @@ msgstr "" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Proksi" @@ -798,116 +791,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Jenis" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Alamat server" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Nombor peti suara" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -1102,7 +1005,11 @@ msgid "Send File" msgstr "" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1113,70 +1020,121 @@ msgid "Auto" msgstr "" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Kata laluan baharu" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/nb.po ring-20190215.1.f152c98~ds1/client-gnome/po/nb.po --- ring-20190110.1.e572469~ds1/client-gnome/po/nb.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/nb.po 2019-02-15 23:58:05.000000000 +0000 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/savoirfairelinux/ring/language/nb/)\n" "MIME-Version: 1.0\n" @@ -35,7 +35,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Alias" @@ -45,7 +45,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Passord" @@ -55,7 +54,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "Slett konto" @@ -154,7 +153,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Avbryt" @@ -222,8 +221,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Brukernavn" @@ -233,7 +231,7 @@ "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:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Bekreft passord" @@ -262,67 +260,63 @@ msgid "OK" msgstr "OK" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "System" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." -msgstr "Skru på varsler for innkommende anrop." - -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." -msgstr "Skru på varsler for nye sludremeldinger." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" +msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." -msgstr "Vis bilder og videoer i sludrevindu." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" +msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." -msgstr "Inntasting av nummer i søkefeltet vil utføre ny samtale." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" +msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" -msgstr "Nedlastingsmappe:" +#: ui/generalsettingsview.ui:336 +msgid "Chatview" +msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "Vis sludring til høyre." +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" +msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "Vis sludring nederst." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Historikkinnstillinger" +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "Nedlastingsmappe" -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "Behold historikk i (dager):" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "Historie" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "(sett til 0 for ubegrenset historikk)" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" +msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Nullstill all historikk" @@ -441,7 +435,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "Eksporter konto" @@ -458,7 +452,6 @@ msgstr "passord" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Mellomtjener" @@ -800,116 +793,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "Dette er en ødeleggende operasjon. Er du sikker på at du vil slette all din sludre- og samtale-historikk?" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "Velg nedlastingsmappe" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "_Avbryt" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "_Lagre" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "Dårlig passord" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "Nettverksfeil, prøv på nytt" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "Endre passord" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "Lagre fil" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "Fil eksportert til mål:" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "Nytt passord og bekreftelse av det er forskjellig" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "Passord endret!" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "Feil passord" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "Tilbakekall enhet" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Type" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Vertsnavn" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "Vis passord" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Talepostkassenummer" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "Del _skjermområde" @@ -1104,7 +1007,11 @@ msgid "Send File" msgstr "Send fil" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "Lagre fil" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1115,70 +1022,121 @@ msgid "Auto" msgstr "Auto" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "Tilbakekall enhet" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "Endre passord" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "Merk: Dette vil endre passordet kun på denne enheten." -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "Nåværende passord" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Nytt passord" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "Dårlig passord" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "Nettverksfeil, prøv på nytt" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "Ukjent feil" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "Starter…" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "Frakoblet" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "Tilkoblet" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/nl_BE.po ring-20190215.1.f152c98~ds1/client-gnome/po/nl_BE.po --- ring-20190110.1.e572469~ds1/client-gnome/po/nl_BE.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/nl_BE.po 2019-02-15 23:58:05.000000000 +0000 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Dutch (Belgium) (http://www.transifex.com/savoirfairelinux/ring/language/nl_BE/)\n" "MIME-Version: 1.0\n" @@ -36,7 +36,7 @@ msgid "This account is malformed, please enter your password" msgstr "Dit account is slecht gevormd, gelieve uw paswoord in te geven" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Alias" @@ -46,7 +46,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Paswoord" @@ -56,7 +55,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "Account verwijderen" @@ -155,7 +154,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Annuleren" @@ -223,8 +222,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Gebruikersnaam" @@ -234,7 +232,7 @@ "devices to your account." msgstr "Dit paswoord word gebruikt voor uw accountgegevens te versleutelen en nieuwe apparaten aan uwen account te koppelen." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Bevestigd paswoord" @@ -263,67 +261,63 @@ msgid "OK" msgstr "Oké" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "Systeem" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." -msgstr "Meldingen inschakelen voor inkomende oproepen." - -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." -msgstr "Meldingen inschakelen voor nieuwe berichten." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" +msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." -msgstr "Afbeeldingen en video’s in babbelvenster tonen." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" +msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." -msgstr "Een nummer in de zoekregel invoeren zal ne nieuwen oproep plaatsen." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" +msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" -msgstr "Downloadmap:" +#: ui/generalsettingsview.ui:336 +msgid "Chatview" +msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "Gesprek rechts weergeven." +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" +msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "Gesprek onderaan weergeven." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Geschiedenisinstellingen" +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "" -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "Geschiedenis bewaren voor (dagen):" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "Geschiedenis" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "(kiesd 0 voor onbeperkte geschiedenis)" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" +msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Geschiedenis wissen" @@ -442,7 +436,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "Account exporteren" @@ -459,7 +453,6 @@ msgstr "paswoord" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Proxy" @@ -801,116 +794,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "Dit is een destructieve bewerking. Zijde zeker da’ g’uw volledige gespreks- en oproepgeschiedenis wild wissen?" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "Kiesd downloadmap" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "_Annuleren" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "Op_slaan" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "Slecht paswoord" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "Netwerkfout, probeerd het opnieuw" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "Paswoord wijzigen" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "Bestand opslaan" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "Bestand g’exporteerd naar locatie:" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "Nieuw paswoord en bevestiging komen nie overeen" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "Paswoord gewijzigd!" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "Onjuist paswoord" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "Naam opslaan" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "Apparaat terugtrekken" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Type" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Hostnaam" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "Paswoord tonen" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Voicemailnummer" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "_Schermruimte delen" @@ -1105,7 +1008,11 @@ msgid "Send File" msgstr "Bestand versturen" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "Bestand opslaan" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1116,70 +1023,121 @@ msgid "Auto" msgstr "Auto" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "Bewerk naam" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "Apparaat terugtrekken" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "Paswoord wijzigen" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "Let op: dit wijzigd enkel het paswoord op dit apparaat." -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "Huidig paswoord" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Nieuw paswoord" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "Slecht paswoord" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "Netwerkfout, probeerd het opnieuw" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "Onbekende fout" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "Bezig met initialiseren…" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "Offline" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "Aan het verbinden..." -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "Online" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "Onbekende status" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "••••••••" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "geen paswoord ingesteld" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/nl_NL.po ring-20190215.1.f152c98~ds1/client-gnome/po/nl_NL.po --- ring-20190110.1.e572469~ds1/client-gnome/po/nl_NL.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/nl_NL.po 2019-02-15 23:58:05.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Dutch (Netherlands) (http://www.transifex.com/savoirfairelinux/ring/language/nl_NL/)\n" "MIME-Version: 1.0\n" @@ -34,7 +34,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "" @@ -44,7 +44,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Wachtwoord" @@ -54,7 +53,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "" @@ -153,7 +152,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "" @@ -221,8 +220,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Gebruikersnaam" @@ -232,7 +230,7 @@ "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "" @@ -261,67 +259,63 @@ msgid "OK" msgstr "" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" +#: ui/generalsettingsview.ui:43 +msgid "System" msgstr "" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." +#: ui/generalsettingsview.ui:336 +msgid "Chatview" msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." +#: ui/generalsettingsview.ui:449 +msgid "Download folder" msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" +#: ui/generalsettingsview.ui:486 +msgid "History" msgstr "" -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" msgstr "" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "" - -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "" @@ -440,7 +434,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "" @@ -457,7 +451,6 @@ msgstr "" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "" @@ -799,116 +792,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Type" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -1103,7 +1006,11 @@ msgid "Send File" msgstr "" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1114,70 +1021,121 @@ msgid "Auto" msgstr "" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/nl.po ring-20190215.1.f152c98~ds1/client-gnome/po/nl.po --- ring-20190110.1.e572469~ds1/client-gnome/po/nl.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/nl.po 2019-02-15 23:58:05.000000000 +0000 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Dutch (http://www.transifex.com/savoirfairelinux/ring/language/nl/)\n" "MIME-Version: 1.0\n" @@ -36,7 +36,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Alias" @@ -46,7 +46,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Wachtwoord" @@ -56,7 +55,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "Account verwijderen" @@ -155,7 +154,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Annuleren" @@ -223,8 +222,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Gebruikersnaam" @@ -234,7 +232,7 @@ "devices to your account." msgstr "Dit wachtwoord wordt gebruikt om je accountgegevens te versleutelen en nieuwe apparaten aan je account te koppelen." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Bevestig wachtwoord" @@ -263,67 +261,63 @@ msgid "OK" msgstr "Oké" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "Systeem" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." -msgstr "Meldingen inschakelen voor inkomende oproepen." - -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." -msgstr "Meldingen inschakelen voor nieuwe berichten." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" +msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." -msgstr "Afbeeldingen en video's in chatvenster tonen." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" +msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." -msgstr "Een nummer in de zoekregel invoeren zal een nieuwe oproep plaatsen." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" +msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" -msgstr "Downloadmap:" +#: ui/generalsettingsview.ui:336 +msgid "Chatview" +msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "Gesprek rechts weergeven." +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" +msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "Gesprek onderaan weergeven." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Geschiedenisinstellingen" +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "Downloadmap" -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "Geschiedenis bewaren voor (dagen):" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "Geschiedenis" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "(kies 0 voor onbeperkte geschiedenis)" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" +msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Geschiedenis wissen" @@ -442,7 +436,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "Account exporteren" @@ -459,7 +453,6 @@ msgstr "wachtwoord" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Proxy" @@ -801,116 +794,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "Dit is een destructieve bewerking. Weet je zeker dat je je volledige gespreks- en oproepgeschiedenis wil wissen?" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "Kies downloadmap" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "_Annuleren" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "Op_slaan" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "Slecht wachtwoord" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "Netwerkfout, probeer het opnieuw" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "Wachtwoord wijzigen" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "Bestand opslaan" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "Bestand geëxporteerd naar locatie:" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "Nieuw wachtwoord en bevestiging komen niet overeen" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "Wachtwoord gewijzigd!" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "Onjuist wachtwoord" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "Naam opslaan" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "Apparaat terugtrekken" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Type" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Hostnaam" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "Wachtwoord tonen" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Voicemailnummer" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "_Schermruimte delen" @@ -1105,7 +1008,11 @@ msgid "Send File" msgstr "Bestand versturen" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "Bestand opslaan" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1116,70 +1023,121 @@ msgid "Auto" msgstr "Auto" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "Apparaat terugtrekken" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "Wachtwoord wijzigen" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "Let op: dit wijzigt enkel het wachtwoord op dit apparaat." -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "Huidig wachtwoord" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Nieuw wachtwoord" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "Slecht wachtwoord" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "Netwerkfout, probeer het opnieuw" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "Onbekende fout" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "Bezig met initialiseren…" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "Offline" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "Online" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/pl.po ring-20190215.1.f152c98~ds1/client-gnome/po/pl.po --- ring-20190110.1.e572469~ds1/client-gnome/po/pl.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/pl.po 2019-02-15 23:58:05.000000000 +0000 @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Adam Smith , 2018 +# Jan Wielkiewicz , 2018-2019 # Caspar Cedro , 2016 msgid "" msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Polish (http://www.transifex.com/savoirfairelinux/ring/language/pl/)\n" "MIME-Version: 1.0\n" @@ -35,7 +35,7 @@ msgid "This account is malformed, please enter your password" msgstr "To konto jest niepoprawne, proszę wprowadź swoje hasło" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Alias" @@ -45,7 +45,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Hasło" @@ -55,7 +54,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "Usuń konto" @@ -139,11 +138,11 @@ #: ui/accountcreationwizard.ui:64 msgid "Create Jami Account" -msgstr "" +msgstr "Stwórz Konto Jami" #: ui/accountcreationwizard.ui:65 msgid "Create a new Jami account (for new users)" -msgstr "" +msgstr "Stwórz nowe konto Jami (dla nowych użytkowników)" #: ui/accountcreationwizard.ui:72 msgid "Link this device to an account" @@ -151,10 +150,10 @@ #: ui/accountcreationwizard.ui:73 msgid "Link this devices to a Jami account created on another device" -msgstr "" +msgstr "Połącz to urządzenie z kontem Jami stworzonym na innym urządzeniu" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Anuluj" @@ -179,7 +178,7 @@ "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 "" +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:" @@ -219,11 +218,10 @@ "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 "" +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/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Nazwa użytkownika" @@ -233,13 +231,13 @@ "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:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Potwierdź hasło" #: ui/accountcreationwizard.ui:562 msgid "Generating your Jami account…" -msgstr "" +msgstr "Tworzenie konta Jami..." #: ui/accountcreationwizard.ui:588 msgid "Registering username…" @@ -251,7 +249,7 @@ #: ui/accountcreationwizard.ui:621 msgid "Retrieving your Jami account…" -msgstr "" +msgstr "Odzyskiwanie twojego konta Jami..." #: ui/accountcreationwizard.ui:647 msgid "Error creating/loading account." @@ -262,67 +260,63 @@ msgid "OK" msgstr "OK" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "System" + +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." -msgstr "Zezwól na powiadomienia dla połączeń przychodzących." - -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." -msgstr "Zezwól powiadomienia dla oczekujących zaproszeń." - -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." -msgstr "Zezwól na powiadomienia dla nowych wiadomości." - -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." -msgstr "Pokaż obrazki i filmy w oknie chatu." - -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." -msgstr "Wpisywanie numeru w pasek wyszukiwania rozpocznie nową rozmowę." - -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" -msgstr "Folder pobrane:" - -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "Pokaż czat po prawej stronie." - -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "Pokaż czat na dole." - -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Ustawienia Historii" - -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "Przechowaj historię do (dni):" - -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "(Ustaw na 0 dla nieograniczonej historii)" +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" +msgstr "" + +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" +msgstr "" + +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" +msgstr "" + +#: ui/generalsettingsview.ui:336 +msgid "Chatview" +msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" +msgstr "" + +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "" + +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "" + +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "Historia" + +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" +msgstr "" + +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Usuń całą historię" @@ -411,7 +405,7 @@ "To add a new device to your Jami account, you export your account on the " "Jami. This will generate a pin that must be entered on your new device " "within 5 minutes of its generation." -msgstr "" +msgstr "Aby dodać nowe urządzenie do konta Jami na innym urządzeniu, musisz wyeksportować konto Jami na urządzeniu macierzystym. Wygenerowany zostanie wtedy pin, który należy wprowadzić na nowym urządzeniu w ciągu 5 minut od jego utworzenia." #: ui/newaccountsettingsview.ui:155 msgid "Password (required):" @@ -423,11 +417,11 @@ #: ui/newaccountsettingsview.ui:189 msgid "Export on the network" -msgstr "" +msgstr "Wyeksportuj do sieci" #: ui/newaccountsettingsview.ui:210 msgid "Exporting account on the Jami…" -msgstr "" +msgstr "Eksportowanie konta..." #: ui/newaccountsettingsview.ui:235 msgid "Your generated pin:" @@ -441,7 +435,7 @@ msgid "Click to change password" msgstr "Kliknij by zmienić hasło" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "Wyeksportuj konto" @@ -458,7 +452,6 @@ msgstr "hasło" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Pełnomocnik" @@ -468,7 +461,7 @@ #: ui/newaccountsettingsview.ui:952 msgid "Known devices linked to this Jami account" -msgstr "" +msgstr "Znane urządzenia połączone z tym kontem Jami" #: ui/newaccountsettingsview.ui:960 msgid "Link another device" @@ -696,11 +689,11 @@ #: ui/messagingwidget.ui:76 msgid "Record audio message" -msgstr "" +msgstr "Nagraj wiadomość głosową" #: ui/messagingwidget.ui:96 msgid "End without message" -msgstr "" +msgstr "Zakończ bez wysyłania wiadomości" #: ui/incomingcallview.ui:99 msgid "Incoming…" @@ -736,17 +729,17 @@ "Unable to initialize.\n" "Make sure the Jami daemon (dring) is running.\n" "Error: %s" -msgstr "" +msgstr "Nie udało się zainicjalizować.\nUpewnij się, że daemon Jami (dring) jest uruchomiony.\nBłąd: %s" #: src/ring_client.cpp:117 msgid "Jami Error" -msgstr "" +msgstr "Błąd Jami" #: src/ring_client.cpp:260 msgctxt "" "In the status icon menu, toggle action to show or hide the Jami main window" msgid "Show Jami" -msgstr "" +msgstr "Pokaż Jami" #: src/ring_client.cpp:264 msgid "Quit" @@ -794,122 +787,32 @@ #: src/usernameregistrationbox.cpp:313 msgid "Enter the password of your Jami account" -msgstr "" +msgstr "Wprowadź hasło swojego konta Jami" #: src/usernameregistrationbox.cpp:344 msgid "Registration in progress…" msgstr "Rejestracja w toku..." -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "Czy na pewno chcesz usunąć całą twoją historię chatu? Ta opcja jest nieodwracalna!" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "Wybierz folder pobierania" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "_Anuluj" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "_Zapisz" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "Złe hasło" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "Błąd sieci, spróbuj ponownie" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "Zmień hasło" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "Zapisz plik" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "Plik został wyeksportowany do: " - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "Uwaga! Ta operacja usunie to urządzenie!\nNie można tego cofnąć." - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "Wprowadź hasło, aby usunąć urządzenie" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "Nowe hasło i jego potwierdzenie się różnią" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "Hasło zostało zmienione!" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "Niepoprawne hasło" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "Zapisz nazwę" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "Odwołaj urządzenie" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "Błąd podczas usuwania urządzenia" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Typ" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "Automatyczne tworzenie..." - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Nazwa hosta" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "Pokaż hasło" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Numer poczty głosowej" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "Błąd: złe hasło!" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "Błąd: nieznane urządzenie!" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "Udostępnij _obszar ekranu" @@ -950,19 +853,19 @@ msgid "" "The GNOME client for Jami.\n" "Jami is free software for universal communication which respects the freedoms and privacy of its users." -msgstr "" +msgstr "Klient Jami dla GNOME.\nJami jest wolnym oprogramowaniem do uniwersalnej komunikacji, respektującym wolności i prywatność swoich użytkowników." #: src/messagingwidget.cpp:223 msgid "Contact appears to be busy. Leave a message ?" -msgstr "" +msgstr "Kontakt wydaje się być zajęty. Zostawić wiadomość?" #: src/messagingwidget.cpp:245 msgid "Stop recording" -msgstr "" +msgstr "Wyłącz nagrywanie" #: src/messagingwidget.cpp:259 msgid "Send recorded message" -msgstr "" +msgstr "Wyślij nagraną wiadomość" #: src/ringmainwindow.cpp:184 msgid "Add account…" @@ -1012,17 +915,17 @@ #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95 msgctxt "Name of error window (dialog)" msgid "Jami Error" -msgstr "" +msgstr "Błąd Jami" #: src/native/dbuserrorhandler.cpp:57 msgid "Trying to reconnect to the Jami daemon (dring)…" -msgstr "" +msgstr "Próba połączenia z daemonem Jami (dring)..." #: src/native/dbuserrorhandler.cpp:87 msgid "" "Could not re-connect to the Jami daemon (dring).\n" "Jami will now quit." -msgstr "" +msgstr "Nie udało się ponownie połączyć z daemonem Jami (dring).\nJami się teraz wyłączy." #: src/conversationpopupmenu.cpp:211 msgid "Place _video call" @@ -1076,7 +979,7 @@ #: src/ring_client_options.c:85 msgid "- GNOME client for Jami" -msgstr "" +msgstr "- Klient GNOME dla Jami" #: src/accountcreationwizard.cpp:343 msgid "Passwords don't match" @@ -1086,25 +989,29 @@ msgid "" "This is your Jami username.\n" "Copy and share it with your friends!" -msgstr "" +msgstr "To jest twoja nazwa użytkownika Jami.\nSkopiuj i podziel się nią z przyjaciółmi!" #: src/ringwelcomeview.cpp:96 msgid "" "This is your ID.\n" "Copy and share it with your friends!" -msgstr "" +msgstr "To jest twoje ID.\nSkopiuj i podziel się ze swoimi znajomymi!" #: src/ringwelcomeview.cpp:169 msgid "" "Jami is free software for universal communication which respects the " "freedoms and privacy of its users." -msgstr "" +msgstr "Jami jest wolnym oprogramowaniem do uniwersalnej komunikacji, respektującym wolności i prywatność swoich użytkowników." #: src/chatview.cpp:175 msgid "Send File" msgstr "Wyślij plik" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "Zapisz plik" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1115,70 +1022,121 @@ msgid "Auto" msgstr "Automatycznie" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "Uwaga! Ta operacja usunie to urządzenie!\nNie można tego cofnąć." + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "Wprowadź hasło, aby usunąć urządzenie" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "Edytuj nazwę" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "Odwołaj urządzenie" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "Błąd podczas usuwania urządzenia" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "Odblokuj" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "Zmień hasło" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "Nowe hasło i jego potwierdzenie się różnią!" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "Niepoprawne hasło!" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "Uwaga: to zmieni hasło tylko na tym urządzeniu." -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "Bieżące hasło" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Nowe hasło" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "Konto wyeksportowane!" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "Błąd podczas eksportowania" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "Złe hasło" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "Błąd sieci, spróbuj ponownie" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "Nieoczekiwany błąd" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "Nie udało się wyeksportować, spróbuj później" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "Błąd: złe hasło!" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "Błąd: nieznane urządzenie!" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "Inicjalizacja..." -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "Offline" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "Łączenie..." -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "Online" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "Nieznany status" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "••••••••" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "nie ustawiono hasła" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/POTFILES.in ring-20190215.1.f152c98~ds1/client-gnome/po/POTFILES.in --- ring-20190110.1.e572469~ds1/client-gnome/po/POTFILES.in 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/POTFILES.in 2019-02-15 23:57:49.000000000 +0000 @@ -21,7 +21,6 @@ src/utils/files.cpp src/utils/drawing.cpp src/utils/models.cpp -src/accountgeneraltab.cpp src/models/gtkqtreemodel.cpp src/models/activeitemproxymodel.cpp src/models/gtkaccessproxymodel.cpp diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/pt_BR.po ring-20190215.1.f152c98~ds1/client-gnome/po/pt_BR.po --- ring-20190110.1.e572469~ds1/client-gnome/po/pt_BR.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/pt_BR.po 2019-02-15 23:58:05.000000000 +0000 @@ -22,9 +22,9 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 15:09+0000\n" -"Last-Translator: Rui \n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" +"Last-Translator: Alexandre Lision\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/savoirfairelinux/ring/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -48,7 +48,7 @@ msgid "This account is malformed, please enter your password" msgstr "Esta conta está incorreta, digite sua senha" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Apelido" @@ -58,7 +58,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Senha" @@ -68,7 +67,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "Deletar conta" @@ -167,7 +166,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Cancelar" @@ -235,8 +234,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Nome de usuário" @@ -246,7 +244,7 @@ "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:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Confirmar senha" @@ -275,67 +273,63 @@ msgid "OK" msgstr "OK" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "Sistema" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." -msgstr "Habilitar notificações para chamadas recebidas." - -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." -msgstr "Ativar notificações para solicitações pendentes." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" +msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." -msgstr "Habilitar notificações para novas mensagens no chat." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" +msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." -msgstr "Exibir imagens e vídeos na janela do chat." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" +msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." -msgstr "Entrar um numero na busca iniciará uma nova chamada." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" +msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" -msgstr "Pasta de downloads:" +#: ui/generalsettingsview.ui:336 +msgid "Chatview" +msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "Mostre o bate-papo na direita" +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" +msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "Mostre o bate-papo na parte inferior." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Configurações de histórico" +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "" -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "Manter histórico por (dias):" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "Histórico" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "(configure 0 para histórico ilimitado)" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" +msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Limpar histórico" @@ -454,7 +448,7 @@ msgid "Click to change password" msgstr "Clique para mudar a senha" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "Exportar conta" @@ -471,7 +465,6 @@ msgstr "senha" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Proxy" @@ -813,116 +806,26 @@ msgid "Registration in progress…" msgstr "Registro em progresso…" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "Esta é uma operação destrutiva. Você tem certeza que quer apagar todo o seu histórico de conversas e ligações?" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "Escolha a pasta de arquivos baixados" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "_Cancelar" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "_Salvar" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "Senha incorreta" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "Erro de rede, tente novamente" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "Mudar senha" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "Salvar arquivo" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "Arquivo exportado ao destino:" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "Atenção! Esta ação irá revogar o dispositivo!\nNota: esta ação não pode ser desfeita." - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "Digite a senha para revogar o dispositivo" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "Nova senha e sua confirmação não batem" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "Senha alterada!" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "Senha incorreta" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "Salvar nome" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "Revogar dispositivo" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "Erro ao revogar o dispositivo" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Tipo" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "auto-gerando…" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Servidor" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "Mostrar senha" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Número do correio de voz" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "Erro: senha incorreta!" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "Erro: dispositivo desconhecido!" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "Compartilhar _área da tela" @@ -1117,7 +1020,11 @@ msgid "Send File" msgstr "Enviar arquivo" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "Salvar arquivo" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1128,70 +1035,121 @@ msgid "Auto" msgstr "Automático" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "Atenção! Esta ação irá revogar o dispositivo!\nNota: esta ação não pode ser desfeita." + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "Digite a senha para revogar o dispositivo" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "Editar nome" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "Revogar dispositivo" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "Erro ao revogar o dispositivo" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "Cancelar banimento" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "Mudar senha" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "A nova senha e a sua confirmação não coincidem!" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "Senha incorreta!" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "Nota: isto irá mudar a senha apenas deste dispositivo." -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "Senha atual" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Nova senha" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "Conta exportada!" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "Falha ao exportar a conta." -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "Senha incorreta" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "Erro de rede, tente novamente" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "Erro desconhecido" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "Erro: senha incorreta!" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "Erro: dispositivo desconhecido!" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "Iniciando..." -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "Offline" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "Conectando…" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "Online" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "Status desconhecido" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "••••••••" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "Nenhuma senha definida" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/pt.po ring-20190215.1.f152c98~ds1/client-gnome/po/pt.po --- ring-20190110.1.e572469~ds1/client-gnome/po/pt.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/pt.po 2019-02-15 23:58:05.000000000 +0000 @@ -5,13 +5,13 @@ # Translators: # Cornélio Petersen Júnior , 2015 # Joao Alfredo Gama Batista , 2015 -# Rui , 2018 +# Rui , 2018-2019 msgid "" msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 23:56+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-22 12:22+0000\n" "Last-Translator: Rui \n" "Language-Team: Portuguese (http://www.transifex.com/savoirfairelinux/ring/language/pt/)\n" "MIME-Version: 1.0\n" @@ -36,7 +36,7 @@ msgid "This account is malformed, please enter your password" msgstr "Esta conta está incorreta, introduza a sua palavra-chave" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Apelido" @@ -46,7 +46,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Palavra-chave" @@ -56,7 +55,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "Eliminar conta" @@ -155,7 +154,7 @@ msgstr "Ligar estes dispositivos a uma conta Jami criada noutro dispositivo" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Cancelar" @@ -223,8 +222,7 @@ msgstr "Ao ativar isto, irá registar um nome de utilizador único na rede Jami. As pessoas podem usá-lo para o contactar em vez de usarem o seu RingID, que contém 40 caracteres." #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Nome de utilizador" @@ -234,7 +232,7 @@ "devices to your account." msgstr "Esta palavra-chave será utilizada para encriptar os dados da sua conta e para ligar a sua conta a novos dispositivos." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Confirmar palavra-chave" @@ -263,67 +261,63 @@ msgid "OK" msgstr "OK" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "Configurações Jami" - -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" -msgstr "Iniciar o Jami ao entrar na conta" - -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." -msgstr "Mostrar o ícone Jami na área de notificação (systray)." - -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." -msgstr "Trazer o Jami para o primeiro plano ao receber chamadas." - -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." -msgstr "Ativar notificações para chamadas recebidas." - -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." -msgstr "Ativar notificações para pedidos pendentes." - -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." -msgstr "Ativar notificações para novas mensagens de conversação." - -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." -msgstr "Mostrar imagens e vídeos na janela de conversação." - -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." -msgstr "Se introduzir um número no campo de pesquisa irá fazer uma chamada." - -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" -msgstr "Pasta de descarregamentos:" - -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "Exibir a conversa à direita." - -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "Exibir a conversa embaixo." - -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Configurações do Histórico" - -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "Manter histórico por (dias):" - -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "(0 indica ilimitado)" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "Sistema" + +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" +msgstr "Iniciar a aplicação ao autenticar-me" + +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" +msgstr "Mostrar ícone do Jami na área de notificações" + +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" +msgstr "Trazer o Jami para o primeiro plano ao receber chamadas" + +#: ui/generalsettingsview.ui:189 +msgid "Notifications" +msgstr "Notificações" + +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" +msgstr "Ativar notificações para chamadas recebidas" + +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" +msgstr "Ativar notificações para pedidos pendentes" + +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" +msgstr "Ativar notificações para novas mensagens nas conversas" + +#: ui/generalsettingsview.ui:336 +msgid "Chatview" +msgstr "Janela de conversas" + +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" +msgstr "Mostrar imagens e vídeos na janela das conversas" + +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "Mostrar a janela de conversas à direita (no fundo se desativado)" + +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "Pasta de descarregamentos" + +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "Histórico" + +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" +msgstr "Manter histórico por (dias; 0 = ilimitado)" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Limpar histórico" @@ -442,7 +436,7 @@ msgid "Click to change password" msgstr "Clique para alterar a palavra-chave" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "Exportar conta" @@ -459,7 +453,6 @@ msgstr "palavra-chave" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Proxy" @@ -801,116 +794,26 @@ msgid "Registration in progress…" msgstr "A registar..." -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "Isto é uma operação que não poderá desfazer. Tem a certeza que quer eliminar todo o seu histórico de camadas e conversações?" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "Escolher pasta de descarregamento" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "_Cancelar" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "_Gravar" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "Palavra-chave errada" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "Erro de rede. Tente de novo" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "Não foi possível inicializar a exportação para o Jam, tente novamente" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "Alterar palavra-chave" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "Gravar Ficheiro" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "Ficheiro exportado para o destino" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "Aviso! Esta ação irá cancelar a ligação ao dispositivo!\nNota: esta ação não pode ser desfeita." - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "Introduza a palavra-chave para cancelar o dispositivo" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "A nova palavra-chave e a sua confirmação são diferentes" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "A palavra-chave foi alterada!" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "Palavra-chave incorreta" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "Gravar nome" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "Cancelar dispositivo" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "Erro ao tentar cancelar o dispositivo" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Tipo" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "a auto-gerar..." - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Nome do host" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "Exibir palavra-chave" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Número do correio de voz" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "Erro: palavra-chave errada!" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "Erro: dispositivo desconhecido!" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "_Partilhar área do ecrã" @@ -1105,7 +1008,11 @@ msgid "Send File" msgstr "Enviar Ficheiro" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "Gravar Ficheiro" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1116,70 +1023,121 @@ msgid "Auto" msgstr "Auto" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "Aviso! Esta ação irá cancelar a ligação ao dispositivo!\nNota: esta ação não pode ser desfeita." + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "Introduza a palavra-chave para cancelar o dispositivo" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "Editar nome" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "Cancelar dispositivo" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "Erro ao tentar cancelar o dispositivo" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "Desbanir" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "Alterar palavra-chave" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "A nova palavra-chave e a confirmação da palavra-chave são diferentes!" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "Palavra-chave incorreta!" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "Nota: isto irá alterar a palavra-chave apenas no dispositivo." -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "Palavra-chave atual" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Nova password" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +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:955 +msgid "Enter password to export archive" +msgstr "Introduza a palavra-chave para exportar o arquivo" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "A conta foi exportada!" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "Não foi possível exportar a conta." -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "Palavra-chave errada" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "Erro de rede. Tente de novo" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "Erro desconhecido" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "Não foi possível inicializar a exportação para o Jam, tente novamente" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "Erro: palavra-chave errada!" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "Erro: dispositivo desconhecido!" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "A inicializar..." -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "Desligado" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "A conectar..." -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "Ligado" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "Estado desconhecido" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "••••••••" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "sem palavra-chave definida" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/pt_PT.po ring-20190215.1.f152c98~ds1/client-gnome/po/pt_PT.po --- ring-20190110.1.e572469~ds1/client-gnome/po/pt_PT.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/pt_PT.po 2019-02-15 23:58:05.000000000 +0000 @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Rui , 2018 +# Rui , 2018-2019 msgid "" msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 12:11+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-22 12:22+0000\n" "Last-Translator: Rui \n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/savoirfairelinux/ring/language/pt_PT/)\n" "MIME-Version: 1.0\n" @@ -34,7 +34,7 @@ msgid "This account is malformed, please enter your password" msgstr "Esta conta está incorreta, introduza a sua palavra-chave" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Apelido" @@ -44,7 +44,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Palavra-chave" @@ -54,7 +53,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "Eliminar conta" @@ -153,7 +152,7 @@ msgstr "Ligar estes dispositivos a uma conta Jami criada noutro dispositivo" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Cancelar" @@ -221,8 +220,7 @@ 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/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Nome de utilizador" @@ -232,7 +230,7 @@ "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:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Confirmar palavra-chave" @@ -261,67 +259,63 @@ msgid "OK" msgstr "OK" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "Configurações do Jami" - -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" -msgstr "Iniciar o Jami ao entrar na conta" - -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." -msgstr "Mostrar ícone do Jami na área de notificação (systray)." - -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." -msgstr "Trazer o Jami para o primeiro plano ao receber chamadas." - -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." -msgstr "Ativar notificações para chamadas recebidas." - -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." -msgstr "Ativar notificações para pedidos pendentes." - -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." -msgstr "Ativar notificações para novas mensagens nas conversas.." - -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." -msgstr "Mostrar imagens e vídeos na janela das conversas.." - -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." -msgstr "Introduzir um número na pesquisa iniciará uma nova chamada." - -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" -msgstr "Pasta de descarregamentos:" - -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "Mostrar a conversa à direita." - -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "Mostrar a conversa no fundo" - -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Configurações de Histórico" - -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "Manter histórico por (dias):" - -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "(usar 0 para definir histórico ilimitado)" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "Sistema" + +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" +msgstr "Iniciar a aplicação ao autenticar-me" + +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" +msgstr "Mostrar ícone do Jami na área de notificações" + +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" +msgstr "Trazer o Jami para o primeiro plano ao receber chamadas" + +#: ui/generalsettingsview.ui:189 +msgid "Notifications" +msgstr "Notificações" + +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" +msgstr "Ativar notificações para chamadas recebidas" + +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" +msgstr "Ativar notificações para pedidos pendentes" + +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" +msgstr "Ativar notificações para novas mensagens nas conversas" + +#: ui/generalsettingsview.ui:336 +msgid "Chatview" +msgstr "Janela de conversas" + +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" +msgstr "Mostrar imagens e vídeos na janela das conversas" + +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "Mostrar a janela de conversas à direita (no fundo se desativado)" + +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "Pasta de descarregamentos" + +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "Histórico" + +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" +msgstr "Manter histórico por (dias; 0 = ilimitado)" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Limpar histórico" @@ -440,7 +434,7 @@ msgid "Click to change password" msgstr "Clique para mudar a palavra-chave" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "Exportar conta" @@ -457,7 +451,6 @@ msgstr "palavra-chave" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Proxy" @@ -799,116 +792,26 @@ msgid "Registration in progress…" msgstr "A registar…" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "Isto é uma operação destrutiva. Tem a certeza que quer eliminar todo o seu histórico de conversas e chamadas?" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "Escolher a pasta de ficheiros descarregados" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "_Cancelar" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "_Gravar" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "Palavra-chave incorreta" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "Erro de rede, tente novamente" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "Não foi possível iniciar exportação para o Jami, tente novamente" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "Alterar palavra-chave" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "Gravar Ficheiro" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "Ficheiro exportado para o destino:" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "Atenção! Esta ação irá revogar o dispositivo!\nNota: esta ação não pode ser desfeita." - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "Digite a palavra-chave para revogar o dispositivo" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "A nova palavra-chave e a confirmação são diferentes" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "Palavra-chave alterada!" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "Palavra-chave incorreta" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "Gravar nome" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "Revogar dispositivo" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "Erro ao revogar o dispositivo" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Tipo" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "a gerar automaticamente…" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Servidor" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "Mostrar palavra-chave" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Número do correio de voz" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "Erro: palavra-chave incorreta!" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "Erro: dispositivo desconhecido!" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "Partilhar _área do ecrã" @@ -1103,7 +1006,11 @@ msgid "Send File" msgstr "Enviar Ficheiro" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "Gravar Ficheiro" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1114,70 +1021,121 @@ msgid "Auto" msgstr "Automático" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "Atenção! Esta ação irá revogar o dispositivo!\nNota: esta ação não pode ser desfeita." + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "Digite a palavra-chave para revogar o dispositivo" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "Editar nome" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "Revogar dispositivo" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "Erro ao revogar o dispositivo" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "Desbanir" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "Alterar palavra-chave" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "A nova palavra-chave e a sua confirmação são diferentes!" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "Palavra-chave incorreta!" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "Nota: isto irá mudar a palavra-chave apenas neste dispositivo." -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "Palavra-chave atual" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Nova palavra-chave" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +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:955 +msgid "Enter password to export archive" +msgstr "Introduza a palavra-chave para exportar o arquivo" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "A conta foi exportada!" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "Falha ao exportar a conta." -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "Palavra-chave incorreta" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "Erro de rede, tente novamente" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "Erro desconhecido" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "Não foi possível iniciar exportação para o Jami, tente novamente" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "Erro: palavra-chave incorreta!" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "Erro: dispositivo desconhecido!" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "A inicializar..." -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "Desligado" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "A conectar…" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "Ligado" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "Estado desconhecido" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "••••••••" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "nenhuma palavra-chave definida" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/ring-client-gnome.pot ring-20190215.1.f152c98~ds1/client-gnome/po/ring-client-gnome.pot --- ring-20190110.1.e572469~ds1/client-gnome/po/ring-client-gnome.pot 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/ring-client-gnome.pot 2019-02-15 23:58:05.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -33,7 +33,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "" @@ -43,7 +43,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "" @@ -53,7 +52,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "" @@ -151,7 +150,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "" @@ -219,8 +218,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "" @@ -230,7 +228,7 @@ "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "" @@ -259,67 +257,63 @@ msgid "OK" msgstr "" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" +#: ui/generalsettingsview.ui:43 +msgid "System" msgstr "" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." +#: ui/generalsettingsview.ui:336 +msgid "Chatview" msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." +#: ui/generalsettingsview.ui:449 +msgid "Download folder" msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" +#: ui/generalsettingsview.ui:486 +msgid "History" msgstr "" -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" msgstr "" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "" - -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "" @@ -438,7 +432,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "" @@ -455,7 +449,6 @@ msgstr "" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "" @@ -797,116 +790,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your " "chat and call history?" msgstr "" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -1102,7 +1005,11 @@ msgid "Send File" msgstr "" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1113,70 +1020,121 @@ msgid "Auto" msgstr "" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/ro.po ring-20190215.1.f152c98~ds1/client-gnome/po/ro.po --- ring-20190110.1.e572469~ds1/client-gnome/po/ro.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/ro.po 2019-02-15 23:58:05.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Romanian (http://www.transifex.com/savoirfairelinux/ring/language/ro/)\n" "MIME-Version: 1.0\n" @@ -33,7 +33,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Alias" @@ -43,7 +43,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Parola" @@ -53,7 +52,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "" @@ -152,7 +151,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "" @@ -220,8 +219,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Nume de utilizator" @@ -231,7 +229,7 @@ "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Confirmă parola" @@ -260,67 +258,63 @@ msgid "OK" msgstr "" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" +#: ui/generalsettingsview.ui:43 +msgid "System" msgstr "" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." +#: ui/generalsettingsview.ui:336 +msgid "Chatview" msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." +#: ui/generalsettingsview.ui:449 +msgid "Download folder" msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" +#: ui/generalsettingsview.ui:486 +msgid "History" msgstr "" -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" msgstr "" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "" - -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "" @@ -439,7 +433,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "" @@ -456,7 +450,6 @@ msgstr "" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "" @@ -798,116 +791,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Hostname" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -1102,7 +1005,11 @@ msgid "Send File" msgstr "" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1113,70 +1020,121 @@ msgid "Auto" msgstr "" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Parolă nouă" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/ru.po ring-20190215.1.f152c98~ds1/client-gnome/po/ru.po --- ring-20190110.1.e572469~ds1/client-gnome/po/ru.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/ru.po 2019-02-15 23:58:05.000000000 +0000 @@ -15,7 +15,7 @@ # Viktor Filinkov , 2015 # Vladimir Stoiakin, 2018 # Yaroslav Molochko , 2015 -# AlexanderFilev, 2017 +# Al, 2017 # Александр Суслов , 2015 # Александр Асланьян , 2015 # Андрей Шевчук , 2016-2017 @@ -24,9 +24,9 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-27 07:25+0000\n" -"Last-Translator: Vladimir Stoiakin\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" +"Last-Translator: Alexandre Lision\n" "Language-Team: Russian (http://www.transifex.com/savoirfairelinux/ring/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -50,7 +50,7 @@ msgid "This account is malformed, please enter your password" msgstr "Данный аккаунт имеет некорректный формат. Пожалуйста, введите ваш пароль" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Псевдоним " @@ -60,7 +60,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Пароль" @@ -70,7 +69,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "Удалить аккаунт" @@ -169,7 +168,7 @@ msgstr "Привязать это устройство к аккаунту Jami, созданному на другом устройстве" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Отмена" @@ -237,8 +236,7 @@ msgstr "Отмечая это, вы зарегистрируете уникальное имя пользователя в сети Jami. Другие пользователи смогут использовать его для связи с вами вместо RingID, который 40 символов длиной." #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Имя пользователя" @@ -248,7 +246,7 @@ "devices to your account." msgstr "Этот пароль будет использован для шифрования данных вашего аккаунта и для привязки новых устройств к вашему аккаунту." -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Подтверждение пароля" @@ -277,67 +275,63 @@ msgid "OK" msgstr "OK" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "Настройки Jami" - -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" -msgstr "Запускать Jami при входе в систему" - -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." -msgstr "Показывать значок Jami в области уведомлений (трее)." - -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." -msgstr "Выводить Jami на передний план при входящем звонке." +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "Система" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" +msgstr "" + +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" +msgstr "" + +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" +msgstr "" + +#: ui/generalsettingsview.ui:189 +msgid "Notifications" +msgstr "Уведомления" + +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" msgstr "Включить уведомления о входящих звонках." -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." -msgstr "Включить уведомления о запросах на добавление в контакты." - -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." -msgstr "Включить уведомления о новых сообщениях чата." - -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." -msgstr "Показывать изображения и видео в окне чата." - -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." -msgstr "Осуществлять звонок при вводе номера в области поиска." - -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" -msgstr "Папка для загрузок:" - -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "Показать чат справа." - -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "Показать чат снизу." - -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Настройки истории" - -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "Хранить историю (дней):" - -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "(Поставьте 0 для неограниченного хранения)" +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" +msgstr "" + +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" +msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:336 +msgid "Chatview" +msgstr "" + +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" +msgstr "" + +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "" + +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "" + +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "История" + +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" +msgstr "" + +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Очистить историю" @@ -456,7 +450,7 @@ msgid "Click to change password" msgstr "Нажмите для изменения пароля" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "Экспортировать аккаунт" @@ -473,7 +467,6 @@ msgstr "пароль" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Прокси" @@ -815,116 +808,26 @@ msgid "Registration in progress…" msgstr "Идёт регистрация…" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "Это разрушительная операция. Вы уверены, что хотите удалить всю вашу историю чатов и звонков?" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "Выберите папку для загрузок" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "_Отмена" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "_Сохранить" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "Недопустимый пароль" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "Ошибка сети, попробуйте снова" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "Не удалось инициировать экспорт в сеть Jami, попробуйте ещё раз" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "Изменить пароль" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "Сохранить файл" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "Файл экспортирован в:" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "Предупреждение! Это действие отзовёт устройство!\nЗамечание: это действие невозможно отменить." - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "Введите пароль, чтобы отозвать устройство" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "Новый пароль и его подтверждение не совпадают" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "Пароль изменён!" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "Неверный пароль" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "Сохранить имя" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "Отозвать устройство" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "Ошибка при отзыве устройства" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Тип" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "автогенерация…" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Имя компьютера" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "Показать пароль" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Номер голосовой почты" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "Ошибка: неверный пароль!" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "Ошибка: неизвестное устройство!" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "Показать _область экрана" @@ -1119,7 +1022,11 @@ msgid "Send File" msgstr "Отправить файл" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "Сохранить файл" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1130,70 +1037,121 @@ msgid "Auto" msgstr "Авто" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "Предупреждение! Это действие отзовёт устройство!\nЗамечание: это действие невозможно отменить." + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "Введите пароль, чтобы отозвать устройство" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "Редактировать имя" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "Отозвать устройство" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "Ошибка при отзыве устройства" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "Разблокировать" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "Изменить пароль" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "Новый пароль и его подтверждение не совпадают!" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "Неверный пароль!" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "Замечание: это изменит пароль только на данном устройстве." -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "Текущий пароль" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Новый пароль" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "Аккаунт экспортирован!" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "Экспорт аккаунта не выполнен." -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "Недопустимый пароль" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "Ошибка сети, попробуйте снова" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "Неизвестная ошибка" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "Не удалось инициировать экспорт в сеть Jami, попробуйте ещё раз" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "Ошибка: неверный пароль!" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "Ошибка: неизвестное устройство!" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "Инициализация…" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "Не в сети" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "Соединение…" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "В сети" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "Неизвестный статус" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "••••••••" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "пароль не установлен" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/ru_RU.po ring-20190215.1.f152c98~ds1/client-gnome/po/ru_RU.po --- ring-20190110.1.e572469~ds1/client-gnome/po/ru_RU.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/ru_RU.po 2019-02-15 23:58:05.000000000 +0000 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Russian (Russia) (http://www.transifex.com/savoirfairelinux/ring/language/ru_RU/)\n" "MIME-Version: 1.0\n" @@ -36,7 +36,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Псевдоним" @@ -46,7 +46,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Пароль" @@ -56,7 +55,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "" @@ -155,7 +154,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Отмена" @@ -223,8 +222,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Имя пользователя" @@ -234,7 +232,7 @@ "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Подтверждение пароля" @@ -263,67 +261,63 @@ msgid "OK" msgstr "" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "Система" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." +#: ui/generalsettingsview.ui:336 +msgid "Chatview" msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "Показывать чат справа." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "Показывать чат внизу." +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Настройки истории" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "История" -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" msgstr "" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "(укажите 0 для неограниченного хранения)" - -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Очистить историю" @@ -442,7 +436,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "" @@ -459,7 +453,6 @@ msgstr "Пароль" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Прокси" @@ -801,116 +794,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "Сохранить файл" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Тип" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Номер голосовой почты" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -1105,7 +1008,11 @@ msgid "Send File" msgstr "" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "Сохранить файл" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1116,70 +1023,121 @@ msgid "Auto" msgstr "Автоматически" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Новый пароль" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/sk_SK.po ring-20190215.1.f152c98~ds1/client-gnome/po/sk_SK.po --- ring-20190110.1.e572469~ds1/client-gnome/po/sk_SK.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/sk_SK.po 2019-02-15 23:58:05.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/savoirfairelinux/ring/language/sk_SK/)\n" "MIME-Version: 1.0\n" @@ -34,7 +34,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Alias" @@ -44,7 +44,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "" @@ -54,7 +53,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "" @@ -153,7 +152,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Zruš" @@ -221,8 +220,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "" @@ -232,7 +230,7 @@ "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "" @@ -261,67 +259,63 @@ msgid "OK" msgstr "Ok" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" +#: ui/generalsettingsview.ui:43 +msgid "System" msgstr "" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." +#: ui/generalsettingsview.ui:336 +msgid "Chatview" msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." +#: ui/generalsettingsview.ui:449 +msgid "Download folder" msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Nastavenia historie" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "História" -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" msgstr "" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "" - -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Vymaž celú historiu" @@ -440,7 +434,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "" @@ -457,7 +451,6 @@ msgstr "" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "" @@ -799,116 +792,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Typ" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Hostname" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -1103,7 +1006,11 @@ msgid "Send File" msgstr "" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1114,70 +1021,121 @@ msgid "Auto" msgstr "" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/sl.po ring-20190215.1.f152c98~ds1/client-gnome/po/sl.po --- ring-20190110.1.e572469~ds1/client-gnome/po/sl.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/sl.po 2019-02-15 23:58:05.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Slovenian (http://www.transifex.com/savoirfairelinux/ring/language/sl/)\n" "MIME-Version: 1.0\n" @@ -34,7 +34,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Alias" @@ -44,7 +44,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Geslo" @@ -54,7 +53,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "Pobriši račun" @@ -153,7 +152,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Prekliči" @@ -221,8 +220,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Uporabnik" @@ -232,7 +230,7 @@ "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Potrdi geslo" @@ -261,67 +259,63 @@ msgid "OK" msgstr "OK" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "Sistem" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." -msgstr "Omogoči obvestila ob dohodnem klicu" - -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" +#: ui/generalsettingsview.ui:336 +msgid "Chatview" msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Nastavitve zgodovine" +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "" -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "Ohrani zgodovino za (dni)" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "Zgodovina" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "(Vpiši 0 za neomejeno zgodovino)" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" +msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Počisti vso zgodovino" @@ -440,7 +434,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "" @@ -457,7 +451,6 @@ msgstr "geslo" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Proxy" @@ -799,116 +792,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "_Prekliči" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "Neveljavno geslo" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "Napaka mreže. Prosim poskusi ponovno." - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "Shrani datoteko" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "Odpokliči napravo" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Tip" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Strežnik" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "Prikaži geslo" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Številka glasovnega predala" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -1103,7 +1006,11 @@ msgid "Send File" msgstr "" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "Shrani datoteko" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1114,70 +1021,121 @@ msgid "Auto" msgstr "Samodejno" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "Odpokliči napravo" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Novo geslo" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "Neveljavno geslo" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "Napaka mreže. Prosim poskusi ponovno." + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "Odjavljen" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "Povezan" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/sq_AL.po ring-20190215.1.f152c98~ds1/client-gnome/po/sq_AL.po --- ring-20190110.1.e572469~ds1/client-gnome/po/sq_AL.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/sq_AL.po 2019-02-15 23:58:05.000000000 +0000 @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Besnik , 2016-2018 +# Besnik , 2016-2019 msgid "" msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-18 08:58+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 16:55+0000\n" "Last-Translator: Besnik \n" "Language-Team: Albanian (Albania) (http://www.transifex.com/savoirfairelinux/ring/language/sq_AL/)\n" "MIME-Version: 1.0\n" @@ -34,7 +34,7 @@ msgid "This account is malformed, please enter your password" msgstr "Kjo llogari është e keqformuar, ju lutemi, jepni fjalëkalimin tuaj" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Alias" @@ -44,7 +44,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Krijoni llogari" @@ -54,7 +53,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "Fshije llogarinë" @@ -153,7 +152,7 @@ msgstr "Lidheni këtë pajisje me një llogari Jami të krijuar te pajisja tjetër" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Anuloje" @@ -221,8 +220,7 @@ 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/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Emër përdoruesi" @@ -232,7 +230,7 @@ "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:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Ripohoni fjalëkalimin" @@ -261,67 +259,63 @@ msgid "OK" msgstr "OK" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "Rregullime për Jami" - -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" -msgstr "Nise Jami-in kur bëni hyrjen në sistem" - -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." -msgstr "Shfaq ikonë Jami te fusha e njoftimeve (systray)." - -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." -msgstr "Sille Jami-n përpara për thirrje ardhëse." - -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." -msgstr "Aktivizo njoftimet për thirrje ardhëse." - -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." -msgstr "Aktivizo njoftime për kërkesa pezull." - -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." -msgstr "Aktivizo njoftimet për mesazhe të reja fjalosjesh." - -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." -msgstr "Shfaq te dritarja e fjalosjes figura dhe video." - -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." -msgstr "Dhënia e një numri te fusha e kërkimeve do të kryejë një thirrje të re." - -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" -msgstr "Dosje shkarkimesh:" - -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "Shfaqe fjalosjen djathtas." - -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "Shfaqe fjalosjen poshtë." - -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Rregullime Historiku" - -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "Mbaje historikun për (ditë):" - -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "(vëreni 0 për historik të pakufizuar)" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "Sistem" + +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" +msgstr "Nise aplikacionin kur bëhet hyrja në sistem" + +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" +msgstr "Shfaq ikonë (systray) Jami te fusha e njoftimeve" + +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" +msgstr "Sille Jami-n përpara për thirrje ardhëse" + +#: ui/generalsettingsview.ui:189 +msgid "Notifications" +msgstr "Njoftime" + +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" +msgstr "Aktivizo njoftimet për thirrje ardhëse" + +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" +msgstr "Aktivizo njoftime për kërkesa pezull" + +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" +msgstr "Aktivizo njoftimet për mesazhe të reja fjalosjesh" + +#: ui/generalsettingsview.ui:336 +msgid "Chatview" +msgstr "Pamje fjalosjeje" + +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" +msgstr "Shfaq te pamja e fjalosjes figura dhe video" + +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "Shfaqe pamjen e fjalosjes djathtas (poshtë, nëse është off)" + +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "Dosje Shkarkimi" + +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "Historik" + +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" +msgstr "Mbaje historikun për (ditë, 0 = pa kufizim)" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Pastro krejt historikun" @@ -440,7 +434,7 @@ msgid "Click to change password" msgstr "Klikoni që të ndryshohet fjalëkalimi" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "Eksportoni llogari" @@ -457,7 +451,6 @@ msgstr "fjalëkalim" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Ndërmjetës" @@ -799,116 +792,26 @@ msgid "Registration in progress…" msgstr "Regjistrim në kryerje e sipër…" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "Ky është veprim me pasoja shkatërruese. Jeni i sigurt se doni të fshihet krejt historiku juaj i fjalosjeve dhe thirrjeve?" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "Zgjidhni dosje shkarkimesh" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "_Anuloje" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "_Ruaje" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "Fjalëkalim i gabuar" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "Gabim rrjeti, riprovoni" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "S’u fillua dot eksportimi te Jami, riprovoni" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "Ndryshoni fjalëkalimin" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "Ruaje Kartelën" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "Kartela u eksportua te vendmbërritja: " - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "Kujdes! Ky veprim do të shfuqizojë pajisjen!\nShënim: ky veprim s’mund të zhbëhet." - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "Që të shfuqizohet pajisja, jepni fjalëkalimin" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "Fjalëkalimi i ri dhe ripohimi për të janë të ndryshëm" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "Fjalëkalimi ndryshoi!" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "Fjalëkalim i pasaktë" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "Ruaje emrin" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "Shfuqizoje pajisjen" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "Gabim gjatë shfuqizimit të pajisjes" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Lloj" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "po vetëprodhohet…" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Strehëemër" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "Shfaqe fjalëkalimin" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Numër voicemail" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "Gabim: fjalëkalim i gabuar!" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "Gabim: pajisje e panjohur!" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "Ndani me të tjerë zonë _ekrani" @@ -1103,7 +1006,11 @@ msgid "Send File" msgstr "Dërgo Kartelë" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "Ruaje Kartelën" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1114,70 +1021,121 @@ msgid "Auto" msgstr "Auto" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "Kujdes! Ky veprim do të shfuqizojë pajisjen!\nShënim: ky veprim s’mund të zhbëhet." + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "Që të shfuqizohet pajisja, jepni fjalëkalimin" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "Përpunoni emrin" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "Shfuqizoje pajisjen" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "Gabim gjatë shfuqizimit të pajisjes" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "Zhdëboje" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "Ndryshoni fjalëkalimin" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "Fjalëkalimi i ri dhe ripohimi për të janë të ndryshëm!" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "Fjalëkalim i pasaktë!" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "Shënim: kjo do të ndryshojë fjalëkalimi vetëm në këtë pajisje." -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "Fjalëkalimi i tanishëm" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Fjalëkalim i ri" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +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:955 +msgid "Enter password to export archive" +msgstr "Jepni fjalëkalimin që të eksportohet arkivi" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "Llogaria u eksportua!" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "Dështim eksportimi llogarie." -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "Fjalëkalim i gabuar" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "Gabim rrjeti, riprovoni" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "Gabim i panjohur" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "S’u fillua dot eksportimi te Jami, riprovoni" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "Gabim: fjalëkalim i gabuar!" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "Gabim: pajisje e panjohur!" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "Po gatitet…" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "Jo në linjë" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "Po lidhet…" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "Në linjë" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "Gjendje e panjohur" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "••••••••" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "s’ka fjalëkalim të caktuar" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/sv.po ring-20190215.1.f152c98~ds1/client-gnome/po/sv.po --- ring-20190110.1.e572469~ds1/client-gnome/po/sv.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/sv.po 2019-02-15 23:58:05.000000000 +0000 @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Åke Engelbrektson, 2016-2018 +# Åke Engelbrektson, 2016-2019 msgid "" msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 16:37+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 12:28+0000\n" "Last-Translator: Åke Engelbrektson\n" "Language-Team: Swedish (http://www.transifex.com/savoirfairelinux/ring/language/sv/)\n" "MIME-Version: 1.0\n" @@ -34,7 +34,7 @@ msgid "This account is malformed, please enter your password" msgstr "Detta konto är felaktigt, ange ditt lösenord" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Alias" @@ -44,7 +44,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Lösenord" @@ -54,7 +53,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "Ta bort konto" @@ -153,7 +152,7 @@ msgstr "Koppla den här enheten till ett Jami-konto, skapat på en annan enhet." #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Avbryt" @@ -221,8 +220,7 @@ 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/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Användarnamn" @@ -232,7 +230,7 @@ "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:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Bekräfta lösenord" @@ -261,67 +259,63 @@ msgid "OK" msgstr "OK" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "Jami-inställningar" - -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" -msgstr "Starta Jami vid inloggning" - -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." -msgstr "Visa Jami-ikon i meddelandefältet (systray)." - -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." -msgstr "Ta fram Jami till förgrunden vid inkommande samtal." - -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." -msgstr "Aktivera avisering för inkommande samtal." - -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." -msgstr "Aktivera avisering för väntande förfrågningar." - -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." -msgstr "Aktivera avisering för nya chattmeddelanden." - -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." -msgstr "Visa bilder och filmer i chattfönster" - -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." -msgstr "Ange ett nummer i sökfältet för att starta ett nytt samtal." - -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" -msgstr "Nerladdningsmapp:" - -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "Visa chatten till höger" - -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "Visa chatten nederst" - -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Historikinställningar" - -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "Spara historiken i (dagar):" - -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "(Ange 0 för obegränsad historik)" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "System" + +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" +msgstr "Starta programmet vid inloggning" + +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" +msgstr "Visa Jami-ikon i aviseringsfältet (systray)" + +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" +msgstr "Ta fram Jami till förgrunden vid inkommande samtal" + +#: ui/generalsettingsview.ui:189 +msgid "Notifications" +msgstr "Aviseringar" + +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" +msgstr "Aktivera avisering för inkommande samtal" + +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" +msgstr "Aktivera avisering för väntande förfrågningar" + +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" +msgstr "Aktivera avisering för nya chattmeddelanden" + +#: ui/generalsettingsview.ui:336 +msgid "Chatview" +msgstr "Chattvy" + +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" +msgstr "Visa bilder och filmer i chattfönstret" + +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "Visa chatten till höger (i underkant om av)" + +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "Nerladdningsmapp" + +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "Historik" + +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" +msgstr "Spara historiken i (dagar, 0 = obegränsat)" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Rensa all historik" @@ -440,7 +434,7 @@ msgid "Click to change password" msgstr "Klicka för att byta lösenord" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "Exportera konto" @@ -457,7 +451,6 @@ msgstr "Lösenord" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Proxy" @@ -799,116 +792,26 @@ msgid "Registration in progress…" msgstr "Registrering pågår..." -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "Detta är en destruktiv åtgärd. Vill du verkligen ta bort all din chatt- och samtalshistorik?" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "Välj nerladdningsmapp" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "_Avbryt" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "_Spara" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "Fel lösenord" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "Nätverksfel, försök igen" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "Kunde inte starta export till Jami, försök igen" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "Byt lösenord" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "Spara fil" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "Fil exporterad till:" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "Varning! Denna åtgärd kommer att återkalla enheten!\nNotera att åtgärden inte kan ångras." - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "Ange lösenord för att återkalla enheten" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "Det nya lösenordet och bekräftelsen är olika" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "Lösenordet ändrat!" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "Felaktigt lösenord" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "Spara namn" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "Återkalla enhet" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "Kunde inte återkalla enheten" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Typ" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "autogenererar..." - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Värdnamn" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "Visa lösenord" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Nummer till röstbrevlåda" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "Fel: Fel lösenord!" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "Fel: Okänd enhet!" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "Dela _skärmområde" @@ -1103,7 +1006,11 @@ msgid "Send File" msgstr "Skicka fil" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "Spara fil" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1114,70 +1021,121 @@ msgid "Auto" msgstr "Auto" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "Varning! Denna åtgärd kommer att återkalla enheten!\nNotera att åtgärden inte kan ångras." + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "Ange lösenord för att återkalla enheten" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "Redigera namn" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "Återkalla enhet" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "Kunde inte återkalla enheten" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "Ta bort bannlysning" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "Byt lösenord" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "Det nya lösenordet och bekräftelsen är olika" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "Felaktigt lösenord!" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "Notera att lösenordet ändras på denna enhet endast." -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "Aktuellt lösenord" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Nytt lösenord" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +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:955 +msgid "Enter password to export archive" +msgstr "Ange lösenord för att exportera arkivet" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "Konto exporterat!" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "Kontoexport misslyckades." -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "Fel lösenord" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "Nätverksfel, försök igen" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "Okänt fel" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "Kunde inte starta export till Jami, försök igen" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "Fel: Fel lösenord!" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "Fel: Okänd enhet!" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "Startar..." -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "Nerkopplad" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "Ansluter..." -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "Uppkopplad" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "Okänd status" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "••••••••" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "Lösenord saknas" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/tr.po ring-20190215.1.f152c98~ds1/client-gnome/po/tr.po --- ring-20190110.1.e572469~ds1/client-gnome/po/tr.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/tr.po 2019-02-15 23:58:05.000000000 +0000 @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Turkish (http://www.transifex.com/savoirfairelinux/ring/language/tr/)\n" "MIME-Version: 1.0\n" @@ -38,7 +38,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Takma ad" @@ -48,7 +48,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Parola" @@ -58,7 +57,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "Hesabı sil" @@ -157,7 +156,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "İptal" @@ -225,8 +224,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Kullanıcı adı" @@ -236,7 +234,7 @@ "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:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Parolayı onayla" @@ -265,67 +263,63 @@ msgid "OK" msgstr "TAMAM" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "Düzen" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." -msgstr "Gelen çağrılar için bildirimleri etkinleştir." - -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." -msgstr "Yeni konuşma iletileri için bildirimler etkinleştir." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" +msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." -msgstr "Arama girişine bir numara girmek yeni bir arama yapacak." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" +msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" +#: ui/generalsettingsview.ui:336 +msgid "Chatview" msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "Konuşmayı sağda göster." +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" +msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "Konuşmayı aşağıda göster." +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Geçmiş Ayarları" +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "" -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "Geçmişi tutulacak gün sayısı:" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "Geçmiş" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "(sınırsız geçmiş için 0 yapın)" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" +msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Tüm geçmişi temizle" @@ -444,7 +438,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "Hesapları dışa aktar" @@ -461,7 +455,6 @@ msgstr "parola" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Vekil" @@ -803,116 +796,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "Bu yok edici bir eylemdir. Tüm konuşma ve çağrı geçmişini silmek istediğinizden emin misiniz?" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "_İptal" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "Geçersiz parola" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "Ağ hatası, yeniden deneyin" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "Dosyayı Kaydet" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "Aygıtı feshet " - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Tür" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Sunucu adı" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "Parolayı göster" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Sesli ileti numarası" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -1107,7 +1010,11 @@ msgid "Send File" msgstr "" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "Dosyayı Kaydet" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1118,70 +1025,121 @@ msgid "Auto" msgstr "Kendiliğinden" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "Aygıtı feshet " + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Yeni parola" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "Geçersiz parola" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "Ağ hatası, yeniden deneyin" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "Çevrimdışı" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "Çevrimiçi" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/uk.po ring-20190215.1.f152c98~ds1/client-gnome/po/uk.po --- ring-20190110.1.e572469~ds1/client-gnome/po/uk.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/uk.po 2019-02-15 23:58:05.000000000 +0000 @@ -14,8 +14,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Ukrainian (http://www.transifex.com/savoirfairelinux/ring/language/uk/)\n" "MIME-Version: 1.0\n" @@ -40,7 +40,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "Додаткове ім’я" @@ -50,7 +50,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "Пароль" @@ -60,7 +59,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "" @@ -159,7 +158,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "Відміна" @@ -227,8 +226,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "Ім’я" @@ -238,7 +236,7 @@ "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "Підтвердити пароль" @@ -267,67 +265,63 @@ msgid "OK" msgstr "OK" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "Система" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." +#: ui/generalsettingsview.ui:336 +msgid "Chatview" msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "Показати повідомлення справа" - -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "Показати повідомлення внизу" +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "Налаштування історії" +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "" -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "Зберігати історію впродовж (дні)" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "Історія" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "(установіть 0 для необмеженої історії)" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" +msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "Очистити усю історію" @@ -446,7 +440,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "" @@ -463,7 +457,6 @@ msgstr "пароль" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "Проксі" @@ -805,116 +798,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "Зберегти файл" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "Тип" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "Ім'я хоста" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "Відобразити пароль" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "Номер голосової пошти" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -1109,7 +1012,11 @@ msgid "Send File" msgstr "" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "Зберегти файл" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1120,70 +1027,121 @@ msgid "Auto" msgstr "Авто" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "Новий пароль" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/zh_CN.po ring-20190215.1.f152c98~ds1/client-gnome/po/zh_CN.po --- ring-20190110.1.e572469~ds1/client-gnome/po/zh_CN.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/zh_CN.po 2019-02-15 23:58:05.000000000 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Chinese (China) (http://www.transifex.com/savoirfairelinux/ring/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -37,7 +37,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "别名" @@ -47,7 +47,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "密码" @@ -57,7 +56,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "删除帐户" @@ -156,7 +155,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "取消" @@ -224,8 +223,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "用户名" @@ -235,7 +233,7 @@ "devices to your account." msgstr "该密码用于加密您的帐户数据，以及将其他设备与您的帐户进行连接。" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "确认密码" @@ -264,67 +262,63 @@ msgid "OK" msgstr "确定" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "系统" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." -msgstr "启用来电通知。" - -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." -msgstr "启用新消息通知。" +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" +msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." -msgstr "在聊天窗口中显示图片和视频" +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" +msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." -msgstr "要直接拨打电话号码，请在搜索栏中输入该号码。" +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" +msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" +#: ui/generalsettingsview.ui:336 +msgid "Chatview" msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "在右侧显示聊天窗口。" +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" +msgstr "" -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "在下方显示聊天窗口。" +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "历史记录设置" +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "" -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "历史记录保存天数：" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "历史记录" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "（设置为0则无限制）" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" +msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "清除所有历史记录" @@ -443,7 +437,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "" @@ -460,7 +454,6 @@ msgstr "密码" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "代理" @@ -802,116 +795,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "该操作不可撤销。确定删除您的所有聊天与通话记录吗？" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "取消(_C)" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "密码错误" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "网络错误，请重试" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "保存文件" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "吊销设备" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "类别" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "主机名" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "显示密码" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "语音信箱号码" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -1106,7 +1009,11 @@ msgid "Send File" msgstr "" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "保存文件" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1117,70 +1024,121 @@ msgid "Auto" msgstr "自动" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "吊销设备" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "新密码" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "密码错误" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "网络错误，请重试" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "离线" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "在线" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/zh.po ring-20190215.1.f152c98~ds1/client-gnome/po/zh.po --- ring-20190110.1.e572469~ds1/client-gnome/po/zh.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/zh.po 2019-02-15 23:58:05.000000000 +0000 @@ -4,14 +4,14 @@ # # Translators: # Derek 呆 , 2016 -# Redfish Hong-Yu Li , 2016 +# redfishleo , 2016 # Tom Samder <2v894l+efbge9r9x3pt0@sharklasers.com>, 2016 msgid "" msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 08:09+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 08:09+0000\n" "Last-Translator: Alexandre Lision\n" "Language-Team: Chinese (http://www.transifex.com/savoirfairelinux/ring/language/zh/)\n" "MIME-Version: 1.0\n" @@ -36,7 +36,7 @@ msgid "This account is malformed, please enter your password" msgstr "" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "別名" @@ -46,7 +46,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "密码" @@ -56,7 +55,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "" @@ -155,7 +154,7 @@ msgstr "" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "取消" @@ -223,8 +222,7 @@ msgstr "" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "使用者名" @@ -234,7 +232,7 @@ "devices to your account." msgstr "" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "" @@ -263,67 +261,63 @@ msgid "OK" msgstr "" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" +#: ui/generalsettingsview.ui:43 +msgid "System" msgstr "" -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" msgstr "" -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" msgstr "" -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" msgstr "" -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." +#: ui/generalsettingsview.ui:189 +msgid "Notifications" msgstr "" -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" msgstr "" -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" msgstr "" -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" msgstr "" -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." +#: ui/generalsettingsview.ui:336 +msgid "Chatview" msgstr "" -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" msgstr "" -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "在右側顯示聊天" - -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "在下方顯示聊天" +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "" -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "歷史記錄設定" +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "" -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "保留歷史紀錄(天):" +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "歷史記錄" -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" msgstr "" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "清除所有歷史紀錄" @@ -442,7 +436,7 @@ msgid "Click to change password" msgstr "" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "" @@ -459,7 +453,6 @@ msgstr "密碼" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "代理" @@ -801,116 +794,26 @@ msgid "Registration in progress…" msgstr "" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "儲存檔案" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "型" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "主機名稱" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "顯示密碼" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "語音留言號" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "" @@ -1105,7 +1008,11 @@ msgid "Send File" msgstr "" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "儲存檔案" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1116,70 +1023,121 @@ msgid "Auto" msgstr "" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/po/zh_TW.po ring-20190215.1.f152c98~ds1/client-gnome/po/zh_TW.po --- ring-20190110.1.e572469~ds1/client-gnome/po/zh_TW.po 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/po/zh_TW.po 2019-02-15 23:58:05.000000000 +0000 @@ -5,13 +5,13 @@ # Translators: # Hsiu-Ming Chang , 2016 # Hsiu-Ming Chang , 2016 -# Jeff Huang , 2017-2018 +# Jeff Huang , 2017-2019 msgid "" msgstr "" "Project-Id-Version: Ring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-31 03:09-0500\n" -"PO-Revision-Date: 2018-12-17 12:16+0000\n" +"POT-Creation-Date: 2019-01-28 03:09-0500\n" +"PO-Revision-Date: 2019-01-21 12:59+0000\n" "Last-Translator: Jeff Huang \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/savoirfairelinux/ring/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -36,7 +36,7 @@ msgid "This account is malformed, please enter your password" msgstr "這個帳號格式錯誤，請輸入您的密碼" -#: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:619 +#: ui/accountmigrationview.ui:89 msgid "Alias" msgstr "別名" @@ -46,7 +46,6 @@ #: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:451 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769 -#: src/accountgeneraltab.cpp:706 msgid "Password" msgstr "密碼" @@ -56,7 +55,7 @@ #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177 -#: src/newaccountsettingsview.cpp:965 +#: src/newaccountsettingsview.cpp:994 msgid "Delete account" msgstr "刪除帳號" @@ -155,7 +154,7 @@ msgstr "連結此裝置到在其他裝置上建立的 Jami 帳號" #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183 -#: src/newaccountsettingsview.cpp:885 +#: src/newaccountsettingsview.cpp:887 msgid "Cancel" msgstr "取消" @@ -223,8 +222,7 @@ msgstr "透過勾選這個，您將會在 Jami 網路上註冊一個獨一無二的使用者名稱。人們可以使用它來聯絡您，而不必使用長達 40 個字元的您的 RingID。" #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503 -#: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669 -#: src/accountgeneraltab.cpp:696 +#: ui/newaccountsettingsview.ui:733 msgid "Username" msgstr "使用者名稱" @@ -234,7 +232,7 @@ "devices to your account." msgstr "這個密碼將會用於加密您的帳號資料與連結新的裝置到您的帳號。" -#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875 +#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:877 msgid "Confirm password" msgstr "確認密碼" @@ -263,67 +261,63 @@ msgid "OK" msgstr "確定" -#: ui/generalsettingsview.ui:46 -msgid "Jami Settings" -msgstr "Jami 設定" - -#: ui/generalsettingsview.ui:62 -msgid "Start Jami on login" -msgstr "登入時啟動 Jami" - -#: ui/generalsettingsview.ui:70 -msgid "Show Jami icon in the notification area (systray)." -msgstr "在通知區域（系統匣）中顯示 Jami 圖示。" - -#: ui/generalsettingsview.ui:78 -msgid "Bring Jami to the foreground on incoming calls." -msgstr "有來電時將 Jami 帶到前景。" - -#: ui/generalsettingsview.ui:86 -msgid "Enable notifications for incoming calls." -msgstr "啟用來電通知。" - -#: ui/generalsettingsview.ui:94 -msgid "Enable notifications for pending requests." -msgstr "啟用擱置中請求的通知。" - -#: ui/generalsettingsview.ui:102 -msgid "Enable notifications for new chat messages." -msgstr "啟用新聊天訊息通知。" - -#: ui/generalsettingsview.ui:110 -msgid "Show images and videos in chat window." -msgstr "在聊天室窗中顯示圖片與影片。" - -#: ui/generalsettingsview.ui:118 -msgid "Entering a number in the search entry will place a new call." -msgstr "在搜尋項目中輸入號碼將會打一通新電話。" - -#: ui/generalsettingsview.ui:131 -msgid "Download folder:" -msgstr "下載資料夾：" - -#: ui/generalsettingsview.ui:158 -msgid "Show chat on the right." -msgstr "在右邊顯示聊天。" - -#: ui/generalsettingsview.ui:164 -msgid "Show chat on the bottom." -msgstr "在底部顯示聊天。" - -#: ui/generalsettingsview.ui:188 -msgid "History Settings" -msgstr "記錄設定" - -#: ui/generalsettingsview.ui:206 -msgid "Keep history for (days):" -msgstr "保持記錄數日" - -#: ui/generalsettingsview.ui:227 -msgid "(set to 0 for unlimited history)" -msgstr "(設定0 表示無限制記錄)" +#: ui/generalsettingsview.ui:43 +msgid "System" +msgstr "系統" + +#: ui/generalsettingsview.ui:81 +msgid "Start application on login" +msgstr "在登入時啟動應用程式" + +#: ui/generalsettingsview.ui:117 +msgid "Show Jami icon (systray) in the systray area" +msgstr "在系統匣區域中顯示 Jami 圖示（系統匣）。" + +#: ui/generalsettingsview.ui:153 +msgid "Bring Jami to the foreground on incoming calls" +msgstr "有來電時將 Jami 帶到前景" + +#: ui/generalsettingsview.ui:189 +msgid "Notifications" +msgstr "通知" + +#: ui/generalsettingsview.ui:228 +msgid "Enable notifications for incoming calls" +msgstr "啟用來電通知" + +#: ui/generalsettingsview.ui:264 +msgid "Enable notifications for pending requests" +msgstr "啟用擱置中請求的通知" + +#: ui/generalsettingsview.ui:300 +msgid "Enable notifications for new chat messages" +msgstr "啟用新聊天訊息通知" + +#: ui/generalsettingsview.ui:336 +msgid "Chatview" +msgstr "聊天視窗" + +#: ui/generalsettingsview.ui:375 +msgid "Display images and videos into the chatview" +msgstr "在聊天室窗中顯示圖片與影片" + +#: ui/generalsettingsview.ui:412 +msgid "Show chatview on the right (on the bottom if off)" +msgstr "將聊天視窗顯示在右邊（如果關閉的話就是在底部）" + +#: ui/generalsettingsview.ui:449 +msgid "Download folder" +msgstr "下載資料夾" + +#: ui/generalsettingsview.ui:486 +msgid "History" +msgstr "歷史記錄" + +#: ui/generalsettingsview.ui:525 +msgid "Keep history for (days, 0 = unlimited)" +msgstr "保留歷史（單位為天，0 = 無限制）" -#: ui/generalsettingsview.ui:237 +#: ui/generalsettingsview.ui:555 msgid "Clear all history" msgstr "清除所有記錄" @@ -442,7 +436,7 @@ msgid "Click to change password" msgstr "點選以變更密碼" -#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999 +#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:2033 msgid "Export account" msgstr "匯出帳號" @@ -459,7 +453,6 @@ msgstr "密碼" #: ui/newaccountsettingsview.ui:810 ui/newaccountsettingsview.ui:1398 -#: src/accountgeneraltab.cpp:725 msgid "Proxy" msgstr "代理服務器" @@ -801,116 +794,26 @@ msgid "Registration in progress…" msgstr "正在註冊……" -#: src/generalsettingsview.cpp:102 +#: src/generalsettingsview.cpp:100 msgid "" "This is a destructive operation. Are you sure you want to delete all of your" " chat and call history?" msgstr "這是一個破壞性的操作。您確定您想要刪除您所有的聊天與通話紀錄嗎？" -#: src/generalsettingsview.cpp:172 +#: src/generalsettingsview.cpp:170 msgid "Choose download folder" msgstr "選擇下載資料夾" -#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342 -#: src/avatarmanipulation.cpp:414 src/chatview.cpp:178 -#: src/newaccountsettingsview.cpp:928 +#: src/generalsettingsview.cpp:173 src/avatarmanipulation.cpp:414 +#: src/chatview.cpp:178 src/newaccountsettingsview.cpp:930 msgid "_Cancel" msgstr "取消(_C)" -#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344 -#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930 +#: src/generalsettingsview.cpp:175 src/chatview.cpp:180 +#: src/newaccountsettingsview.cpp:932 msgid "_Save" msgstr "儲存(_S)" -#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707 -msgid "Bad password" -msgstr "密碼錯誤" - -#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713 -msgid "Network error, try again" -msgstr "網路錯誤，請重試" - -#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731 -msgid "Could not initiate export to the Jami, try again" -msgstr "無法啟用輸出到 Jami，請重試。" - -#: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528 -#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822 -#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882 -msgid "Change password" -msgstr "變更密碼" - -#: src/accountgeneraltab.cpp:339 src/chatview.cpp:175 -#: src/newaccountsettingsview.cpp:925 -msgid "Save File" -msgstr "儲存檔案" - -#: src/accountgeneraltab.cpp:364 -msgid "File exported to destination: " -msgstr "檔案已匯出至目標位置" - -#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622 -msgid "" -"Warning! This action will revoke the device!\n" -"Note: this action cannot be undone." -msgstr "警告！這個動作將會撤銷裝置！\n注意：這個動作無法復原。" - -#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623 -msgid "Enter password to revoke device" -msgstr "輸入密碼以撤銷裝置" - -#: src/accountgeneraltab.cpp:516 -msgid "New password and its confirmation are different" -msgstr "新密碼與其確認密碼不一樣" - -#: src/accountgeneraltab.cpp:526 -msgid "Password changed!" -msgstr "密碼已變更！" - -#: src/accountgeneraltab.cpp:529 -msgid "Incorrect password" -msgstr "不正確的密碼" - -#: src/accountgeneraltab.cpp:560 -msgid "Save name" -msgstr "儲存名稱" - -#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681 -msgid "Revoke device" -msgstr "撤銷裝置" - -#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703 -msgid "Error when revoking device" -msgstr "當撤銷裝置時發生錯誤" - -#: src/accountgeneraltab.cpp:630 -msgid "Type" -msgstr "類型" - -#: src/accountgeneraltab.cpp:656 -msgid "auto-generating…" -msgstr "正在自動生成……" - -#: src/accountgeneraltab.cpp:686 -msgid "Hostname" -msgstr "主機名稱" - -#: src/accountgeneraltab.cpp:719 -msgid "Show password" -msgstr "顯示密碼" - -#: src/accountgeneraltab.cpp:735 -msgid "Voicemail number" -msgstr "語音郵件號碼" - -#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790 -msgid "Error: wrong password!" -msgstr "錯誤：不正確的密碼！" - -#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793 -msgid "Error: unknown device!" -msgstr "錯誤：未知的裝置！" - #: src/video/video_widget.cpp:549 msgid "Share _screen area" msgstr "分享螢幕區域(_S)" @@ -1105,7 +1008,11 @@ msgid "Send File" msgstr "傳送檔案" -#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964 +#: src/chatview.cpp:175 src/newaccountsettingsview.cpp:927 +msgid "Save File" +msgstr "儲存檔案" + +#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:993 msgid "" "Warning! This action will remove this account on this device!\n" "Note: this action cannot be undone. Also, your registered name can be lost!" @@ -1116,70 +1023,121 @@ msgid "Auto" msgstr "自動" -#: src/newaccountsettingsview.cpp:681 +#: src/newaccountsettingsview.cpp:624 +msgid "" +"Warning! This action will revoke the device!\n" +"Note: this action cannot be undone." +msgstr "警告！這個動作將會撤銷裝置！\n注意：這個動作無法復原。" + +#: src/newaccountsettingsview.cpp:625 +msgid "Enter password to revoke device" +msgstr "輸入密碼以撤銷裝置" + +#: src/newaccountsettingsview.cpp:683 msgid "Edit name" msgstr "編輯名稱" -#: src/newaccountsettingsview.cpp:776 +#: src/newaccountsettingsview.cpp:683 +msgid "Revoke device" +msgstr "撤銷裝置" + +#: src/newaccountsettingsview.cpp:705 +msgid "Error when revoking device" +msgstr "當撤銷裝置時發生錯誤" + +#: src/newaccountsettingsview.cpp:778 msgid "Unban" msgstr "取消阻擋" -#: src/newaccountsettingsview.cpp:812 +#: src/newaccountsettingsview.cpp:801 src/newaccountsettingsview.cpp:824 +#: src/newaccountsettingsview.cpp:848 src/newaccountsettingsview.cpp:884 +msgid "Change password" +msgstr "變更密碼" + +#: src/newaccountsettingsview.cpp:814 msgid "New password and its confirmation are different!" msgstr "新密碼與其確認密碼不相符！" -#: src/newaccountsettingsview.cpp:823 +#: src/newaccountsettingsview.cpp:825 msgid "Incorrect password!" msgstr "不正確的密碼！" -#: src/newaccountsettingsview.cpp:860 +#: src/newaccountsettingsview.cpp:862 msgid "Note: this will change the password only on this device." msgstr "注意：這將會僅會在此裝置上變更密碼。" -#: src/newaccountsettingsview.cpp:863 +#: src/newaccountsettingsview.cpp:865 msgid "Current password" msgstr "目前的密碼" -#: src/newaccountsettingsview.cpp:869 +#: src/newaccountsettingsview.cpp:871 msgid "New password" msgstr "新密碼" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:954 +msgid "You need to enter your password to export the full archive." +msgstr "您需要輸入您的密碼以匯出完整壓縮檔。" + +#: src/newaccountsettingsview.cpp:955 +msgid "Enter password to export archive" +msgstr "輸入密碼以匯出壓縮檔" + +#: src/newaccountsettingsview.cpp:978 msgid "Account exported!" msgstr "帳號已匯出！" -#: src/newaccountsettingsview.cpp:949 +#: src/newaccountsettingsview.cpp:978 msgid "Export account failure." msgstr "匯出帳號失敗。" -#: src/newaccountsettingsview.cpp:1719 +#: src/newaccountsettingsview.cpp:1741 +msgid "Bad password" +msgstr "密碼錯誤" + +#: src/newaccountsettingsview.cpp:1747 +msgid "Network error, try again" +msgstr "網路錯誤，請重試" + +#: src/newaccountsettingsview.cpp:1753 msgid "Unknown error" msgstr "未知的錯誤" -#: src/newaccountsettingsview.cpp:1964 +#: src/newaccountsettingsview.cpp:1765 +msgid "Could not initiate export to the Jami, try again" +msgstr "無法啟用輸出到 Jami，請重試。" + +#: src/newaccountsettingsview.cpp:1824 +msgid "Error: wrong password!" +msgstr "錯誤：不正確的密碼！" + +#: src/newaccountsettingsview.cpp:1827 +msgid "Error: unknown device!" +msgstr "錯誤：未知的裝置！" + +#: src/newaccountsettingsview.cpp:1998 msgid "Initializing…" msgstr "正在初始化……" -#: src/newaccountsettingsview.cpp:1967 +#: src/newaccountsettingsview.cpp:2001 msgid "Offline" msgstr "離線" -#: src/newaccountsettingsview.cpp:1970 +#: src/newaccountsettingsview.cpp:2004 msgid "Connecting…" msgstr "正在連線……" -#: src/newaccountsettingsview.cpp:1973 +#: src/newaccountsettingsview.cpp:2007 msgid "Online" msgstr "線上" -#: src/newaccountsettingsview.cpp:1977 +#: src/newaccountsettingsview.cpp:2011 msgid "Unknown status" msgstr "未知狀態" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "••••••••" msgstr "••••••••" -#: src/newaccountsettingsview.cpp:2010 +#: src/newaccountsettingsview.cpp:2044 msgid "no password set" msgstr "未設定密碼" diff -Nru ring-20190110.1.e572469~ds1/client-gnome/README.md ring-20190215.1.f152c98~ds1/client-gnome/README.md --- ring-20190110.1.e572469~ds1/client-gnome/README.md 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/README.md 2019-02-15 23:57:49.000000000 +0000 @@ -4,15 +4,15 @@ Jami-client-gnome is a Jami client written in GTK+3. It uses libRingClient to communicate with the Jami daemon and for all of the underlying models and their -logic. Ideally ring-client-gnome should only contain UI related code and any +logic. Ideally Jami-client-gnome should only contain UI related code and any wrappers necessary for interacting with libRingClient. -Packages for Debian/Ubuntu/Fedora can be found at https://jami.net +Packages for Debian/Ubuntu/Fedora can be found at https://jami.net/ -More info about the Ring project and the clients can be found on our Gitlab's instance: +More info about the Jami project and the clients can be found on our Gitlab's instance: https://git.jami.net/ -GNU Ring welcomes contribution from everyone. See [CONTRIBUTING.md](CONTRIBUTING.md) for help getting started. +GNU Jami welcomes contribution from everyone. See [CONTRIBUTING.md](CONTRIBUTING.md) for help getting started. # Setting up your environment @@ -24,18 +24,18 @@ - Qt5 Core - X11 - gnome-icon-theme-symbolic (certain icons are used which other themes might be missing) -- libebook1.2 / evolution-data-server (3.10 or higher) +- A font with symbols U+1F4DE and U+1F57D (used in some messages) - libnotify (optional, if you wish to receive desktop notifications of incoming calls, etc) - gettext (optional to compile translations) On Debian/Ubuntu these can be installed by: ```bash -sudo apt-get install g++ cmake libgtk-3-dev qtbase5-dev libclutter-gtk-1.0-dev gnome-icon-theme-symbolic libebook1.2-dev libnotify-dev gettext +sudo apt-get install g++ cmake libgtk-3-dev qtbase5-dev libclutter-gtk-1.0-dev gnome-icon-theme-symbolic libnotify-dev gettext ``` On Fedora: ```bash -sudo dnf install gcc-c++ cmake gtk3-devel qt5-qtbase-devel clutter-gtk-devel gnome-icon-theme-symbolic evolution-data-server-devel libnotify-devel gettext +sudo dnf install gcc-c++ cmake gtk3-devel qt5-qtbase-devel clutter-gtk-devel gnome-icon-theme-symbolic libnotify-devel gettext ``` The build instructions for the daemon and libRingClient can be found in their diff -Nru ring-20190110.1.e572469~ds1/client-gnome/src/accountgeneraltab.cpp ring-20190215.1.f152c98~ds1/client-gnome/src/accountgeneraltab.cpp --- ring-20190110.1.e572469~ds1/client-gnome/src/accountgeneraltab.cpp 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/src/accountgeneraltab.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,886 +0,0 @@ -/* - * Copyright (C) 2015-2019 Savoir-faire Linux Inc. - * Author: Alexandre Viau - * Author: Sebastien Blin - * Author: Stepan Salenikovich - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include "accountgeneraltab.h" - -#include -#include - -#include "defines.h" -#include "utils/models.h" -#include "usernameregistrationbox.h" - -#include -#include - - -struct _AccountGeneralTab -{ - GtkBox parent; -}; - -struct _AccountGeneralTabClass -{ - GtkBoxClass parent_class; -}; - -typedef struct _AccountGeneralTabPrivate AccountGeneralTabPrivate; - -struct _AccountGeneralTabPrivate -{ - Account *account; - AccountInfoPointer const *accountInfo_; - - GtkWidget* stack_account_general; - GtkWidget* account_general; - - GtkWidget* grid_account; - GtkWidget* frame_parameters; - GtkWidget* grid_parameters; - - GtkWidget* entry_current_password; - GtkWidget* entry_new_password; - GtkWidget* entry_confirm_password; - GtkWidget* button_validate_password; - GtkWidget* label_error_change_passowrd; - - GtkWidget* button_choose_file; - GtkWidget* label_export_informations; - - GtkWidget* list_devices; - GtkWidget* vbox_devices; - GtkWidget* button_add_device; - - /* generated_pin view */ - GtkWidget* generated_pin; - GtkWidget* label_generated_pin; - GtkWidget* button_generated_pin_ok; - - /* add_device view */ - GtkWidget* add_device_box; - GtkWidget* button_export_on_the_ring; - GtkWidget* button_add_device_cancel; - GtkWidget* entry_password; - - /* generating account spinner */ - GtkWidget* vbox_generating_pin_spinner; - - /* export on ring error */ - GtkWidget* export_on_ring_error; - GtkWidget* label_export_on_ring_error; - GtkWidget* button_export_on_ring_error_ok; - - QMetaObject::Connection account_updated; - QMetaObject::Connection new_device_added_connection; - QMetaObject::Connection device_updated_connection; - QMetaObject::Connection device_removed_connection; - QMetaObject::Connection export_on_ring_ended; -}; - -G_DEFINE_TYPE_WITH_PRIVATE(AccountGeneralTab, account_general_tab, GTK_TYPE_BOX); - -#define ACCOUNT_GENERAL_TAB_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ACCOUNT_GENERAL_TAB_TYPE, AccountGeneralTabPrivate)) - -static void -account_general_tab_dispose(GObject *object) -{ - AccountGeneralTab *view = ACCOUNT_GENERAL_TAB(object); - AccountGeneralTabPrivate *priv = ACCOUNT_GENERAL_TAB_GET_PRIVATE(view); - - QObject::disconnect(priv->account_updated); - QObject::disconnect(priv->new_device_added_connection); - QObject::disconnect(priv->device_updated_connection); - QObject::disconnect(priv->device_removed_connection); - QObject::disconnect(priv->export_on_ring_ended); - - G_OBJECT_CLASS(account_general_tab_parent_class)->dispose(object); -} - -static void -account_general_tab_init(AccountGeneralTab *view) -{ - gtk_widget_init_template(GTK_WIDGET(view)); -} - -static void -account_general_tab_class_init(AccountGeneralTabClass *klass) -{ - G_OBJECT_CLASS(klass)->dispose = account_general_tab_dispose; - - gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS (klass), - "/net/jami/JamiGnome/accountgeneraltab.ui"); - - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountGeneralTab, stack_account_general); - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountGeneralTab, account_general); - - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountGeneralTab, grid_account); - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountGeneralTab, frame_parameters); - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountGeneralTab, grid_parameters); - - /* change password view */ - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountGeneralTab, entry_current_password); - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountGeneralTab, entry_new_password); - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountGeneralTab, entry_confirm_password); - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountGeneralTab, button_validate_password); - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountGeneralTab, label_error_change_passowrd); - - /* export account */ - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountGeneralTab, button_choose_file); - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountGeneralTab, label_export_informations); - - // Devices - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountGeneralTab, list_devices); - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountGeneralTab, vbox_devices); - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountGeneralTab, button_add_device); - - // add_device view - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountGeneralTab, add_device_box); - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountGeneralTab, button_export_on_the_ring); - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountGeneralTab, button_add_device_cancel); - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountGeneralTab, entry_password); - - // generating pin spinner - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountGeneralTab, vbox_generating_pin_spinner); - - // export on ring error - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountGeneralTab, export_on_ring_error); - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountGeneralTab, label_export_on_ring_error); - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountGeneralTab, button_export_on_ring_error_ok); - - // generated_pin view - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountGeneralTab, generated_pin); - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountGeneralTab, label_generated_pin); - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountGeneralTab, button_generated_pin_ok); -} - -static void -show_account_general_view(AccountGeneralTab *view) -{ - g_return_if_fail(IS_ACCOUNT_GENERAL_TAB(view)); - AccountGeneralTabPrivate *priv = ACCOUNT_GENERAL_TAB_GET_PRIVATE(view); - gtk_stack_set_visible_child(GTK_STACK(priv->stack_account_general), priv->account_general); -} - -static void -show_add_device_view(AccountGeneralTab *view) -{ - g_return_if_fail(IS_ACCOUNT_GENERAL_TAB(view)); - AccountGeneralTabPrivate *priv = ACCOUNT_GENERAL_TAB_GET_PRIVATE(view); - gtk_stack_set_visible_child(GTK_STACK(priv->stack_account_general), priv->add_device_box); -} - -static void -show_generated_pin_view(AccountGeneralTab *view) -{ - g_return_if_fail(IS_ACCOUNT_GENERAL_TAB(view)); - AccountGeneralTabPrivate *priv = ACCOUNT_GENERAL_TAB_GET_PRIVATE(view); - gtk_widget_show(priv->generated_pin); - gtk_stack_set_visible_child(GTK_STACK(priv->stack_account_general), priv->generated_pin); -} - -static void -show_generating_pin_spinner(AccountGeneralTab *view) -{ - g_return_if_fail(IS_ACCOUNT_GENERAL_TAB(view)); - AccountGeneralTabPrivate *priv = ACCOUNT_GENERAL_TAB_GET_PRIVATE(view); - gtk_stack_set_visible_child(GTK_STACK(priv->stack_account_general), priv->vbox_generating_pin_spinner); -} - -static void -show_export_on_ring_error(AccountGeneralTab *view) -{ - g_return_if_fail(IS_ACCOUNT_GENERAL_TAB(view)); - AccountGeneralTabPrivate *priv = ACCOUNT_GENERAL_TAB_GET_PRIVATE(view); - gtk_stack_set_visible_child(GTK_STACK(priv->stack_account_general), priv->export_on_ring_error); -} - -static void -export_on_the_ring_clicked(G_GNUC_UNUSED GtkButton *button, AccountGeneralTab *view) -{ - g_return_if_fail(IS_ACCOUNT_GENERAL_TAB(view)); - AccountGeneralTabPrivate *priv = ACCOUNT_GENERAL_TAB_GET_PRIVATE(view); - - auto password = QString(gtk_entry_get_text(GTK_ENTRY(priv->entry_password))); - gtk_entry_set_text(GTK_ENTRY(priv->entry_password), ""); - - priv->export_on_ring_ended = QObject::connect( - priv->account, - &Account::exportOnRingEnded, - [=] (Account::ExportOnRingStatus status, QString pin) { - QObject::disconnect(priv->export_on_ring_ended); - switch (status) - { - case Account::ExportOnRingStatus::SUCCESS: - { - gtk_label_set_text(GTK_LABEL(priv->label_generated_pin), pin.toStdString().c_str()); - show_generated_pin_view(view); - break; - } - case Account::ExportOnRingStatus::WRONG_PASSWORD: - { - gtk_label_set_text(GTK_LABEL(priv->label_export_on_ring_error), _("Bad password")); - show_export_on_ring_error(view); - break; - } - case Account::ExportOnRingStatus::NETWORK_ERROR: - { - gtk_label_set_text(GTK_LABEL(priv->label_export_on_ring_error), _("Network error, try again")); - show_export_on_ring_error(view); - break; - } - } - } - ); - - show_generating_pin_spinner(view); - if (!priv->account->exportOnRing(password)) - { - QObject::disconnect(priv->export_on_ring_ended); - gtk_label_set_text(GTK_LABEL(priv->label_export_on_ring_error), _("Could not initiate export to the Jami, try again")); - g_debug("Could not initiate exportOnRing operation"); - show_export_on_ring_error(view); - } -} - -static void -account_alias_changed(GtkEditable *entry, AccountGeneralTab *view) -{ - g_return_if_fail(IS_ACCOUNT_GENERAL_TAB(view)); - AccountGeneralTabPrivate *priv = ACCOUNT_GENERAL_TAB_GET_PRIVATE(view); - priv->account->setAlias(QString(gtk_editable_get_chars(entry, 0, -1))); - if (priv->account->protocol() == Account::Protocol::RING) - priv->account->setDisplayName(gtk_entry_get_text(GTK_ENTRY(entry))); -} - -static void -account_hostname_changed(GtkEditable *entry, AccountGeneralTab *view) -{ - g_return_if_fail(IS_ACCOUNT_GENERAL_TAB(view)); - AccountGeneralTabPrivate *priv = ACCOUNT_GENERAL_TAB_GET_PRIVATE(view); - priv->account->setHostname(QString(gtk_editable_get_chars(entry, 0, -1))); -} - -static void -account_username_changed(GtkEditable *entry, AccountGeneralTab *view) -{ - g_return_if_fail(IS_ACCOUNT_GENERAL_TAB(view)); - AccountGeneralTabPrivate *priv = ACCOUNT_GENERAL_TAB_GET_PRIVATE(view); - priv->account->setUsername(QString(gtk_editable_get_chars(entry, 0, -1))); -} - -static void -account_password_changed(GtkEditable *entry, AccountGeneralTab *view) -{ - g_return_if_fail(IS_ACCOUNT_GENERAL_TAB(view)); - AccountGeneralTabPrivate *priv = ACCOUNT_GENERAL_TAB_GET_PRIVATE(view); - priv->account->setPassword(QString(gtk_editable_get_chars(entry, 0, -1))); -} - -static void -show_password(GtkToggleButton *checkbutton, GtkEntry *entry) -{ - gtk_entry_set_visibility(GTK_ENTRY(entry), gtk_toggle_button_get_active(checkbutton)); -} - -static void -account_proxy_changed(GtkEditable *entry, AccountGeneralTab *view) -{ - g_return_if_fail(IS_ACCOUNT_GENERAL_TAB(view)); - AccountGeneralTabPrivate *priv = ACCOUNT_GENERAL_TAB_GET_PRIVATE(view); - priv->account->setProxy(QString(gtk_editable_get_chars(entry, 0, -1))); -} - -static void -account_mailbox_changed(GtkEditable *entry, AccountGeneralTab *view) -{ - g_return_if_fail(IS_ACCOUNT_GENERAL_TAB(view)); - AccountGeneralTabPrivate *priv = ACCOUNT_GENERAL_TAB_GET_PRIVATE(view); - priv->account->setMailbox(QString(gtk_editable_get_chars(entry, 0, -1))); -} - -static void -reset_change_password(AccountGeneralTab *view) -{ - g_return_if_fail(IS_ACCOUNT_GENERAL_TAB(view)); - AccountGeneralTabPrivate *priv = ACCOUNT_GENERAL_TAB_GET_PRIVATE(view); - gtk_label_set_text(GTK_LABEL(priv->label_error_change_passowrd), ""); - gtk_button_set_label(GTK_BUTTON(priv->button_validate_password), _("Change password")); -} - -static void -choose_export_file(AccountGeneralTab *view) -{ - g_return_if_fail(IS_ACCOUNT_GENERAL_TAB(view)); - AccountGeneralTabPrivate *priv = ACCOUNT_GENERAL_TAB_GET_PRIVATE(view); - // Sauvegarder path - GtkWidget* dialog; - GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_SAVE; - gint res; - gchar* filename = nullptr; - - dialog = gtk_file_chooser_dialog_new(_("Save File"), - GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(view))), - action, - _("_Cancel"), - GTK_RESPONSE_CANCEL, - _("_Save"), - GTK_RESPONSE_ACCEPT, - nullptr); - - std::string alias = priv->account->alias().toLocal8Bit().constData(); - std::string uri = alias.empty()? "export.gz" : alias + ".gz"; - gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), uri.c_str()); - res = gtk_dialog_run (GTK_DIALOG(dialog)); - - if (res == GTK_RESPONSE_ACCEPT) { - auto chooser = GTK_FILE_CHOOSER(dialog); - filename = gtk_file_chooser_get_filename(chooser); - } - gtk_widget_destroy (dialog); - - if (!filename) return; - - // export account - priv->account->exportToFile(filename); - // Set informations label - std::string label = std::string(_("File exported to destination: ")) + std::string(filename); - gtk_label_set_text(GTK_LABEL(priv->label_export_informations), label.c_str()); -} - -static GList* -get_row_iterator(GtkWidget* row) -{ - auto box = gtk_bin_get_child(GTK_BIN(row)); - return gtk_container_get_children(GTK_CONTAINER(box)); -} - -static GtkWidget* -get_button_from_row(GtkWidget* row) -{ - auto* list_iterator = get_row_iterator(row); - auto current_child = g_list_last(list_iterator); // button - return GTK_WIDGET(current_child->data); -} - -static GtkWidget* -get_name_from_row(GtkWidget* row) -{ - auto* list_iterator = get_row_iterator(row); - auto* current_child = g_list_first(list_iterator); // box infos - auto box_devices_info = gtk_container_get_children(GTK_CONTAINER(current_child->data)); - current_child = g_list_first(box_devices_info); // device.name - return GTK_WIDGET(current_child->data); -} - -static void -replace_name_from_row(GtkWidget* row, const std::string& name, const std::string& id) -{ - // Remove previous informations - auto* list_iterator = get_row_iterator(row); - auto* box_info = g_list_first(list_iterator); // box infos - auto* action_button = g_list_last(list_iterator); - auto box_devices_info = gtk_container_get_children(GTK_CONTAINER(box_info->data)); - auto* device_name = g_list_first(box_devices_info); // device.name - auto isEntryName = G_TYPE_CHECK_INSTANCE_TYPE(device_name->data, gtk_entry_get_type()); - auto* label_id = g_list_next(box_devices_info); // device.name - gtk_container_remove(GTK_CONTAINER(box_info->data), GTK_WIDGET(device_name->data)); - gtk_container_remove(GTK_CONTAINER(box_info->data), GTK_WIDGET(label_id->data)); - - // Rebuild item - if (isEntryName) { - auto* new_label_name = gtk_label_new(name.c_str()); - gtk_container_add(GTK_CONTAINER(box_info->data), new_label_name); - gtk_widget_set_halign(GTK_WIDGET(new_label_name), GTK_ALIGN_START); - auto image = gtk_image_new_from_resource("/net/jami/JamiGnome/edit"); - gtk_button_set_image(GTK_BUTTON(action_button->data), image); - } else { - auto* entry_name = gtk_entry_new(); - gtk_entry_set_text(GTK_ENTRY(entry_name), name.c_str()); - gtk_container_add(GTK_CONTAINER(box_info->data), entry_name); - auto image = gtk_image_new_from_resource("/net/jami/JamiGnome/save"); - gtk_button_set_image(GTK_BUTTON(action_button->data), image); - } - auto* new_label_id = gtk_label_new(""); - std::string markup = "" + id + ""; - gtk_label_set_markup(GTK_LABEL(new_label_id), markup.c_str()); - gtk_container_add(GTK_CONTAINER(box_info->data), new_label_id); - gtk_widget_show_all(GTK_WIDGET(box_info->data)); -} - -static std::string -get_id_from_row(GtkWidget* row) -{ - auto* list_iterator = get_row_iterator(row); - auto* current_child = g_list_first(list_iterator); // box infos - auto box_devices_info = gtk_container_get_children(GTK_CONTAINER(current_child->data)); - current_child = g_list_first(box_devices_info); // device.name - current_child = g_list_next(box_devices_info); // device.id - return gtk_label_get_text(GTK_LABEL(current_child->data)); -} - -static void -save_name(GtkButton* button, AccountGeneralTab *view) -{ - g_return_if_fail(IS_ACCOUNT_GENERAL_TAB(view)); - AccountGeneralTabPrivate *priv = ACCOUNT_GENERAL_TAB_GET_PRIVATE(view); - - auto row = 0; - while (GtkWidget* children = GTK_WIDGET(gtk_list_box_get_row_at_index(GTK_LIST_BOX(priv->list_devices), row))) { - if (GTK_BUTTON(get_button_from_row(children)) == button) { - GtkWidget* nameWidget = get_name_from_row(children); - auto deviceId = get_id_from_row(children); - if (G_TYPE_CHECK_INSTANCE_TYPE(nameWidget, gtk_entry_get_type())) { - std::string newName = gtk_entry_get_text(GTK_ENTRY(nameWidget)); - replace_name_from_row(children, newName, deviceId); - (*priv->accountInfo_)->deviceModel->setCurrentDeviceName(newName); - } else { - std::string newName = gtk_label_get_text(GTK_LABEL(nameWidget)); - replace_name_from_row(children, newName, deviceId); - } - } - ++row; - } -} - -static void -revoke_device(GtkButton* button, AccountGeneralTab *view) -{ - g_return_if_fail(IS_ACCOUNT_GENERAL_TAB(view)); - AccountGeneralTabPrivate *priv = ACCOUNT_GENERAL_TAB_GET_PRIVATE(view); - - auto row = 0; - while (GtkWidget* children = GTK_WIDGET(gtk_list_box_get_row_at_index(GTK_LIST_BOX(priv->list_devices), row))) { - if (GTK_BUTTON(get_button_from_row(children)) == button) { - auto deviceId = get_id_from_row(children); - auto password = ""; - auto* top_window = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(view))); - auto* password_dialog = gtk_message_dialog_new(top_window, - GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL, - _("Warning! This action will revoke the device!\nNote: this action cannot be undone.")); - gtk_window_set_title(GTK_WINDOW(password_dialog), _("Enter password to revoke device")); - gtk_dialog_set_default_response(GTK_DIALOG(password_dialog), GTK_RESPONSE_OK); - - auto* message_area = gtk_message_dialog_get_message_area(GTK_MESSAGE_DIALOG(password_dialog)); - if (priv->account->archiveHasPassword()) { - auto* password_entry = gtk_entry_new(); - gtk_entry_set_visibility(GTK_ENTRY(password_entry), false); - gtk_entry_set_invisible_char(GTK_ENTRY(password_entry), '*'); - gtk_box_pack_start(GTK_BOX(message_area), password_entry, true, true, 0); - gtk_widget_show_all(password_dialog); - - auto res = gtk_dialog_run(GTK_DIALOG(password_dialog)); - if (res == GTK_RESPONSE_OK) { - password = gtk_entry_get_text(GTK_ENTRY(password_entry)); - (*priv->accountInfo_)->deviceModel->revokeDevice(deviceId, password); - } - } else { - auto res = gtk_dialog_run(GTK_DIALOG(password_dialog)); - if (res == GTK_RESPONSE_OK) - (*priv->accountInfo_)->deviceModel->revokeDevice(deviceId, ""); - } - - gtk_widget_destroy(password_dialog); - } - ++row; - } -} - -static void -change_password(AccountGeneralTab *view) -{ - g_return_if_fail(IS_ACCOUNT_GENERAL_TAB(view)); - AccountGeneralTabPrivate *priv = ACCOUNT_GENERAL_TAB_GET_PRIVATE(view); - - std::string current_password = gtk_entry_get_text(GTK_ENTRY(priv->entry_current_password)); - std::string new_password = gtk_entry_get_text(GTK_ENTRY(priv->entry_new_password)); - std::string confirm_password = gtk_entry_get_text(GTK_ENTRY(priv->entry_confirm_password)); - if (new_password != confirm_password) { - gtk_label_set_text(GTK_LABEL(priv->label_error_change_passowrd), _("New password and its confirmation are different")); - return; - } - if (priv->account->changePassword(current_password.c_str(), new_password.c_str())) { - gtk_label_set_text(GTK_LABEL(priv->label_error_change_passowrd), ""); - gtk_entry_set_text(GTK_ENTRY(priv->entry_current_password), ""); - gtk_entry_set_text(GTK_ENTRY(priv->entry_new_password), ""); - gtk_entry_set_text(GTK_ENTRY(priv->entry_confirm_password), ""); - // NOTE: can't use account->archiveHasPassword here, because the account is not updated. - gtk_widget_set_visible(priv->entry_current_password, !new_password.empty()); - gtk_button_set_label(GTK_BUTTON(priv->button_validate_password), _("Password changed!")); - } else { - gtk_button_set_label(GTK_BUTTON(priv->button_validate_password), _("Change password")); - gtk_label_set_text(GTK_LABEL(priv->label_error_change_passowrd), _("Incorrect password")); - } - -} - -static void -add_device(AccountGeneralTab *view, const lrc::api::Device& device) -{ - g_return_if_fail(IS_ACCOUNT_GENERAL_TAB(view)); - AccountGeneralTabPrivate *priv = ACCOUNT_GENERAL_TAB_GET_PRIVATE(view); - - auto* device_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); - - GtkStyleContext* context_box; - context_box = gtk_widget_get_style_context(GTK_WIDGET(device_box)); - gtk_style_context_add_class(context_box, "device-box"); - // Fill with devices informations - auto* device_info_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); - auto* label_name = gtk_label_new(device.name.c_str()); - gtk_container_add(GTK_CONTAINER(device_info_box), label_name); - gtk_widget_set_halign(GTK_WIDGET(label_name), GTK_ALIGN_START); - auto* label_id = gtk_label_new(""); - std::string markup = "" + device.id + ""; - gtk_label_set_markup(GTK_LABEL(label_id), markup.c_str()); - gtk_container_add(GTK_CONTAINER(device_info_box), label_id); - gtk_container_add(GTK_CONTAINER(device_box), device_info_box); - // Add action button - auto image = gtk_image_new_from_resource("/net/jami/JamiGnome/edit"); - if (!device.isCurrent) - image = gtk_image_new_from_resource("/net/jami/JamiGnome/revoke"); - auto* action_device_button = gtk_button_new(); - gtk_widget_set_tooltip_text(action_device_button, device.isCurrent ? _("Save name") : _("Revoke device")); - gtk_button_set_image(GTK_BUTTON(action_device_button), image); - GtkStyleContext* context; - context = gtk_widget_get_style_context(GTK_WIDGET(action_device_button)); - gtk_style_context_add_class(context, "transparent-button"); - std::string label_btn = "action_btn_" + device.id; - gtk_widget_set_name(action_device_button, label_btn.c_str()); - g_signal_connect(action_device_button, "clicked", device.isCurrent ? G_CALLBACK(save_name) : G_CALLBACK(revoke_device), view); - gtk_container_add(GTK_CONTAINER(device_box), action_device_button); - // Insert at the end of the list - gtk_list_box_insert(GTK_LIST_BOX(priv->list_devices), device_box, -1); -} - -static void -show_revokation_error_dialog(AccountGeneralTab *view, const std::string& text) -{ - g_return_if_fail(IS_ACCOUNT_GENERAL_TAB(view)); - auto* top_window = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(view))); - auto* error_dialog = gtk_message_dialog_new(top_window, - GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, - "%s", text.c_str()); - gtk_window_set_title(GTK_WINDOW(error_dialog), _("Error when revoking device")); - gtk_dialog_set_default_response(GTK_DIALOG(error_dialog), GTK_RESPONSE_OK); - - gtk_dialog_run(GTK_DIALOG(error_dialog)); - gtk_widget_destroy(error_dialog); -} - -static void -build_tab_view(AccountGeneralTab *view) -{ - g_return_if_fail(IS_ACCOUNT_GENERAL_TAB(view)); - AccountGeneralTabPrivate *priv = ACCOUNT_GENERAL_TAB_GET_PRIVATE(view); - - // CSS styles - auto provider = gtk_css_provider_new(); - gtk_css_provider_load_from_data(provider, - ".transparent-button { margin-left: 10px; border: 0; background-color: rgba(0,0,0,0); margin-right: 0; padding-right: 0;}\ - .device-box { padding: 12px; }", - -1, nullptr - ); - gtk_style_context_add_provider_for_screen(gdk_display_get_default_screen(gdk_display_get_default()), - GTK_STYLE_PROVIDER(provider), - GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); - - int grid_row = 0; - GtkWidget* label = NULL; - - /* separate pointers for each so that we reference them in the account changed callback */ - GtkWidget* entry_alias = NULL; - GtkWidget* entry_username = NULL; - GtkWidget* entry_hostname = NULL; - GtkWidget* entry_password = NULL; - GtkWidget* entry_proxy = NULL; - GtkWidget* entry_voicemail = NULL; - - /* build account grid */ - - /* account alias */ - label = gtk_label_new(_("Alias")); - gtk_widget_set_halign(label, GTK_ALIGN_START); - gtk_grid_attach(GTK_GRID(priv->grid_account), label, 0, grid_row, 1, 1); - entry_alias = gtk_entry_new(); - gtk_entry_set_text(GTK_ENTRY(entry_alias), priv->account->alias().toLocal8Bit().constData()); - gtk_widget_set_halign(entry_alias, GTK_ALIGN_START); - g_signal_connect(entry_alias, "changed", G_CALLBACK(account_alias_changed), view); - gtk_grid_attach(GTK_GRID(priv->grid_account), entry_alias, 1, grid_row, 1, 1); - ++grid_row; - - /* account type */ - label = gtk_label_new(_("Type")); - gtk_widget_set_halign(label, GTK_ALIGN_START); - gtk_grid_attach(GTK_GRID(priv->grid_account), label, 0, grid_row, 1, 1); - - label = gtk_label_new(""); - gtk_widget_set_halign(label, GTK_ALIGN_START); - switch (priv->account->protocol()) { - case Account::Protocol::SIP: - gtk_label_set_text(GTK_LABEL(label), "SIP"); - break; - case Account::Protocol::RING: - gtk_label_set_text(GTK_LABEL(label), "RING"); - break; - case Account::Protocol::COUNT__: - break; - } - - gtk_grid_attach(GTK_GRID(priv->grid_account), label, 1, grid_row, 1, 1); - ++grid_row; - - if (priv->account->protocol() == Account::Protocol::RING) { - label = gtk_label_new("RingID"); - gtk_widget_set_halign(label, GTK_ALIGN_START); - gtk_grid_attach(GTK_GRID(priv->grid_account), label, 0, grid_row, 1, 1); - entry_username = gtk_entry_new(); - gtk_widget_set_halign(entry_username, GTK_ALIGN_START); - gtk_entry_set_placeholder_text(GTK_ENTRY(entry_username), _("auto-generating…")); - gtk_entry_set_text(GTK_ENTRY(entry_username), priv->account->username().toLocal8Bit().constData()); - g_object_set(G_OBJECT(entry_username), "editable", FALSE, NULL); - g_object_set(G_OBJECT(entry_username), "max-width-chars", 50, NULL); - PangoAttrList *attrs = pango_attr_list_new(); - PangoAttribute *font_desc = pango_attr_font_desc_new(pango_font_description_from_string("monospace")); - pango_attr_list_insert(attrs, font_desc); - gtk_entry_set_attributes(GTK_ENTRY(entry_username), attrs); - pango_attr_list_unref(attrs); - gtk_entry_set_alignment(GTK_ENTRY(entry_username), 0.5); - gtk_grid_attach(GTK_GRID(priv->grid_account), entry_username, 1, grid_row, 1, 1); - ++grid_row; - - label = gtk_label_new(_("Username")); - gtk_widget_set_halign(label, GTK_ALIGN_START); - gtk_grid_attach(GTK_GRID(priv->grid_account), label, 0, grid_row, 1, 1); - auto username_registration_box = username_registration_box_new(*priv->accountInfo_, TRUE); - gtk_grid_attach(GTK_GRID(priv->grid_account), username_registration_box, 1, grid_row, 2, 2); - gtk_widget_show(username_registration_box); - - grid_row+=2; - } - - - /* build parameters grid */ - grid_row = 0; - if (priv->account->protocol() != Account::Protocol::RING) { - /* SIP account */ - - /* host name */ - label = gtk_label_new(_("Hostname")); - gtk_widget_set_halign(label, GTK_ALIGN_START); - gtk_grid_attach(GTK_GRID(priv->grid_parameters), label, 0, grid_row, 1, 1); - entry_hostname = gtk_entry_new(); - gtk_entry_set_text(GTK_ENTRY(entry_hostname), priv->account->hostname().toLocal8Bit().constData()); - g_signal_connect(entry_hostname, "changed", G_CALLBACK(account_hostname_changed), view); - gtk_grid_attach(GTK_GRID(priv->grid_parameters), entry_hostname, 1, grid_row, 1, 1); - ++grid_row; - - /* user name */ - label = gtk_label_new(_("Username")); - gtk_widget_set_halign(label, GTK_ALIGN_START); - gtk_grid_attach(GTK_GRID(priv->grid_parameters), label, 0, grid_row, 1, 1); - entry_username = gtk_entry_new(); - gtk_entry_set_text(GTK_ENTRY(entry_username), priv->account->username().toLocal8Bit().constData()); - g_signal_connect(entry_username, "changed", G_CALLBACK(account_username_changed), view); - gtk_grid_attach(GTK_GRID(priv->grid_parameters), entry_username, 1, grid_row, 1, 1); - ++grid_row; - - /* password */ - label = gtk_label_new(_("Password")); - gtk_widget_set_halign(label, GTK_ALIGN_START); - gtk_grid_attach(GTK_GRID(priv->grid_parameters), label, 0, grid_row, 1, 1); - entry_password = gtk_entry_new(); - gtk_entry_set_input_purpose(GTK_ENTRY(entry_password), GTK_INPUT_PURPOSE_PASSWORD); - gtk_entry_set_icon_from_icon_name(GTK_ENTRY(entry_password), GTK_ENTRY_ICON_PRIMARY, "dialog-password"); - gtk_entry_set_visibility(GTK_ENTRY(entry_password), FALSE); - gtk_entry_set_text(GTK_ENTRY(entry_password), priv->account->password().toLocal8Bit().constData()); - g_signal_connect(entry_password, "changed", G_CALLBACK(account_password_changed), view); - gtk_grid_attach(GTK_GRID(priv->grid_parameters), entry_password, 1, grid_row, 1, 1); - ++grid_row; - - /* show password */ - GtkWidget* checkbutton = gtk_check_button_new_with_label(_("Show password")); - gtk_grid_attach(GTK_GRID(priv->grid_parameters), checkbutton, 1, grid_row, 1, 1); - g_signal_connect(checkbutton, "toggled", G_CALLBACK(show_password), entry_password); - ++grid_row; - - /* proxy */ - label = gtk_label_new(_("Proxy")); - gtk_widget_set_halign(label, GTK_ALIGN_START); - gtk_grid_attach(GTK_GRID(priv->grid_parameters), label, 0, grid_row, 1, 1); - entry_proxy = gtk_entry_new(); - gtk_entry_set_text(GTK_ENTRY(entry_proxy), priv->account->proxy().toLocal8Bit().constData()); - g_signal_connect(entry_proxy, "changed", G_CALLBACK(account_proxy_changed), view); - gtk_grid_attach(GTK_GRID(priv->grid_parameters), entry_proxy, 1, grid_row, 1, 1); - ++grid_row; - - /* voicemail number */ - label = gtk_label_new(_("Voicemail number")); - gtk_widget_set_halign(label, GTK_ALIGN_START); - gtk_grid_attach(GTK_GRID(priv->grid_parameters), label, 0, grid_row, 1, 1); - entry_voicemail = gtk_entry_new(); - gtk_entry_set_text(GTK_ENTRY(entry_voicemail), priv->account->mailbox().toLocal8Bit().constData()); - g_signal_connect(entry_voicemail, "changed", G_CALLBACK(account_mailbox_changed), view); - gtk_grid_attach(GTK_GRID(priv->grid_parameters), entry_voicemail, 1, grid_row, 1, 1); - ++grid_row; - - } else { - gtk_widget_hide(priv->frame_parameters); - } - gtk_widget_show_all(priv->grid_parameters); - - /* update account parameters if model is updated */ - priv->account_updated = QObject::connect( - priv->account, - &Account::changed, - [=] () { - gtk_entry_set_text(GTK_ENTRY(entry_alias), priv->account->alias().toLocal8Bit().constData()); - gtk_entry_set_text(GTK_ENTRY(entry_username), priv->account->username().toLocal8Bit().constData()); - - if (priv->account->protocol() != Account::Protocol::RING) { - gtk_entry_set_text(GTK_ENTRY(entry_hostname), priv->account->hostname().toLocal8Bit().constData()); - gtk_entry_set_text(GTK_ENTRY(entry_password), priv->account->password().toLocal8Bit().constData()); - gtk_entry_set_text(GTK_ENTRY(entry_proxy), priv->account->proxy().toLocal8Bit().constData()); - gtk_entry_set_text(GTK_ENTRY(entry_voicemail), priv->account->mailbox().toLocal8Bit().constData()); - } - } - ); - - priv->new_device_added_connection = QObject::connect( - &*(*priv->accountInfo_)->deviceModel, - &lrc::api::NewDeviceModel::deviceAdded, - [view] (const std::string& id) { - AccountGeneralTabPrivate *priv = ACCOUNT_GENERAL_TAB_GET_PRIVATE(view); - // Retrieve added device - auto device = (*priv->accountInfo_)->deviceModel->getDevice(id); - if (device.id.empty()) { - g_debug("Can't add device with id: %s", device.id.c_str()); - return; - } - // if exists, add to list - add_device(view, device); - gtk_widget_show_all(priv->list_devices); - } - ); - - priv->device_removed_connection = QObject::connect( - &*(*priv->accountInfo_)->deviceModel, - &lrc::api::NewDeviceModel::deviceRevoked, - [view] (const std::string& id, const lrc::api::NewDeviceModel::Status status) { - AccountGeneralTabPrivate *priv = ACCOUNT_GENERAL_TAB_GET_PRIVATE(view); - auto row = 0; - while (GtkWidget* children = GTK_WIDGET(gtk_list_box_get_row_at_index(GTK_LIST_BOX(priv->list_devices), row))) { - auto deviceId = get_id_from_row(children); - if (deviceId == id) { - switch (status) - { - case lrc::api::NewDeviceModel::Status::SUCCESS: - // remove device's line - gtk_container_remove(GTK_CONTAINER(priv->list_devices), children); - return; - case lrc::api::NewDeviceModel::Status::WRONG_PASSWORD: - show_revokation_error_dialog(view, _("Error: wrong password!")); - break; - case lrc::api::NewDeviceModel::Status::UNKNOWN_DEVICE: - show_revokation_error_dialog(view, _("Error: unknown device!")); - break; - default: - g_debug("unknown status for revoked device. BUG?"); - return; - } - } - ++row; - } - } - ); - - priv->device_updated_connection = QObject::connect( - &*(*priv->accountInfo_)->deviceModel, - &lrc::api::NewDeviceModel::deviceUpdated, - [view] (const std::string& id) { - AccountGeneralTabPrivate *priv = ACCOUNT_GENERAL_TAB_GET_PRIVATE(view); - // Retrieve added device - auto device = (*priv->accountInfo_)->deviceModel->getDevice(id); - if (device.id.empty()) { - g_debug("Can't add device with id: %s", device.id.c_str()); - return; - } - // if exists, update - auto row = 0; - while (GtkWidget* children = GTK_WIDGET(gtk_list_box_get_row_at_index(GTK_LIST_BOX(priv->list_devices), row))) { - auto device_name = get_name_from_row(children); - auto deviceId = get_id_from_row(children); - if (deviceId == id) { - if (device.isCurrent) { - if (G_TYPE_CHECK_INSTANCE_TYPE(device_name, gtk_entry_get_type())) { - gtk_entry_set_text(GTK_ENTRY(device_name), device.name.c_str()); - } else { - gtk_label_set_text(GTK_LABEL(device_name), device.name.c_str()); - } - } else { - gtk_label_set_text(GTK_LABEL(device_name), device.name.c_str()); - } - } - ++row; - } - g_debug("deviceUpdated signal received, but device not found"); - } - ); - - - g_signal_connect_swapped(priv->button_validate_password, "clicked", G_CALLBACK(change_password), view); - g_signal_connect_swapped(priv->entry_current_password, "changed", G_CALLBACK(reset_change_password), view); - g_signal_connect_swapped(priv->entry_new_password, "changed", G_CALLBACK(reset_change_password), view); - g_signal_connect_swapped(priv->entry_confirm_password, "changed", G_CALLBACK(reset_change_password), view); - g_signal_connect_swapped(priv->button_choose_file, "clicked", G_CALLBACK(choose_export_file), view); - g_signal_connect_swapped(priv->button_add_device, "clicked", G_CALLBACK(show_add_device_view), view); - g_signal_connect_swapped(priv->button_add_device_cancel, "clicked", G_CALLBACK(show_account_general_view), view); - g_signal_connect(priv->button_export_on_the_ring, "clicked", G_CALLBACK(export_on_the_ring_clicked), view); - g_signal_connect_swapped(priv->button_generated_pin_ok, "clicked", G_CALLBACK(show_account_general_view), view); - g_signal_connect_swapped(priv->button_export_on_ring_error_ok, "clicked", G_CALLBACK(show_add_device_view), view); - gtk_widget_set_visible(priv->entry_current_password, priv->account->archiveHasPassword()); - - if ((*priv->accountInfo_)->profileInfo.type == lrc::api::profile::Type::RING) { - auto devices = (*priv->accountInfo_)->deviceModel->getAllDevices(); - for (const auto& device : devices) - add_device(view, device); - gtk_widget_set_halign(GTK_WIDGET(priv->list_devices), GTK_ALIGN_CENTER); - gtk_widget_show_all(priv->list_devices); - } else { - gtk_widget_hide(priv->vbox_devices); - } - -} - -GtkWidget* -account_general_tab_new(Account *account, AccountInfoPointer const & accountInfo) -{ - g_return_val_if_fail(account != NULL, NULL); - - gpointer view = g_object_new(ACCOUNT_GENERAL_TAB_TYPE, NULL); - - AccountGeneralTabPrivate *priv = ACCOUNT_GENERAL_TAB_GET_PRIVATE(view); - priv->account = account; - priv->accountInfo_ = &accountInfo; - - build_tab_view(ACCOUNT_GENERAL_TAB(view)); - - return (GtkWidget* )view; -} diff -Nru ring-20190110.1.e572469~ds1/client-gnome/src/generalsettingsview.cpp ring-20190215.1.f152c98~ds1/client-gnome/src/generalsettingsview.cpp --- ring-20190110.1.e572469~ds1/client-gnome/src/generalsettingsview.cpp 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/src/generalsettingsview.cpp 2019-02-15 23:57:49.000000000 +0000 @@ -50,16 +50,14 @@ GSettings *settings; /* Rint settings */ - GtkWidget *checkbutton_autostart; - GtkWidget *checkbutton_showstatusicon; - GtkWidget *checkbutton_bringtofront; - GtkWidget *checkbutton_callnotifications; - GtkWidget *checkbutton_pendingnotifications; - GtkWidget *checkbutton_chatnotifications; - GtkWidget *checkbutton_chatdisplaylinks; - GtkWidget *checkbutton_searchentryplacescall; - GtkWidget *radiobutton_chatright; - GtkWidget *radiobutton_chatbottom; + GtkWidget *at_startup_button; + GtkWidget *systray_button; + GtkWidget *incoming_open_button; + GtkWidget *call_notifications_button; + GtkWidget *request_notifications_button; + GtkWidget *chat_notifications_button; + GtkWidget *media_chatview_button; + GtkWidget *chatview_pos_button; GtkWidget *button_choose_downloads_directory; /* history settings */ @@ -203,37 +201,35 @@ priv->settings = g_settings_new_full(get_ring_schema(), NULL, NULL); + GtkStyleContext* context; + context = gtk_widget_get_style_context(GTK_WIDGET(priv->button_clear_history)); + gtk_style_context_add_class(context, "button_red"); + /* bind client option to gsettings */ g_settings_bind(priv->settings, "start-on-login", - priv->checkbutton_autostart, "active", + priv->at_startup_button, "active", G_SETTINGS_BIND_DEFAULT); g_settings_bind(priv->settings, "show-status-icon", - priv->checkbutton_showstatusicon, "active", + priv->systray_button, "active", G_SETTINGS_BIND_DEFAULT); g_settings_bind(priv->settings, "bring-window-to-front", - priv->checkbutton_bringtofront, "active", + priv->incoming_open_button, "active", G_SETTINGS_BIND_DEFAULT); g_settings_bind(priv->settings, "enable-call-notifications", - priv->checkbutton_callnotifications, "active", + priv->call_notifications_button, "active", G_SETTINGS_BIND_DEFAULT); g_settings_bind(priv->settings, "enable-display-links", - priv->checkbutton_chatdisplaylinks, "active", + priv->media_chatview_button, "active", G_SETTINGS_BIND_DEFAULT); g_settings_bind(priv->settings, "enable-pending-notifications", - priv->checkbutton_pendingnotifications, "active", + priv->request_notifications_button, "active", G_SETTINGS_BIND_DEFAULT); g_settings_bind(priv->settings, "enable-chat-notifications", - priv->checkbutton_chatnotifications, "active", - G_SETTINGS_BIND_DEFAULT); - g_settings_bind(priv->settings, "search-entry-places-call", - priv->checkbutton_searchentryplacescall, "active", + priv->chat_notifications_button, "active", G_SETTINGS_BIND_DEFAULT); g_settings_bind(priv->settings, "chat-pane-horizontal", - priv->radiobutton_chatright, "active", + priv->chatview_pos_button, "active", G_SETTINGS_BIND_DEFAULT); - g_settings_bind(priv->settings, "chat-pane-horizontal", - priv->radiobutton_chatbottom, "active", - (GSettingsBindFlags) (G_SETTINGS_BIND_DEFAULT | G_SETTINGS_BIND_INVERT_BOOLEAN)); g_settings_bind(priv->settings, "history-limit", priv->adjustment_history_duration, "value", G_SETTINGS_BIND_DEFAULT); @@ -312,16 +308,14 @@ gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS (klass), "/net/jami/JamiGnome/generalsettingsview.ui"); - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, checkbutton_autostart); - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, checkbutton_showstatusicon); - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, checkbutton_bringtofront); - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, checkbutton_callnotifications); - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, checkbutton_chatdisplaylinks); - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, checkbutton_pendingnotifications); - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, checkbutton_chatnotifications); - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, checkbutton_searchentryplacescall); - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, radiobutton_chatright); - gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, radiobutton_chatbottom); + gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, at_startup_button); + gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, systray_button); + gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, incoming_open_button); + gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, call_notifications_button); + gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, media_chatview_button); + gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, request_notifications_button); + gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, chat_notifications_button); + gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, chatview_pos_button); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, adjustment_history_duration); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, button_clear_history); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, button_choose_downloads_directory); @@ -373,5 +367,13 @@ GeneralSettingsViewPrivate *priv = GENERAL_SETTINGS_VIEW_GET_PRIVATE(GENERAL_SETTINGS_VIEW (view)); g_signal_connect_swapped(priv->button_choose_downloads_directory, "clicked", G_CALLBACK(choose_downloads_directory), view); + // CSS styles + auto provider = gtk_css_provider_new(); + std::string css = ".button_red { color: white; background: #dc3a37; border: 0; }"; + css += ".button_red:hover { background: #dc2719; }"; + gtk_css_provider_load_from_data(provider, css.c_str(), -1, nullptr); + gtk_style_context_add_provider_for_screen(gdk_display_get_default_screen(gdk_display_get_default()), + GTK_STYLE_PROVIDER(provider), + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); return (GtkWidget *)view; } diff -Nru ring-20190110.1.e572469~ds1/client-gnome/src/newaccountsettingsview.cpp ring-20190215.1.f152c98~ds1/client-gnome/src/newaccountsettingsview.cpp --- ring-20190110.1.e572469~ds1/client-gnome/src/newaccountsettingsview.cpp 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/src/newaccountsettingsview.cpp 2019-02-15 23:57:49.000000000 +0000 @@ -185,6 +185,7 @@ GtkWidget* add_device_box; GtkWidget* button_export_on_the_ring; GtkWidget* button_add_device_cancel; + GtkWidget* entry_password_export_label; GtkWidget* entry_password_export; /* generating account spinner */ @@ -357,6 +358,7 @@ gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS(klass), NewAccountSettingsView, add_device_box); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS(klass), NewAccountSettingsView, button_export_on_the_ring); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS(klass), NewAccountSettingsView, button_add_device_cancel); + gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS(klass), NewAccountSettingsView, entry_password_export_label); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS(klass), NewAccountSettingsView, entry_password_export); // generating pin spinner @@ -944,8 +946,35 @@ if (!filename) return; + std::string password = {}; + if (priv->currentProp_->archiveHasPassword) { + auto* top_window = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(view))); + auto* password_dialog = gtk_message_dialog_new(top_window, + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL, + _("You need to enter your password to export the full archive.")); + gtk_window_set_title(GTK_WINDOW(password_dialog), _("Enter password to export archive")); + gtk_dialog_set_default_response(GTK_DIALOG(password_dialog), GTK_RESPONSE_OK); + + auto* message_area = gtk_message_dialog_get_message_area(GTK_MESSAGE_DIALOG(password_dialog)); + auto* password_entry = gtk_entry_new(); + gtk_entry_set_visibility(GTK_ENTRY(password_entry), false); + gtk_entry_set_invisible_char(GTK_ENTRY(password_entry), '*'); + gtk_box_pack_start(GTK_BOX(message_area), password_entry, true, true, 0); + gtk_widget_show_all(password_dialog); + + auto res = gtk_dialog_run(GTK_DIALOG(password_dialog)); + if (res == GTK_RESPONSE_OK) { + password = gtk_entry_get_text(GTK_ENTRY(password_entry)); + } else { + gtk_widget_destroy(password_dialog); + return; + } + + gtk_widget_destroy(password_dialog); + } + // export account - auto success = (*priv->accountInfo_)->accountModel->exportToFile((*priv->accountInfo_)->id, filename); + auto success = (*priv->accountInfo_)->accountModel->exportToFile((*priv->accountInfo_)->id, filename, password); std::string label = success? _("Account exported!") : _("Export account failure."); gtk_button_set_label(GTK_BUTTON(priv->button_export_account), label.c_str()); g_free(filename); @@ -1670,6 +1699,11 @@ gtk_widget_hide(GTK_WIDGET(priv->general_settings_box)); gtk_widget_show(GTK_WIDGET(priv->add_device_box)); gtk_stack_set_visible_child(GTK_STACK(priv->stack_account), priv->add_device_box); + if (!priv->currentProp_->archiveHasPassword) { + gtk_widget_hide(priv->entry_password_export); + gtk_widget_hide(priv->entry_password_export_label); + } + } static void diff -Nru ring-20190110.1.e572469~ds1/client-gnome/ui/generalsettingsview.ui ring-20190215.1.f152c98~ds1/client-gnome/ui/generalsettingsview.ui --- ring-20190110.1.e572469~ds1/client-gnome/ui/generalsettingsview.ui 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/ui/generalsettingsview.ui 2019-02-15 23:57:49.000000000 +0000 @@ -9,7 +9,7 @@ True - /net/jami/JamiGnome/clear_history + user-trash-symbolic 0 @@ -23,236 +23,554 @@ True - 10 + 24 10 vertical center center - + - + True vertical - 12 + fill + 8 + - + True + False + System + start + + + + + + + + True + False 0 - none - - - - True - Jami Settings - - - - - - - - - + out + + True - vertical - 10 - 10 + True + fill + none - - Start Jami on login + + True - 0 - True + True + fill + + + True + fill + horizontal + 12 + 12 + 12 + 12 + + + True + False + Start application on login + + + + + True + True + + + end + + + + + - - Show Jami icon in the notification area (systray). + + True - 0 - True + True + fill + + + True + fill + horizontal + 12 + 12 + 12 + 12 + + + True + False + Show Jami icon (systray) in the systray area + + + + + True + True + + + end + + + + + - - Bring Jami to the foreground on incoming calls. + + True - 0 - True + True + fill + + + True + fill + horizontal + 12 + 12 + 12 + 12 + + + True + False + Bring Jami to the foreground on incoming calls + + + + + True + True + + + end + + + + + + + + + + + + + + + + True + vertical + fill + 8 + + + + True + False + Notifications + start + + + + + + + + True + False + 0 + out + + + True + True + fill + none + - - Enable notifications for incoming calls. + + True - 0 - True + True + fill + + + True + fill + horizontal + 12 + 12 + 12 + 12 + + + True + False + Enable notifications for incoming calls + + + + + True + True + + + end + + + + + - - Enable notifications for pending requests. + + True - 0 - True + True + fill + + + True + fill + horizontal + 12 + 12 + 12 + 12 + + + True + False + Enable notifications for pending requests + + + + + True + True + + + end + + + + + - - Enable notifications for new chat messages. + + True - 0 - True + True + fill + + + True + fill + horizontal + 12 + 12 + 12 + 12 + + + True + False + Enable notifications for new chat messages + + + + + True + True + + + end + + + + + + + + + + + + + + + + True + vertical + fill + 8 + + + + True + False + Chatview + start + + + + + + + + True + False + 0 + out + + + True + True + fill + none + - - Show images and videos in chat window. + + True - 0 - True + True + fill + + + True + fill + horizontal + 12 + 12 + 12 + 12 + + + True + False + Display images and videos into the chatview + + + + + True + True + + + end + + + + + - - Entering a number in the search entry will place a new call. + + True - 0 - True + True + fill + + + True + fill + horizontal + 12 + 12 + 12 + 12 + 12 + + + True + False + Show chatview on the right (on the bottom if off) + + + + + True + True + + + end + + + + + - + + True - horizontal - 10 + True + fill + + + True + fill + horizontal + 12 + 12 + 12 + 12 + 12 + + + True + False + Download folder + + + + + True + False + image-folder + + + end + + + + + + + + + + + + + + + + + + True + vertical + fill + 8 + + + + True + False + History + start + + + + + + + + True + False + 0 + out + + + True + True + fill + none + + + + + True + True + fill - - Download folder: - True - False - start + + True + fill + horizontal + 12 + 12 + 12 + 12 + + + True + False + Keep history for (days, 0 = unlimited) + + + + + True + 0 + adjustment_history_duration + + + end + + + + + + + + True + fill + horizontal + 12 + 12 + 12 + 12 - + + image_clear_history + Clear all history True - False - image-folder + True + start - False - True - 2 + end - - - True - vertical - 20 - - - Show chat on the right. - True - - - - - Show chat on the bottom. - True - radiobutton_chatright - - - - - - - - - True - 0 - none - - - - True - History Settings - - - - - - - - - - True - 10 - 10 - 10 - 10 - - - True - Keep history for (days): - - - 0 - 0 - - - - - True - 0 - adjustment_history_duration - - - 1 - 0 - - - - - True - (set to 0 for unlimited history) - - - 1 - 1 - - - - - image_clear_history - Clear all history - True - True - start - - - 0 - 2 - 2 - - - - - - - - - - + + True diff -Nru ring-20190110.1.e572469~ds1/client-gnome/ui/newaccountsettingsview.ui ring-20190215.1.f152c98~ds1/client-gnome/ui/newaccountsettingsview.ui --- ring-20190110.1.e572469~ds1/client-gnome/ui/newaccountsettingsview.ui 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/ui/newaccountsettingsview.ui 2019-02-15 23:57:49.000000000 +0000 @@ -150,7 +150,7 @@ - + True Password (required): diff -Nru ring-20190110.1.e572469~ds1/client-gnome/version.txt ring-20190215.1.f152c98~ds1/client-gnome/version.txt --- ring-20190110.1.e572469~ds1/client-gnome/version.txt 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/version.txt 2019-02-15 23:58:06.000000000 +0000 @@ -1 +1 @@ -32e606106920a21da416ef365fb654b5df721098 +dd9a8fb6323e3b170664c77b2e7173a2d10dc00f diff -Nru ring-20190110.1.e572469~ds1/client-gnome/web/chatview.css ring-20190215.1.f152c98~ds1/client-gnome/web/chatview.css --- ring-20190110.1.e572469~ds1/client-gnome/web/chatview.css 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/web/chatview.css 2019-02-15 23:57:49.000000000 +0000 @@ -891,6 +891,14 @@ color: #A0A0A0; } +.no-audio-overlay { + overflow: visible; +} + +audio { + align-self: center; +} + /* classic screens */ @media screen and (max-width: 1920px), screen and (max-height: 1080px) { .message_in { diff -Nru ring-20190110.1.e572469~ds1/client-gnome/web/chatview.html ring-20190215.1.f152c98~ds1/client-gnome/web/chatview.html --- ring-20190110.1.e572469~ds1/client-gnome/web/chatview.html 2019-01-10 21:54:08.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/client-gnome/web/chatview.html 2019-02-15 23:57:49.000000000 +0000 @@ -816,6 +816,57 @@ return } + + if (isAudio(message_text) && message_delivery_status === "finished" && displayLinksEnabled && !forceTypeToFile) { + // Replace the old wrapper by the downloaded audio + var old_wrapper = message_div.querySelector(".internal_mes_wrapper") + if (old_wrapper) { + old_wrapper.parentNode.removeChild(old_wrapper) + } + + var errorHandler = function () { + var wrapper = message_div.querySelector(".internal_mes_wrapper") + wrapper.parentNode.classList.remove("no-audio-overlay") + var message_wrapper = message_div.querySelector(".message_wrapper") + if (message_wrapper) { + message_wrapper.parentNode.removeChild(message_wrapper) + } + + var media_wrapper = message_div.querySelector(".audio") + if (media_wrapper) { + media_wrapper.parentNode.removeChild(media_wrapper) + } + + var new_interaction = fileInteraction(message_id) + var new_message_wrapper = new_interaction.querySelector(".message_wrapper") + wrapper.prepend(new_message_wrapper) + updateFileInteraction(message_div, message_object, true) + } + + const new_wrapper = document.createElement("audio") + new_wrapper.onerror = errorHandler + const has_uri = message_text.toLowerCase().match(/^(https?|file):\/\//) !== null + new_wrapper.setAttribute("src", "file://" + message_text) + new_wrapper.setAttribute("controls", "controls") + var audio_type = "audio/mpeg" + if (message_text.toLowerCase().match(/\.(ogg)$/)) { + audio_type = "audio/ogg" + } else if (message_text.toLowerCase().match(/\.(flac)$/)) { + audio_type = "audio/flac" + } else if (message_text.toLowerCase().match(/\.(wav)$/)) { + audio_type = "audio/wav" + } + new_wrapper.setAttribute("type", audio_type) + new_wrapper.setAttribute("class", "audio") + const internal_mes_wrapper = document.createElement("div") + internal_mes_wrapper.setAttribute("class", "internal_mes_wrapper") + internal_mes_wrapper.appendChild(new_wrapper) + message_div.insertBefore(internal_mes_wrapper, message_div.querySelector(".menu_interaction")) + internal_mes_wrapper.parentNode.classList.add("no-audio-overlay") + + return + } + // Set informations text var informations_div = message_div.querySelector(".informations") informations_div.innerText = buildFileInformationText(message_object) @@ -871,6 +922,14 @@ } /** + * Return if a file is an image + * @param file + */ +function isAudio(file) { + return file.toLowerCase().match(/\.(mp3|mpeg|ogg|flac|wav)$/) !== null +} + +/** * Return if a file is a youtube video * @param file */ diff -Nru ring-20190110.1.e572469~ds1/daemon/bin/dbus/cx.ring.Ring.ConfigurationManager.xml ring-20190215.1.f152c98~ds1/daemon/bin/dbus/cx.ring.Ring.ConfigurationManager.xml --- ring-20190110.1.e572469~ds1/daemon/bin/dbus/cx.ring.Ring.ConfigurationManager.xml 2019-01-10 21:54:48.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/daemon/bin/dbus/cx.ring.Ring.ConfigurationManager.xml 2019-02-15 23:57:58.000000000 +0000 @@ -779,6 +779,24 @@ + + + + + If hardware decoding is enabled + + + Signal triggered when hardware decoding changes. + + + + + If hardware encoding is enabled + + + Signal triggered when hardware encoding changes. + + @@ -849,6 +867,37 @@ + + + Gets whether or not an audio meter is active for id. If id is empty, returns whether or not there is at least one audio meter active. + + Ring buffer id. + + + If the audio meter is active for the passed in id. + + + + + Sets whether or not the audio meter should be active for id. If id is empty, applies to all ring buffers. + + Ring buffer id. + + + True to enabled the audio meter, false to disable. + + + + + Signal containing volume level. + + Ring buffer id. + + + RMS value for the volume. Conversion to dB can be done with dB=20*log10(level). Level is between 0 and 1. + + + diff -Nru ring-20190110.1.e572469~ds1/daemon/bin/dbus/cx.ring.Ring.VideoManager.xml ring-20190215.1.f152c98~ds1/daemon/bin/dbus/cx.ring.Ring.VideoManager.xml --- ring-20190110.1.e572469~ds1/daemon/bin/dbus/cx.ring.Ring.VideoManager.xml 2019-01-10 21:54:38.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/daemon/bin/dbus/cx.ring.Ring.VideoManager.xml 2019-02-15 23:57:58.000000000 +0000 @@ -72,6 +72,13 @@ + + Starts the audio layer stream, so the audio device can be read. + + + + + diff -Nru ring-20190110.1.e572469~ds1/daemon/bin/dbus/dbusclient.cpp ring-20190215.1.f152c98~ds1/daemon/bin/dbus/dbusclient.cpp --- ring-20190110.1.e572469~ds1/daemon/bin/dbus/dbusclient.cpp 2019-01-10 21:54:38.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/daemon/bin/dbus/dbusclient.cpp 2019-02-15 23:57:58.000000000 +0000 @@ -186,6 +186,8 @@ exportable_callback(bind(&DBusConfigurationManager::certificateStateChanged, confM, _1, _2, _3 )), exportable_callback(bind(&DBusConfigurationManager::mediaParametersChanged, confM, _1 )), exportable_callback(bind(&DBusConfigurationManager::migrationEnded, confM, _1, _2 )), + exportable_callback(bind(&DBusConfigurationManager::hardwareDecodingChanged, confM, _1 )), + exportable_callback(bind(&DBusConfigurationManager::hardwareEncodingChanged, confM, _1 )), }; // Presence event handlers @@ -196,8 +198,10 @@ exportable_callback(bind(&DBusPresenceManager::subscriptionStateChanged, presM, _1, _2, _3)), }; + // Audio event handlers const std::map audioEvHandlers = { exportable_callback(bind(&DBusConfigurationManager::audioDeviceEvent, confM)), + exportable_callback(bind(&DBusConfigurationManager::audioMeter, confM, _1, _2)), }; const std::map dataXferEvHandlers = { diff -Nru ring-20190110.1.e572469~ds1/daemon/bin/dbus/dbusconfigurationmanager.cpp ring-20190215.1.f152c98~ds1/daemon/bin/dbus/dbusconfigurationmanager.cpp --- ring-20190110.1.e572469~ds1/daemon/bin/dbus/dbusconfigurationmanager.cpp 2019-01-10 21:54:48.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/daemon/bin/dbus/dbusconfigurationmanager.cpp 2019-02-15 23:57:58.000000000 +0000 @@ -711,3 +711,15 @@ { return uint32_t(DRing::cancelDataTransfer(id)); } + +bool +DBusConfigurationManager::isAudioMeterActive(const std::string& id) +{ + return DRing::isAudioMeterActive(id); +} + +void +DBusConfigurationManager::setAudioMeterState(const std::string& id, const bool& state) +{ + return DRing::setAudioMeterState(id, state); +} diff -Nru ring-20190110.1.e572469~ds1/daemon/bin/dbus/dbusconfigurationmanager.h ring-20190215.1.f152c98~ds1/daemon/bin/dbus/dbusconfigurationmanager.h --- ring-20190110.1.e572469~ds1/daemon/bin/dbus/dbusconfigurationmanager.h 2019-01-10 21:54:48.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/daemon/bin/dbus/dbusconfigurationmanager.h 2019-02-15 23:57:58.000000000 +0000 @@ -168,6 +168,9 @@ void dataTransferBytesProgress(const uint64_t& id, uint32_t& error, int64_t& total, int64_t& progress); uint32_t acceptFileTransfer(const uint64_t& id, const std::string& file_path, const int64_t& offset); uint32_t cancelDataTransfer(const uint64_t& id); + + bool isAudioMeterActive(const std::string& id); + void setAudioMeterState(const std::string& id, const bool& state); }; #endif // __RING_DBUSCONFIGURATIONMANAGER_H__ diff -Nru ring-20190110.1.e572469~ds1/daemon/bin/dbus/dbusvideomanager.cpp ring-20190215.1.f152c98~ds1/daemon/bin/dbus/dbusvideomanager.cpp --- ring-20190110.1.e572469~ds1/daemon/bin/dbus/dbusvideomanager.cpp 2019-01-10 21:54:38.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/daemon/bin/dbus/dbusvideomanager.cpp 2019-02-15 23:57:58.000000000 +0000 @@ -73,6 +73,18 @@ DRing::stopCamera(); } +void +DBusVideoManager::startAudioDevice() +{ + DRing::startAudioDevice(); +} + +void +DBusVideoManager::stopAudioDevice() +{ + DRing::stopAudioDevice(); +} + auto DBusVideoManager::switchInput(const std::string& resource) -> decltype(DRing::switchInput(resource)) { diff -Nru ring-20190110.1.e572469~ds1/daemon/bin/dbus/dbusvideomanager.h ring-20190215.1.f152c98~ds1/daemon/bin/dbus/dbusvideomanager.h --- ring-20190110.1.e572469~ds1/daemon/bin/dbus/dbusvideomanager.h 2019-01-10 21:54:38.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/daemon/bin/dbus/dbusvideomanager.h 2019-02-15 23:57:58.000000000 +0000 @@ -59,6 +59,8 @@ std::string getDefaultDevice(); void startCamera(); void stopCamera(); + void startAudioDevice(); + void stopAudioDevice(); bool switchInput(const std::string& resource); bool hasCameraStarted(); bool getDecodingAccelerated(); diff -Nru ring-20190110.1.e572469~ds1/daemon/bin/jni/configurationmanager.i ring-20190215.1.f152c98~ds1/daemon/bin/jni/configurationmanager.i --- ring-20190110.1.e572469~ds1/daemon/bin/jni/configurationmanager.i 2019-01-10 21:54:48.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/daemon/bin/jni/configurationmanager.i 2019-02-15 23:57:58.000000000 +0000 @@ -56,6 +56,11 @@ virtual void migrationEnded(const std::string& /*accountId*/, const std::string& /*state*/){} virtual void deviceRevocationEnded(const std::string& /*accountId*/, const std::string& /*device*/, int /*status*/){} + + virtual void hardwareDecodingChanged(bool /*state*/){} + virtual void hardwareEncodingChanged(bool /*state*/){} + + virtual void audioMeter(const std::string& /*id*/, float /*level*/){} }; %} @@ -212,6 +217,8 @@ void setPushNotificationToken(const std::string& pushDeviceToken); void pushNotificationReceived(const std::string& from, const std::map& data); +bool isAudioMeterActive(const std::string& id); +void setAudioMeterState(const std::string& id, bool state); } class ConfigurationCallback { @@ -247,4 +254,9 @@ virtual void migrationEnded(const std::string& /*accountId*/, const std::string& /*state*/){} virtual void deviceRevocationEnded(const std::string& /*accountId*/, const std::string& /*device*/, int /*status*/){} + + virtual void hardwareDecodingChanged(bool /*state*/){} + virtual void hardwareEncodingChanged(bool /*state*/){} + + virtual void audioMeter(const std::string& /*id*/, float /*level*/){} }; diff -Nru ring-20190110.1.e572469~ds1/daemon/bin/jni/jni_interface.i ring-20190215.1.f152c98~ds1/daemon/bin/jni/jni_interface.i --- ring-20190110.1.e572469~ds1/daemon/bin/jni/jni_interface.i 2019-01-10 21:54:38.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/daemon/bin/jni/jni_interface.i 2019-02-15 23:57:58.000000000 +0000 @@ -284,6 +284,7 @@ const std::map videoEvHandlers = { exportable_callback(bind(&VideoCallback::getCameraInfo, videoM, _1, _2, _3, _4)), exportable_callback(bind(&VideoCallback::setParameters, videoM, _1, _2, _3, _4, _5)), + exportable_callback(bind(&VideoCallback::requestKeyFrame, videoM)), exportable_callback(bind(&VideoCallback::startCapture, videoM, _1)), exportable_callback(bind(&VideoCallback::stopCapture, videoM)), exportable_callback(bind(&VideoCallback::decodingStarted, videoM, _1, _2, _3, _4, _5)), diff -Nru ring-20190110.1.e572469~ds1/daemon/bin/jni/videomanager.i ring-20190215.1.f152c98~ds1/daemon/bin/jni/videomanager.i --- ring-20190110.1.e572469~ds1/daemon/bin/jni/videomanager.i 2019-01-10 21:54:38.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/daemon/bin/jni/videomanager.i 2019-02-15 23:57:58.000000000 +0000 @@ -43,6 +43,7 @@ virtual ~VideoCallback(){} virtual void getCameraInfo(const std::string& device, std::vector *formats, std::vector *sizes, std::vector *rates) {} virtual void setParameters(const std::string, const int format, const int width, const int height, const int rate) {} + virtual void requestKeyFrame(){} virtual void startCapture(const std::string& camid) {} virtual void stopCapture() {} virtual void decodingStarted(const std::string& id, const std::string& shm_path, int w, int h, bool is_mixer) {} @@ -129,6 +130,28 @@ } } +JNIEXPORT void JNICALL Java_cx_ring_daemon_RingserviceJNI_captureVideoPacket(JNIEnv *jenv, jclass jcls, jobject buffer, jint size, jint offset, jboolean keyframe, jlong timestamp) +{ + auto frame = DRing::getNewFrame(); + if (not frame) + return; + auto packet = std::unique_ptr(new AVPacket, [](AVPacket* pkt){ + if (pkt) { + av_packet_unref(pkt); + delete pkt; + } + }); + av_init_packet(packet.get()); + if (keyframe) + packet->flags = AV_PKT_FLAG_KEY; + auto data = (uint8_t*)jenv->GetDirectBufferAddress(buffer); + packet->data = data + offset; + packet->size = size; + packet->pts = timestamp; + frame->setPacket(std::move(packet)); + DRing::publishFrame(); +} + JNIEXPORT void JNICALL Java_cx_ring_daemon_RingserviceJNI_captureVideoFrame(JNIEnv *jenv, jclass jcls, jobject image, jint rotation) { jclass imageClass = jenv->GetObjectClass(image); @@ -348,6 +371,7 @@ %native(unregisterVideoCallback) void unregisterVideoCallback(jstring, jlong); %native(captureVideoFrame) void captureVideoFrame(jobject, jint); +%native(captureVideoPacket) void captureVideoPacket(jobject, jint, jint, jboolean, jlong); namespace DRing { @@ -357,6 +381,8 @@ void startCamera(); void stopCamera(); bool hasCameraStarted(); +void startAudioDevice(); +void stopAudioDevice(); bool switchInput(const std::string& resource); bool switchToCamera(); std::map getSettings(const std::string& name); @@ -374,6 +400,7 @@ virtual ~VideoCallback(){} virtual void getCameraInfo(const std::string& device, std::vector *formats, std::vector *sizes, std::vector *rates){} virtual void setParameters(const std::string, const int format, const int width, const int height, const int rate) {} + virtual void requestKeyFrame(){} virtual void startCapture(const std::string& camid) {} virtual void stopCapture() {} virtual void decodingStarted(const std::string& id, const std::string& shm_path, int w, int h, bool is_mixer) {} diff -Nru ring-20190110.1.e572469~ds1/daemon/bin/nodejs/configurationmanager.i ring-20190215.1.f152c98~ds1/daemon/bin/nodejs/configurationmanager.i --- ring-20190110.1.e572469~ds1/daemon/bin/nodejs/configurationmanager.i 2019-01-10 21:54:48.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/daemon/bin/nodejs/configurationmanager.i 2019-02-15 23:57:58.000000000 +0000 @@ -53,7 +53,12 @@ virtual void migrationEnded(const std::string& /*accountId*/, const std::string& /*state*/){} virtual void deviceRevocationEnded(const std::string& /*accountId*/, const std::string& /*device*/, int /*status*/){} + + virtual void hardwareDecodingChanged(bool /*state*/){} + virtual void hardwareEncodingChanged(bool /*state*/){} }; + + virtual void audioMeter(const std::string& /*id*/, float /*level*/){} %} %feature("director") ConfigurationCallback; @@ -203,6 +208,9 @@ int importAccounts(std::string archivePath, std::string password); void connectivityChanged(); + +bool isAudioMeterActive(const std::string& id); +void setAudioMeterState(const std::string& id, bool state); } class ConfigurationCallback { @@ -235,4 +243,9 @@ virtual void migrationEnded(const std::string& /*accountId*/, const std::string& /*state*/){} virtual void deviceRevocationEnded(const std::string& /*accountId*/, const std::string& /*device*/, int /*status*/){} + + virtual void hardwareDecodingChanged(bool /*state*/){} + virtual void hardwareEncodingChanged(bool /*state*/){} + + virtual void audioMeter(const std::string& /*id*/, float /*level*/){} }; diff -Nru ring-20190110.1.e572469~ds1/daemon/bin/nodejs/videomanager.i ring-20190215.1.f152c98~ds1/daemon/bin/nodejs/videomanager.i --- ring-20190110.1.e572469~ds1/daemon/bin/nodejs/videomanager.i 2019-01-10 21:54:38.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/daemon/bin/nodejs/videomanager.i 2019-02-15 23:57:58.000000000 +0000 @@ -51,6 +51,8 @@ void startCamera(); void stopCamera(); bool hasCameraStarted(); +void startAudioDevice(); +void stopAudioDevice(); bool switchInput(const std::string& resource); bool switchToCamera(); std::map getSettings(const std::string& name); diff -Nru ring-20190110.1.e572469~ds1/daemon/configure.ac ring-20190215.1.f152c98~ds1/daemon/configure.ac --- ring-20190110.1.e572469~ds1/daemon/configure.ac 2019-01-10 21:54:48.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/daemon/configure.ac 2019-02-15 23:57:58.000000000 +0000 @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.65]) -AC_INIT([Ring Daemon],[7.2.0],[ring@gnu.org],[ring]) +AC_INIT([Ring Daemon],[7.4.0],[ring@gnu.org],[ring]) AC_COPYRIGHT([[Copyright (c) Savoir-faire Linux 2004-2018]]) AC_REVISION([$Revision$]) @@ -134,6 +134,12 @@ ]) AM_CONDITIONAL(HAVE_ANDROID, test "${HAVE_ANDROID}" = "1") +AS_IF([test "$SYS" = linux && test "${HAVE_ANDROID}" != "1"],[ + CFLAGS="${CFLAGS} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" + CXXFLAGS="${CXXFLAGS} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" +],[ +]) + dnl override platform specific check for dependent libraries dnl otherwise libtool linking of shared libraries will dnl fail on anything other than pass_all. @@ -430,7 +436,7 @@ AS_HELP_STRING([--with-restcpp], [enable rest support with C++])) AC_ARG_ENABLE([restbed_old_api], AS_HELP_STRING([--enable-restbed-old-api], [Use the old restbed API])) AS_IF([test "x$enable_restbed_old_api" = "xyes"], [ - AC_DEFINE([RESTBED_OLD_API], [], [Defined if you use the old restbed API]) + AC_DEFINE([RESTBED_OLD_API], [1], [Defined if you use the old restbed API]) ]) AS_IF([test "x$enable_ringns" != "xno" || test "x$with_restcpp" = "xyes"], [ diff -Nru ring-20190110.1.e572469~ds1/daemon/contrib/src/opendht/fetch_and_patch.bat ring-20190215.1.f152c98~ds1/daemon/contrib/src/opendht/fetch_and_patch.bat --- ring-20190110.1.e572469~ds1/daemon/contrib/src/opendht/fetch_and_patch.bat 2019-01-10 21:54:38.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/daemon/contrib/src/opendht/fetch_and_patch.bat 2019-02-15 23:57:58.000000000 +0000 @@ -1,6 +1,6 @@ set BUILD=%SRC%..\build -set OPENDHT_VERSION=20f4355b7345c08ab18aaa9f556b394161a0598d +set OPENDHT_VERSION=d523e9f259aa2e90e0c56b7f66324422422c9e2b set OPENDHT_URL=https://github.com/savoirfairelinux/opendht/archive/%OPENDHT_VERSION%.tar.gz mkdir %BUILD% diff -Nru ring-20190110.1.e572469~ds1/daemon/contrib/src/opendht/rules.mak ring-20190215.1.f152c98~ds1/daemon/contrib/src/opendht/rules.mak --- ring-20190110.1.e572469~ds1/daemon/contrib/src/opendht/rules.mak 2019-01-10 21:54:38.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/daemon/contrib/src/opendht/rules.mak 2019-02-15 23:58:05.000000000 +0000 @@ -1,5 +1,5 @@ # OPENDHT -OPENDHT_VERSION := 36cf70f2a72c871fc873c51fedb6a6db04e179cf +OPENDHT_VERSION := d523e9f259aa2e90e0c56b7f66324422422c9e2b OPENDHT_URL := https://github.com/savoirfairelinux/opendht/archive/$(OPENDHT_VERSION).tar.gz PKGS += opendht diff -Nru ring-20190110.1.e572469~ds1/daemon/contrib/src/opendht/SHA512SUMS ring-20190215.1.f152c98~ds1/daemon/contrib/src/opendht/SHA512SUMS --- ring-20190110.1.e572469~ds1/daemon/contrib/src/opendht/SHA512SUMS 2019-01-10 21:54:38.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/daemon/contrib/src/opendht/SHA512SUMS 2019-02-15 23:58:05.000000000 +0000 @@ -1 +1 @@ -34081f54b387c7bae74a21bdf8152ae4b776982d819591b67574e5ff13f0ff414b512a57868784c71bde5a763fa0b1854ce0c7de66944e8b74bb832c4f11c08b opendht-36cf70f2a72c871fc873c51fedb6a6db04e179cf.tar.gz \ No newline at end of file +7b8d3935d498f75de2e131a012ef564532d3633364ec46caa8d82fd366d42eaeb3dabe9025d78368653ae0112018f6cc6eab6c25025b5a7d9b0f81b613ce0f6f opendht-d523e9f259aa2e90e0c56b7f66324422422c9e2b.tar.gz \ No newline at end of file diff -Nru ring-20190110.1.e572469~ds1/daemon/contrib/src/portaudio/fetch_and_patch.bat ring-20190215.1.f152c98~ds1/daemon/contrib/src/portaudio/fetch_and_patch.bat --- ring-20190110.1.e572469~ds1/daemon/contrib/src/portaudio/fetch_and_patch.bat 2019-01-10 21:54:38.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/daemon/contrib/src/portaudio/fetch_and_patch.bat 2019-02-15 23:57:58.000000000 +0000 @@ -20,6 +20,9 @@ if "%1"=="uwp" ( %APPLY_CMD% %SRC%\portaudio\pa-uwp.patch +) else ( + %APPLY_CMD% %SRC%\portaudio\pa-dsound-aecns.patch + %APPLY_CMD% %SRC%\portaudio\pa-dsound.patch ) cd %SRC% \ No newline at end of file diff -Nru ring-20190110.1.e572469~ds1/daemon/contrib/src/portaudio/pa-dsound-aecns.patch ring-20190215.1.f152c98~ds1/daemon/contrib/src/portaudio/pa-dsound-aecns.patch --- ring-20190110.1.e572469~ds1/daemon/contrib/src/portaudio/pa-dsound-aecns.patch 1970-01-01 00:00:00.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/daemon/contrib/src/portaudio/pa-dsound-aecns.patch 2019-02-15 23:57:58.000000000 +0000 @@ -0,0 +1,65 @@ +--- a/src/hostapi/dsound/pa_win_ds.c ++++ b/src/hostapi/dsound/pa_win_ds.c +@@ -1520,12 +1520,33 @@ static HRESULT InitFullDuplexInputOutputBuffers( PaWinDsStream *stream, + hostInputSampleFormat, PaWin_SampleFormatToLinearWaveFormatTag( hostInputSampleFormat ), + nFrameRate, inputChannelMask ); + ++ // aec and noise suppression ++ DSCEFFECTDESC dscfx[2]; ++ ZeroMemory(&dscfx[0], sizeof(DSCEFFECTDESC)); ++ dscfx[0].dwSize = sizeof(DSCEFFECTDESC); ++ dscfx[0].dwFlags = DSCFX_LOCSOFTWARE; ++ dscfx[0].guidDSCFXClass = GUID_DSCFX_CLASS_AEC; ++ dscfx[0].guidDSCFXInstance = GUID_DSCFX_MS_AEC; ++ dscfx[0].dwReserved1 = 0; ++ dscfx[0].dwReserved2 = 0; ++ ++ ZeroMemory(&dscfx[1], sizeof(DSCEFFECTDESC)); ++ dscfx[1].dwSize = sizeof(DSCEFFECTDESC); ++ dscfx[1].dwFlags = DSCFX_LOCSOFTWARE; ++ dscfx[1].guidDSCFXClass = GUID_DSCFX_CLASS_NS; ++ dscfx[1].guidDSCFXInstance = GUID_DSCFX_MS_NS; ++ dscfx[1].dwReserved1 = 0; ++ dscfx[1].dwReserved2 = 0; ++ + ZeroMemory(&captureDesc, sizeof(DSCBUFFERDESC)); + captureDesc.dwSize = sizeof(DSCBUFFERDESC); +- captureDesc.dwFlags = 0; + captureDesc.dwBufferBytes = bytesPerInputBuffer; + captureDesc.lpwfxFormat = (WAVEFORMATEX*)&captureWaveFormat; + ++ captureDesc.dwFlags = DSCBCAPS_CTRLFX; ++ captureDesc.dwFXCount = 2; ++ captureDesc.lpDSCFXDesc = dscfx; ++ + // render buffer description + + PaWin_InitializeWaveFormatExtensible( &renderWaveFormat, outputChannelCount, +@@ -1551,6 +1572,24 @@ static HRESULT InitFullDuplexInputOutputBuffers( PaWinDsStream *stream, + NULL /* pUnkOuter must be NULL */ + ); + ++ if (hr != DS_OK) { ++ PA_DEBUG(("DirectSoundFullDuplexCreate(with AEC/NS) failed. hr=%d\n", hr)); ++ // try removing AEC/NS ++ captureDesc.dwFlags = 0; ++ captureDesc.dwFXCount = 0; ++ captureDesc.lpDSCFXDesc = NULL; ++ hr = paWinDsDSoundEntryPoints.DirectSoundFullDuplexCreate8( ++ inputDevice->lpGUID, outputDevice->lpGUID, ++ &captureDesc, &secondaryRenderDesc, ++ GetDesktopWindow(), /* see InitOutputBuffer() for a discussion of whether this is a good idea */ ++ DSSCL_EXCLUSIVE, ++ &stream->pDirectSoundFullDuplex8, ++ &pCaptureBuffer8, ++ &pRenderBuffer8, ++ NULL /* pUnkOuter must be NULL */ ++ ); ++ } ++ + if( hr == DS_OK ) + { + PA_DEBUG(("DirectSoundFullDuplexCreate succeeded!\n")); +-- +2.19.0.windows.1 + diff -Nru ring-20190110.1.e572469~ds1/daemon/contrib/src/portaudio/pa-dsound.patch ring-20190215.1.f152c98~ds1/daemon/contrib/src/portaudio/pa-dsound.patch --- ring-20190110.1.e572469~ds1/daemon/contrib/src/portaudio/pa-dsound.patch 1970-01-01 00:00:00.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/daemon/contrib/src/portaudio/pa-dsound.patch 2019-02-15 23:57:58.000000000 +0000 @@ -0,0 +1,23 @@ +--- a/MSVC/portaudio.vcxproj ++++ b/MSVC/portaudio.vcxproj +@@ -109,7 +109,7 @@ + true + Speed + ..\src\common;..\include;.\;..\src\os\win;%(AdditionalIncludeDirectories) +- PA_WDMKS_NO_KSGUID_LIB;WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO;PA_USE_ASIO=0;PA_USE_DS=0;PA_USE_WMME=1;PA_USE_WASAPI=1;PA_USE_WDMKS=1;%(PreprocessorDefinitions) ++ PA_ENABLE_DEBUG_OUTPUT;PAWIN_USE_DIRECTSOUNDFULLDUPLEXCREATE;PA_WDMKS_NO_KSGUID_LIB;WIN32;NDEBUG;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO;PA_USE_ASIO=0;PA_USE_DS=1;PA_USE_WMME=0;PA_USE_WASAPI=0;PA_USE_WDMKS=0;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true +@@ -161,7 +161,7 @@ xcopy /S /Y $(ProjectDir)..\include\*.h "$(OutDir)"include + true + Speed + ..\src\common;..\include;.\;..\src\os\win;%(AdditionalIncludeDirectories) +- PA_WDMKS_NO_KSGUID_LIB;_WIN64;NDEBUG;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO;PA_USE_ASIO=0;PA_USE_DS=0;PA_USE_WMME=1;PA_USE_WASAPI=1;PA_USE_WDMKS=1;%(PreprocessorDefinitions) ++ PA_ENABLE_DEBUG_OUTPUT;PAWIN_USE_DIRECTSOUNDFULLDUPLEXCREATE;PA_WDMKS_NO_KSGUID_LIB;_WIN64;NDEBUG;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO;PA_USE_ASIO=0;PA_USE_DS=1;PA_USE_WMME=0;PA_USE_WASAPI=0;PA_USE_WDMKS=0;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true +-- +2.19.0.windows.1 + diff -Nru ring-20190110.1.e572469~ds1/daemon/doc/doxygen/core-doc.cfg.in ring-20190215.1.f152c98~ds1/daemon/doc/doxygen/core-doc.cfg.in --- ring-20190110.1.e572469~ds1/daemon/doc/doxygen/core-doc.cfg.in 2019-01-10 21:54:38.000000000 +0000 +++ ring-20190215.1.f152c98~ds1/daemon/doc/doxygen/core-doc.cfg.in 2019-02-15 23:57:58.000000000 +0000 @@ -1,109 +1,129 @@ -# Doxyfile 1.7.4 +# Doxyfile 1.8.11 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. # -# All text after a hash (#) is considered a comment and will be ignored. +# All text after a double hash (##) is considered a comment and is placed in +# front of the TAG it is preceding. +# +# All text after a single hash (#) is considered a comment and will be ignored. # The format is: -# TAG = value [value, ...] -# For lists items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (" "). +# TAG = value [value, ...] +# For lists, items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (\" \"). #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- # This tag specifies the encoding used for all characters in the config file -# that follow. The default is UTF-8 which is also the encoding used for all -# text before the first occurrence of this tag. Doxygen uses libiconv (or the -# iconv built into libc) for the transcoding. See -# http://www.gnu.org/software/libiconv for the list of possible encodings. +# that follow. The default is UTF-8 which is also the encoding used for all text +# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv +# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv +# for the list of possible encodings. +# The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded -# by quotes) that should identify the project. +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by +# double-quotes, unless you are using Doxywizard) that should identify the +# project for which the documentation is generated. This name is used in the +# title of most generated pages and in a few other places. +# The default value is: My Project. PROJECT_NAME = @PROJECT_NAME@ -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or -# if some version control system is used. +# The PROJECT_NUMBER tag can be used to enter a project or revision number. This +# could be handy for archiving the generated documentation or if some version +# control system is used. PROJECT_NUMBER = @PACKAGE_VERSION@ # Using the PROJECT_BRIEF tag one can provide an optional one line description -# for a project that appears at the top of each page and should give viewer -# a quick idea about the purpose of the project. Keep the description short. +# for a project that appears at the top of each page and should give viewer a +# quick idea about the purpose of the project. Keep the description short. PROJECT_BRIEF = -# With the PROJECT_LOGO tag one can specify an logo or icon that is -# included in the documentation. The maximum height of the logo should not -# exceed 55 pixels and the maximum width should not exceed 200 pixels. -# Doxygen will copy the logo to the output directory. +# With the PROJECT_LOGO tag one can specify a logo or an icon that is included +# in the documentation. The maximum height of the logo should not exceed 55 +# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy +# the logo to the output directory. PROJECT_LOGO = -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location -# where doxygen was started. If left blank the current directory will be used. +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path +# into which the generated documentation will be written. If a relative path is +# entered, it will be relative to the location where doxygen was started. If +# left blank the current directory will be used. OUTPUT_DIRECTORY = -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of -# source files, where putting all generated files in the same directory would -# otherwise cause performance problems for the file system. +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- +# directories (in 2 levels) under the output directory of each output format and +# will distribute the generated files over these directories. Enabling this +# option can be useful when feeding doxygen a huge amount of source files, where +# putting all generated files in the same directory would otherwise causes +# performance problems for the file system. +# The default value is: NO. CREATE_SUBDIRS = NO +# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII +# characters to appear in the names of generated files. If set to NO, non-ASCII +# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode +# U+3044. +# The default value is: NO. + +ALLOW_UNICODE_NAMES = NO + # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, -# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English -# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, -# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, -# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, +# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), +# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, +# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), +# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, +# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, +# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, +# Ukrainian and Vietnamese. +# The default value is: English. OUTPUT_LANGUAGE = English -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). -# Set to NO to disable this. +# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member +# descriptions after the members that are listed in the file and class +# documentation (similar to Javadoc). Set to NO to disable this. +# The default value is: YES. BRIEF_MEMBER_DESC = YES -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief +# description of a member or function before the detailed description +# +# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the # brief descriptions will be completely suppressed. +# The default value is: YES. REPEAT_BRIEF = YES -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is -# used as the annotated text. Otherwise, the brief description is used as-is. -# If left blank, the following values are used ("$name" is automatically -# replaced with the name of the entity): "The $name class" "The $name widget" -# "The $name file" "is" "provides" "specifies" "contains" -# "represents" "a" "an" "the" +# This tag implements a quasi-intelligent brief description abbreviator that is +# used to form the text in various listings. Each string in this list, if found +# as the leading text of the brief description, will be stripped from the text +# and the result, after processing the whole list, is used as the annotated +# text. Otherwise, the brief description is used as-is. If left blank, the +# following values are used ($name is automatically replaced with the name of +# the entity):The $name class, The $name widget, The $name file, is, provides, +# specifies, contains, represents, a, an and the. ABBREVIATE_BRIEF = # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief +# doxygen will generate a detailed section even if there is only a brief # description. +# The default value is: NO. ALWAYS_DETAILED_SEC = YES @@ -111,548 +131,702 @@ # inherited members of a class in the documentation of that class as if those # members were ordinary class members. Constructors, destructors and assignment # operators of the base classes will not be shown. +# The default value is: NO. INLINE_INHERITED_MEMB = NO -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set -# to NO the shortest path that makes the file name unique will be used. +# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path +# before files name in the file list and in the header files. If set to NO the +# shortest path that makes the file name unique will be used +# The default value is: YES. FULL_PATH_NAMES = NO -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the -# path to strip. +# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path. +# Stripping is only done if one of the specified strings matches the left-hand +# part of the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the path to +# strip. +# +# Note that you can specify absolute paths here, but also relative paths, which +# will be relative from the directory where doxygen is started. +# This tag requires that the tag FULL_PATH_NAMES is set to YES. STRIP_FROM_PATH = -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that -# are normally passed to the compiler using the -I flag. +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the +# path mentioned in the documentation of a class, which tells the reader which +# header file to include in order to use a class. If left blank only the name of +# the header file containing the class definition is used. Otherwise one should +# specify the list of include paths that are normally passed to the compiler +# using the -I flag. STRIP_FROM_INC_PATH = -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful if your file system -# doesn't support long names like on DOS, Mac, or CD-ROM. +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but +# less readable) file names. This can be useful is your file systems doesn't +# support long names like on DOS, Mac, or CD-ROM. +# The default value is: NO. SHORT_NAMES = NO -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like regular Qt-style comments -# (thus requiring an explicit @brief command for a brief description.) +# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the +# first line (until the first dot) of a Javadoc-style comment as the brief +# description. If set to NO, the Javadoc-style will behave just like regular Qt- +# style comments (thus requiring an explicit @brief command for a brief +# description.) +# The default value is: NO. JAVADOC_AUTOBRIEF = YES -# If the QT_AUTOBRIEF tag is set to YES then Doxygen will -# interpret the first line (until the first dot) of a Qt-style -# comment as the brief description. If set to NO, the comments -# will behave just like regular Qt-style comments (thus requiring -# an explicit \brief command for a brief description.) +# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first +# line (until the first dot) of a Qt-style comment as the brief description. If +# set to NO, the Qt-style will behave just like regular Qt-style comments (thus +# requiring an explicit \brief command for a brief description.) +# The default value is: NO. QT_AUTOBRIEF = NO -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed -# description. Set this tag to YES if you prefer the old behaviour instead. +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a +# multi-line C++ special comment block (i.e. a block of //! or /// comments) as +# a brief description. This used to be the default behavior. The new default is +# to treat a multi-line C++ comment block as a detailed description. Set this +# tag to YES if you prefer the old behavior instead. +# +# Note that setting this tag to YES also means that rational rose comments are +# not recognized any more. +# The default value is: NO. MULTILINE_CPP_IS_BRIEF = NO -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it -# re-implements. +# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the +# documentation from any documented member that it re-implements. +# The default value is: YES. INHERIT_DOCS = YES -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce -# a new page for each member. If set to NO, the documentation of a member will -# be part of the file/class/namespace that contains it. +# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new +# page for each member. If set to NO, the documentation of a member will be part +# of the file/class/namespace that contains it. +# The default value is: NO. SEPARATE_MEMBER_PAGES = NO -# The TAB_SIZE tag can be used to set the number of spaces in a tab. -# Doxygen uses this value to replace tabs by spaces in code fragments. +# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen +# uses this value to replace tabs by spaces in code fragments. +# Minimum value: 1, maximum value: 16, default value: 4. TAB_SIZE = 8 -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". -# You can put \n's in the value part of an alias to insert newlines. +# This tag can be used to specify a number of aliases that act as commands in +# the documentation. An alias has the form: +# name=value +# For example adding +# "sideeffect=@par Side Effects:\n" +# will allow you to put the command \sideeffect (or @sideeffect) in the +# documentation, which will result in a user-defined paragraph with heading +# "Side Effects:". You can put \n's in the value part of an alias to insert +# newlines. ALIASES = -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list -# of all members will be omitted, etc. +# This tag can be used to specify a number of word-keyword mappings (TCL only). +# A mapping has the form "name=value". For example adding "class=itcl::class" +# will allow you to use the command class in the itcl::class meaning. + +TCL_SUBST = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources +# only. Doxygen will then generate output that is more tailored for C. For +# instance, some of the names that are used will be different. The list of all +# members will be omitted, etc. +# The default value is: NO. OPTIMIZE_OUTPUT_FOR_C = NO -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for -# Java. For instance, namespaces will be presented as packages, qualified -# scopes will look different, etc. +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or +# Python sources only. Doxygen will then generate output that is more tailored +# for that language. For instance, namespaces will be presented as packages, +# qualified scopes will look different, etc. +# The default value is: NO. OPTIMIZE_OUTPUT_JAVA = NO # Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran -# sources only. Doxygen will then generate output that is more tailored for -# Fortran. +# sources. Doxygen will then generate output that is tailored for Fortran. +# The default value is: NO. OPTIMIZE_FOR_FORTRAN = NO # Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL -# sources. Doxygen will then generate output that is tailored for -# VHDL. +# sources. Doxygen will then generate output that is tailored for VHDL. +# The default value is: NO. OPTIMIZE_OUTPUT_VHDL = NO # Doxygen selects the parser to use depending on the extension of the files it -# parses. With this tag you can assign which parser to use for a given extension. -# Doxygen has a built-in mapping, but you can override or extend it using this -# tag. The format is ext=language, where ext is a file extension, and language -# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C, -# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make -# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C -# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions -# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen. +# parses. With this tag you can assign which parser to use for a given +# extension. Doxygen has a built-in mapping, but you can override or extend it +# using this tag. The format is ext=language, where ext is a file extension, and +# language is one of the parsers supported by doxygen: IDL, Java, Javascript, +# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran: +# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran: +# Fortran. In the later case the parser tries to guess whether the code is fixed +# or free formatted code, this is the default for Fortran type files), VHDL. For +# instance to make doxygen treat .inc files as Fortran files (default is PHP), +# and .f files as C (default is Fortran), use: inc=Fortran f=C. +# +# Note: For files without extension you can use no_extension as a placeholder. +# +# Note that for custom extensions you also need to set FILE_PATTERNS otherwise +# the files are not read by doxygen. EXTENSION_MAPPING = +# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments +# according to the Markdown format, which allows for more readable +# documentation. See http://daringfireball.net/projects/markdown/ for details. +# The output of markdown processing is further processed by doxygen, so you can +# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in +# case of backward compatibilities issues. +# The default value is: YES. + +MARKDOWN_SUPPORT = YES + +# When enabled doxygen tries to link words that correspond to documented +# classes, or namespaces to their corresponding documentation. Such a link can +# be prevented in individual cases by putting a % sign in front of the word or +# globally by setting AUTOLINK_SUPPORT to NO. +# The default value is: YES. + +AUTOLINK_SUPPORT = YES + # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want -# to include (a tag file for) the STL sources as input, then you should -# set this tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. -# func(std::string) {}). This also makes the inheritance and collaboration +# to include (a tag file for) the STL sources as input, then you should set this +# tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); +# versus func(std::string) {}). This also make the inheritance and collaboration # diagrams that involve STL classes more complete and accurate. +# The default value is: NO. BUILTIN_STL_SUPPORT = NO # If you use Microsoft's C++/CLI language, you should set this option to YES to # enable parsing support. +# The default value is: NO. CPP_CLI_SUPPORT = NO -# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. -# Doxygen will parse them like normal C++ but will assume all classes use public -# instead of private inheritance when no explicit protection keyword is present. +# Set the SIP_SUPPORT tag to YES if your project consists of sip (see: +# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# will parse them like normal C++ but will assume all classes use public instead +# of private inheritance when no explicit protection keyword is present. +# The default value is: NO. SIP_SUPPORT = NO -# For Microsoft's IDL there are propget and propput attributes to indicate getter -# and setter methods for a property. Setting this option to YES (the default) -# will make doxygen replace the get and set methods by a property in the -# documentation. This will only work if the methods are indeed getting or -# setting a simple type. If this is not the case, or you want to show the -# methods anyway, you should set this option to NO. +# For Microsoft's IDL there are propget and propput attributes to indicate +# getter and setter methods for a property. Setting this option to YES will make +# doxygen to replace the get and set methods by a property in the documentation. +# This will only work if the methods are indeed getting or setting a simple +# type. If this is not the case, or you want to show the methods anyway, you +# should set this option to NO. +# The default value is: YES. IDL_PROPERTY_SUPPORT = YES # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first +# tag is set to YES then doxygen will reuse the documentation of the first # member in the group (if any) for the other members of the group. By default # all members of a group must be documented explicitly. +# The default value is: NO. DISTRIBUTE_GROUP_DOC = YES -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using -# the \nosubgrouping command. +# If one adds a struct or class to a group and this option is enabled, then also +# any nested class or struct is added to the same group. By default this option +# is disabled and one has to add nested compounds explicitly via \ingroup. +# The default value is: NO. + +GROUP_NESTED_COMPOUNDS = NO + +# Set the SUBGROUPING tag to YES to allow class member groups of the same type +# (for instance a group of public functions) to be put as a subgroup of that +# type (e.g. under the Public Functions section). Set it to NO to prevent +# subgrouping. Alternatively, this can be done per class using the +# \nosubgrouping command. +# The default value is: YES. SUBGROUPING = YES -# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and -# unions are shown inside the group in which they are included (e.g. using -# @ingroup) instead of on a separate page (for HTML and Man pages) or -# section (for LaTeX and RTF). +# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions +# are shown inside the group in which they are included (e.g. using \ingroup) +# instead of on a separate page (for HTML and Man pages) or section (for LaTeX +# and RTF). +# +# Note that this feature does not work in combination with +# SEPARATE_MEMBER_PAGES. +# The default value is: NO. INLINE_GROUPED_CLASSES = NO -# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum -# is documented as struct, union, or enum with the name of the typedef. So +# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions +# with only public data fields or simple typedef fields will be shown inline in +# the documentation of the scope in which they are defined (i.e. file, +# namespace, or group documentation), provided this scope is documented. If set +# to NO, structs, classes, and unions are shown on a separate page (for HTML and +# Man pages) or section (for LaTeX and RTF). +# The default value is: NO. + +INLINE_SIMPLE_STRUCTS = NO + +# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or +# enum is documented as struct, union, or enum with the name of the typedef. So # typedef struct TypeS {} TypeT, will appear in the documentation as a struct # with name TypeT. When disabled the typedef will appear as a member of a file, -# namespace, or class. And the struct will be named TypeS. This can typically -# be useful for C code in case the coding convention dictates that all compound +# namespace, or class. And the struct will be named TypeS. This can typically be +# useful for C code in case the coding convention dictates that all compound # types are typedef'ed and only the typedef is referenced, never the tag name. +# The default value is: NO. TYPEDEF_HIDES_STRUCT = NO -# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to -# determine which symbols to keep in memory and which to flush to disk. -# When the cache is full, less often used symbols will be written to disk. -# For small to medium size projects (<1000 input files) the default value is -# probably good enough. For larger projects a too small cache size can cause -# doxygen to be busy swapping symbols to and from disk most of the time -# causing a significant performance penalty. -# If the system has enough physical memory increasing the cache will improve the -# performance by keeping more symbols in memory. Note that the value works on -# a logarithmic scale so increasing the size by one will roughly double the -# memory usage. The cache size is given by this formula: -# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, -# corresponding to a cache size of 2^16 = 65536 symbols +# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This +# cache is used to resolve symbols given their name and scope. Since this can be +# an expensive process and often the same symbol appears multiple times in the +# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small +# doxygen will become slower. If the cache is too large, memory is wasted. The +# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range +# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536 +# symbols. At the end of a run doxygen will report the cache usage and suggest +# the optimal cache size from a speed point of view. +# Minimum value: 0, maximum value: 9, default value: 0. -SYMBOL_CACHE_SIZE = 0 +LOOKUP_CACHE_SIZE = 0 #--------------------------------------------------------------------------- # Build related configuration options #--------------------------------------------------------------------------- -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless -# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES +# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in +# documentation are documented, even if no documentation was available. Private +# class members and static file members will be hidden unless the +# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES. +# Note: This will also disable the warnings about undocumented members that are +# normally produced when WARNINGS is set to YES. +# The default value is: NO. EXTRACT_ALL = YES -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class -# will be included in the documentation. +# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will +# be included in the documentation. +# The default value is: NO. EXTRACT_PRIVATE = NO -# If the EXTRACT_STATIC tag is set to YES all static members of a file -# will be included in the documentation. +# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal +# scope will be included in the documentation. +# The default value is: NO. + +EXTRACT_PACKAGE = NO + +# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be +# included in the documentation. +# The default value is: NO. EXTRACT_STATIC = YES -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. -# If set to NO only classes defined in header files are included. +# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined +# locally in source files will be included in the documentation. If set to NO, +# only classes defined in header files are included. Does not have any effect +# for Java sources. +# The default value is: YES. EXTRACT_LOCAL_CLASSES = YES -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. -# If set to NO (the default) only methods in the interface are included. +# This flag is only useful for Objective-C code. If set to YES, local methods, +# which are defined in the implementation section but not in the interface are +# included in the documentation. If set to NO, only methods in the interface are +# included. +# The default value is: NO. EXTRACT_LOCAL_METHODS = NO # If this flag is set to YES, the members of anonymous namespaces will be # extracted and appear in the documentation as a namespace called -# 'anonymous_namespace{file}', where file will be replaced with the base -# name of the file that contains the anonymous namespace. By default -# anonymous namespaces are hidden. +# 'anonymous_namespace{file}', where file will be replaced with the base name of +# the file that contains the anonymous namespace. By default anonymous namespace +# are hidden. +# The default value is: NO. EXTRACT_ANON_NSPACES = NO -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. -# This option has no effect if EXTRACT_ALL is enabled. +# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all +# undocumented members inside documented classes or files. If set to NO these +# members will be included in the various overviews, but no documentation +# section is generated. This option has no effect if EXTRACT_ALL is enabled. +# The default value is: NO. HIDE_UNDOC_MEMBERS = NO -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various -# overviews. This option has no effect if EXTRACT_ALL is enabled. +# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. If set +# to NO, these classes will be included in the various overviews. This option +# has no effect if EXTRACT_ALL is enabled. +# The default value is: NO. HIDE_UNDOC_CLASSES = NO -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the -# documentation. +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend +# (class|struct|union) declarations. If set to NO, these declarations will be +# included in the documentation. +# The default value is: NO. HIDE_FRIEND_COMPOUNDS = NO -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the -# function's detailed documentation block. +# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any +# documentation blocks found inside the body of a function. If set to NO, these +# blocks will be appended to the function's detailed documentation block. +# The default value is: NO. HIDE_IN_BODY_DOCS = NO -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. -# Set it to YES to include the internal documentation. +# The INTERNAL_DOCS tag determines if documentation that is typed after a +# \internal command is included. If the tag is set to NO then the documentation +# will be excluded. Set it to YES to include the internal documentation. +# The default value is: NO. INTERNAL_DOCS = NO -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also +# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file +# names in lower-case letters. If set to YES, upper-case letters are also # allowed. This is useful if you have classes or files whose names only differ # in case and if your file system supports case sensitive file names. Windows # and Mac users are advised to set this option to NO. +# The default value is: system dependent. CASE_SENSE_NAMES = YES -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the -# documentation. If set to YES the scope will be hidden. +# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with +# their full class and namespace scopes in the documentation. If set to YES, the +# scope will be hidden. +# The default value is: NO. HIDE_SCOPE_NAMES = NO -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation -# of that file. +# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will +# append additional text to a page's title, such as Class Reference. If set to +# YES the compound reference will be hidden. +# The default value is: NO. + +HIDE_COMPOUND_REFERENCE= NO + +# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of +# the files that are included by a file in the documentation of that file. +# The default value is: YES. SHOW_INCLUDE_FILES = NO -# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen -# will list include files with double quotes in the documentation -# rather than with sharp brackets. +# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each +# grouped member an include statement to the documentation, telling the reader +# which file to include in order to use the member. +# The default value is: NO. + +SHOW_GROUPED_MEMB_INC = NO + +# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include +# files with double quotes in the documentation rather than with sharp brackets. +# The default value is: NO. FORCE_LOCAL_INCLUDES = NO -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] -# is inserted in the documentation for inline members. +# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the +# documentation for inline members. +# The default value is: YES. INLINE_INFO = YES -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in -# declaration order. +# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the +# (detailed) documentation of file and class members alphabetically by member +# name. If set to NO, the members will appear in declaration order. +# The default value is: YES. SORT_MEMBER_DOCS = YES -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in -# declaration order. +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief +# descriptions of file, namespace and class members alphabetically by member +# name. If set to NO, the members will appear in declaration order. Note that +# this will also influence the order of the classes in the class list. +# The default value is: NO. SORT_BRIEF_DOCS = YES -# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen -# will sort the (brief and detailed) documentation of class members so that -# constructors and destructors are listed first. If set to NO (the default) -# the constructors will appear in the respective orders defined by -# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. -# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO -# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the +# (brief and detailed) documentation of class members so that constructors and +# destructors are listed first. If set to NO the constructors will appear in the +# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS. +# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief +# member documentation. +# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting +# detailed member documentation. +# The default value is: NO. SORT_MEMBERS_CTORS_1ST = NO -# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the -# hierarchy of group names into alphabetical order. If set to NO (the default) -# the group names will appear in their defined order. +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy +# of group names into alphabetical order. If set to NO the group names will +# appear in their defined order. +# The default value is: NO. SORT_GROUP_NAMES = NO -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by +# fully-qualified names, including namespaces. If set to NO, the class list will +# be sorted only by class name, not including the namespace part. # Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the -# alphabetical list. +# Note: This option applies only to the class list, not to the alphabetical +# list. +# The default value is: NO. SORT_BY_SCOPE_NAME = NO -# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to -# do proper type resolution of all parameters of a function it will reject a -# match between the prototype and the implementation of a member function even -# if there is only one candidate or it is obvious which candidate to choose -# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen -# will still accept a match between prototype and implementation in such cases. +# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper +# type resolution of all parameters of a function it will reject a match between +# the prototype and the implementation of a member function even if there is +# only one candidate or it is obvious which candidate to choose by doing a +# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still +# accept a match between prototype and implementation in such cases. +# The default value is: NO. STRICT_PROTO_MATCHING = NO -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo -# commands in the documentation. +# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo +# list. This list is created by putting \todo commands in the documentation. +# The default value is: YES. GENERATE_TODOLIST = YES -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test -# commands in the documentation. +# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test +# list. This list is created by putting \test commands in the documentation. +# The default value is: YES. GENERATE_TESTLIST = YES -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug -# commands in the documentation. +# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug +# list. This list is created by putting \bug commands in the documentation. +# The default value is: YES. GENERATE_BUGLIST = YES -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting -# \deprecated commands in the documentation. +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO) +# the deprecated list. This list is created by putting \deprecated commands in +# the documentation. +# The default value is: YES. GENERATE_DEPRECATEDLIST= YES -# The ENABLED_SECTIONS tag can be used to enable conditional -# documentation sections, marked by \if sectionname ... \endif. +# The ENABLED_SECTIONS tag can be used to enable conditional documentation +# sections, marked by \if ... \endif and \cond +# ... \endcond blocks. ENABLED_SECTIONS = -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or macro consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and macros in the -# documentation can be controlled using \showinitializer or \hideinitializer -# command in the documentation regardless of this setting. +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the +# initial value of a variable or macro / define can have for it to appear in the +# documentation. If the initializer consists of more lines than specified here +# it will be hidden. Use a value of 0 to hide initializers completely. The +# appearance of the value of individual variables and macros / defines can be +# controlled using \showinitializer or \hideinitializer command in the +# documentation regardless of this setting. +# Minimum value: 0, maximum value: 10000, default value: 30. MAX_INITIALIZER_LINES = 30 -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at +# the bottom of the documentation of classes and structs. If set to YES, the # list will mention the files that were used to generate the documentation. +# The default value is: YES. SHOW_USED_FILES = YES -# If the sources in your project are distributed over multiple directories -# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy -# in the documentation. The default is NO. - -SHOW_DIRECTORIES = NO - -# Set the SHOW_FILES tag to NO to disable the generation of the Files page. -# This will remove the Files entry from the Quick Index and from the -# Folder Tree View (if specified). The default is YES. +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This +# will remove the Files entry from the Quick Index and from the Folder Tree View +# (if specified). +# The default value is: YES. SHOW_FILES = YES -# Set the SHOW_NAMESPACES tag to NO to disable the generation of the -# Namespaces page. -# This will remove the Namespaces entry from the Quick Index -# and from the Folder Tree View (if specified). The default is YES. +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces +# page. This will remove the Namespaces entry from the Quick Index and from the +# Folder Tree View (if specified). +# The default value is: YES. SHOW_NAMESPACES = YES # The FILE_VERSION_FILTER tag can be used to specify a program or script that # doxygen should invoke to get the current version for each file (typically from # the version control system). Doxygen will invoke the program by executing (via -# popen()) the command , where is the value of -# the FILE_VERSION_FILTER tag, and is the name of an input file -# provided by doxygen. Whatever the program writes to standard output -# is used as the file version. See the manual for examples. +# popen()) the command command input-file, where command is the value of the +# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided +# by doxygen. Whatever the program writes to standard output is used as the file +# version. For an example see the documentation. FILE_VERSION_FILTER = # The LAYOUT_FILE tag can be used to specify a layout file which will be parsed # by doxygen. The layout file controls the global structure of the generated -# output files in an output format independent way. The create the layout file -# that represents doxygen's defaults, run doxygen with the -l option. -# You can optionally specify a file name after the option, if omitted -# DoxygenLayout.xml will be used as the name of the layout file. +# output files in an output format independent way. To create the layout file +# that represents doxygen's defaults, run doxygen with the -l option. You can +# optionally specify a file name after the option, if omitted DoxygenLayout.xml +# will be used as the name of the layout file. +# +# Note that if you run doxygen from a directory containing a file called +# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE +# tag is left empty. LAYOUT_FILE = +# The CITE_BIB_FILES tag can be used to specify one or more bib files containing +# the reference definitions. This must be a list of .bib files. The .bib +# extension is automatically appended if omitted. This requires the bibtex tool +# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# For LaTeX the style of the bibliography can be controlled using +# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the +# search path. See also \cite for info how to create references. + +CITE_BIB_FILES = + #--------------------------------------------------------------------------- -# configuration options related to warning and progress messages +# Configuration options related to warning and progress messages #--------------------------------------------------------------------------- -# The QUIET tag can be used to turn on/off the messages that are generated -# by doxygen. Possible values are YES and NO. If left blank NO is used. +# The QUIET tag can be used to turn on/off the messages that are generated to +# standard output by doxygen. If QUIET is set to YES this implies that the +# messages are off. +# The default value is: NO. QUIET = YES # The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank -# NO is used. +# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES +# this implies that the warnings are on. +# +# Tip: Turn warnings on while writing the documentation. +# The default value is: YES. WARNINGS = YES -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will -# automatically be disabled. +# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate +# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: YES. WARN_IF_UNDOCUMENTED = YES -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that -# don't exist or using markup commands wrongly. +# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some parameters +# in a documented function, or documenting parameters that don't exist or using +# markup commands wrongly. +# The default value is: YES. WARN_IF_DOC_ERROR = YES -# The WARN_NO_PARAMDOC option can be enabled to get warnings for -# functions that are documented, but have no documentation for their parameters -# or return value. If set to NO (the default) doxygen will only warn about -# wrong or incomplete parameter documentation, but not about the absence of -# documentation. +# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that +# are documented, but have no documentation for their parameters or return +# value. If set to NO, doxygen will only warn about wrong or incomplete +# parameter documentation, but not about the absence of documentation. +# The default value is: NO. WARN_NO_PARAMDOC = NO -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. Optionally the format may contain -# $version, which will be replaced by the version of the file (if it could -# be obtained via FILE_VERSION_FILTER) +# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when +# a warning is encountered. +# The default value is: NO. + +WARN_AS_ERROR = NO + +# The WARN_FORMAT tag determines the format of the warning messages that doxygen +# can produce. The string should contain the $file, $line, and $text tags, which +# will be replaced by the file and line number from which the warning originated +# and the warning text. Optionally the format may contain $version, which will +# be replaced by the version of the file (if it could be obtained via +# FILE_VERSION_FILTER) +# The default value is: $file:$line: $text. WARN_FORMAT = -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written -# to stderr. +# The WARN_LOGFILE tag can be used to specify a file to which warning and error +# messages should be written. If left blank the output is written to standard +# error (stderr). WARN_LOGFILE = #--------------------------------------------------------------------------- -# configuration options related to the input files +# Configuration options related to the input files #--------------------------------------------------------------------------- -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories -# with spaces. +# The INPUT tag is used to specify the files and/or directories that contain +# documented source files. You may enter file names like myfile.cpp or +# directories like /usr/src/myproject. Separate the files or directories with +# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING +# Note: If this tag is empty the current directory is searched. -INPUT = @top_srcdir@ +INPUT = @-top_srcdir-@ # This tag can be used to specify the character encoding of the source files -# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is -# also the default input encoding. Doxygen uses libiconv (or the iconv built -# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for -# the list of possible encodings. +# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses +# libiconv (or the iconv built into libc) for the transcoding. See the libiconv +# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# possible encodings. +# The default value is: UTF-8. INPUT_ENCODING = UTF-8 # If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh -# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py -# *.f90 *.f *.for *.vhd *.vhdl - -FILE_PATTERNS = *.cpp *.h - -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. -# If left blank NO is used. +# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and +# *.h) to filter out the source-files in the directories. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# read by doxygen. +# +# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp, +# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, +# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, +# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f, *.for, *.tcl, +# *.vhd, *.vhdl, *.ucf, *.qsf, *.as and *.js. + +FILE_PATTERNS = *.cpp \ + *.h + +# The RECURSIVE tag can be used to specify whether or not subdirectories should +# be searched for input files as well. +# The default value is: NO. RECURSIVE = YES -# The EXCLUDE tag can be used to specify files and/or directories that should +# The EXCLUDE tag can be used to specify files and/or directories that should be # excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. +# +# Note that relative paths are relative to the directory from which doxygen is +# run. EXCLUDE = -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or # directories that are symbolic links (a Unix file system feature) are excluded # from the input. +# The default value is: NO. EXCLUDE_SYMLINKS = NO # If the value of the INPUT tag contains directories, you can use the # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. Note that the wildcards are matched -# against the file with absolute path, so to exclude all test directories -# for example use the pattern */test/* +# certain files from those directories. +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories for example use the pattern */test/* EXCLUDE_PATTERNS = @@ -661,740 +835,1149 @@ # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, # AClass::ANamespace, ANamespace::*Test +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories use the pattern */test/* EXCLUDE_SYMBOLS = -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see -# the \include command). +# The EXAMPLE_PATH tag can be used to specify one or more files or directories +# that contain example code fragments that are included (see the \include +# command). EXAMPLE_PATH = # If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank all files are included. +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and +# *.h) to filter out the source-files in the directories. If left blank all +# files are included. EXAMPLE_PATTERNS = # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. -# Possible values are YES and NO. If left blank NO is used. +# searched for input files to be used with the \include or \dontinclude commands +# irrespective of the value of the RECURSIVE tag. +# The default value is: NO. EXAMPLE_RECURSIVE = NO -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see -# the \image command). +# The IMAGE_PATH tag can be used to specify one or more files or directories +# that contain images that are to be included in the documentation (see the +# \image command). IMAGE_PATH = # The INPUT_FILTER tag can be used to specify a program that doxygen should # invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command , where -# is the value of the INPUT_FILTER tag, and is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. -# If FILTER_PATTERNS is specified, this tag will be -# ignored. +# by executing (via popen()) the command: +# +# +# +# where is the value of the INPUT_FILTER tag, and is the +# name of an input file. Doxygen will then use the output that the filter +# program writes to standard output. If FILTER_PATTERNS is specified, this tag +# will be ignored. +# +# Note that the filter must not add or remove lines; it is applied before the +# code is scanned, but not when the output code is generated. If lines are added +# or removed, the anchors will not be placed correctly. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# properly processed by doxygen. INPUT_FILTER = # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. -# Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. -# The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty or if -# non of the patterns match the file name, INPUT_FILTER is applied. +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: pattern=filter +# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how +# filters are used. If the FILTER_PATTERNS tag is empty or if none of the +# patterns match the file name, INPUT_FILTER is applied. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# properly processed by doxygen. FILTER_PATTERNS = # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source -# files to browse (i.e. when SOURCE_BROWSER is set to YES). +# INPUT_FILTER) will also be used to filter the input files that are used for +# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES). +# The default value is: NO. FILTER_SOURCE_FILES = NO # The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file -# pattern. A pattern will override the setting for FILTER_PATTERN (if any) -# and it is also possible to disable source filtering for a specific pattern -# using *.ext= (so without naming a filter). This option only has effect when -# FILTER_SOURCE_FILES is enabled. +# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and +# it is also possible to disable source filtering for a specific pattern using +# *.ext= (so without naming a filter). +# This tag requires that the tag FILTER_SOURCE_FILES is set to YES. FILTER_SOURCE_PATTERNS = +# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that +# is part of the input, its contents will be placed on the main page +# (index.html). This can be useful if you have a project on for instance GitHub +# and want to reuse the introduction page also for the doxygen output. + +USE_MDFILE_AS_MAINPAGE = + #--------------------------------------------------------------------------- -# configuration options related to source browsing +# Configuration options related to source browsing #--------------------------------------------------------------------------- -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also -# VERBATIM_HEADERS is set to NO. +# If the SOURCE_BROWSER tag is set to YES then a list of source files will be +# generated. Documented entities will be cross-referenced with these sources. +# +# Note: To get rid of all source code in the generated output, make sure that +# also VERBATIM_HEADERS is set to NO. +# The default value is: NO. SOURCE_BROWSER = YES -# Setting the INLINE_SOURCES tag to YES will include the body -# of functions and classes directly in the documentation. +# Setting the INLINE_SOURCES tag to YES will include the body of functions, +# classes and enums directly into the documentation. +# The default value is: NO. INLINE_SOURCES = NO -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code -# fragments. Normal C and C++ comments will always remain visible. +# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any +# special comment blocks from generated source code fragments. Normal C, C++ and +# Fortran comments will always remain visible. +# The default value is: YES. STRIP_CODE_COMMENTS = YES -# If the REFERENCED_BY_RELATION tag is set to YES -# then for each documented function all documented -# functions referencing it will be listed. +# If the REFERENCED_BY_RELATION tag is set to YES then for each documented +# function all documented functions referencing it will be listed. +# The default value is: NO. REFERENCED_BY_RELATION = YES -# If the REFERENCES_RELATION tag is set to YES -# then for each documented function all documented entities -# called/used by that function will be listed. +# If the REFERENCES_RELATION tag is set to YES then for each documented function +# all documented entities called/used by that function will be listed. +# The default value is: NO. REFERENCES_RELATION = YES -# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) -# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from -# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will -# link to the source code. -# Otherwise they will link to the documentation. +# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set +# to YES then the hyperlinks from functions in REFERENCES_RELATION and +# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will +# link to the documentation. +# The default value is: YES. REFERENCES_LINK_SOURCE = YES -# If the USE_HTAGS tag is set to YES then the references to source code -# will point to the HTML generated by the htags(1) tool instead of doxygen -# built-in source browser. The htags tool is part of GNU's global source -# tagging system (see http://www.gnu.org/software/global/global.html). You -# will need version 4.8.6 or higher. +# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the +# source code will show a tooltip with additional information such as prototype, +# brief description and links to the definition and documentation. Since this +# will make the HTML file larger and loading of large files a bit slower, you +# can opt to disable this feature. +# The default value is: YES. +# This tag requires that the tag SOURCE_BROWSER is set to YES. + +SOURCE_TOOLTIPS = YES + +# If the USE_HTAGS tag is set to YES then the references to source code will +# point to the HTML generated by the htags(1) tool instead of doxygen built-in +# source browser. The htags tool is part of GNU's global source tagging system +# (see http://www.gnu.org/software/global/global.html). You will need version +# 4.8.6 or higher. +# +# To use it do the following: +# - Install the latest version of global +# - Enable SOURCE_BROWSER and USE_HTAGS in the config file +# - Make sure the INPUT points to the root of the source tree +# - Run doxygen as normal +# +# Doxygen will invoke htags (and that will in turn invoke gtags), so these +# tools must be available from the command line (i.e. in the search path). +# +# The result: instead of the source browser generated by doxygen, the links to +# source code will now point to the output of htags. +# The default value is: NO. +# This tag requires that the tag SOURCE_BROWSER is set to YES. USE_HTAGS = NO -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for -# which an include is specified. Set to NO to disable this. +# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a +# verbatim copy of the header file for each class for which an include is +# specified. Set to NO to disable this. +# See also: Section \class. +# The default value is: YES. VERBATIM_HEADERS = YES +# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the +# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the +# cost of reduced performance. This can be particularly helpful with template +# rich C++ code for which doxygen's built-in parser lacks the necessary type +# information. +# Note: The availability of this option depends on whether or not doxygen was +# generated with the -Duse-libclang=ON option for CMake. +# The default value is: NO. + +CLANG_ASSISTED_PARSING = NO + +# If clang assisted parsing is enabled you can provide the compiler with command +# line options that you would normally use when invoking the compiler. Note that +# the include paths will already be set by doxygen for the files and directories +# specified with INPUT and INCLUDE_PATH. +# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES. + +CLANG_OPTIONS = + #--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index +# Configuration options related to the alphabetical class index #--------------------------------------------------------------------------- -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project -# contains a lot of classes, structs, unions or interfaces. +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all +# compounds will be generated. Enable this if the project contains a lot of +# classes, structs, unions or interfaces. +# The default value is: YES. ALPHABETICAL_INDEX = NO -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns -# in which this list will be split (can be a number in the range [1..20]) +# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in +# which the alphabetical index list will be split. +# Minimum value: 1, maximum value: 20, default value: 5. +# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. COLS_IN_ALPHA_INDEX = 5 -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that -# should be ignored while generating the index headers. +# In case all classes in a project start with a common prefix, all classes will +# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag +# can be used to specify a prefix (or a list of prefixes) that should be ignored +# while generating the index headers. +# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = #--------------------------------------------------------------------------- -# configuration options related to the HTML output +# Configuration options related to the HTML output #--------------------------------------------------------------------------- -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will -# generate HTML output. +# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output +# The default value is: YES. GENERATE_HTML = YES -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `html' will be used as the default path. +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. +# The default directory is: html. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_OUTPUT = @-html_dir-@ -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank -# doxygen will generate files with .html extension. +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each +# generated HTML page (for example: .htm, .php, .asp). +# The default value is: .html. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_FILE_EXTENSION = -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a -# standard header. Note that when using a custom header you are responsible -# for the proper inclusion of any scripts and style sheets that doxygen -# needs, which is dependent on the configuration options used. -# It is adviced to generate a default header using "doxygen -w html -# header.html footer.html stylesheet.css YourConfigFile" and then modify -# that header. Note that the header is subject to change so you typically -# have to redo this when upgrading to a newer version of doxygen or when changing the value of configuration settings such as GENERATE_TREEVIEW! +# The HTML_HEADER tag can be used to specify a user-defined HTML header file for +# each generated HTML page. If the tag is left blank doxygen will generate a +# standard header. +# +# To get valid HTML the header file that includes any scripts and style sheets +# that doxygen needs, which is dependent on the configuration options used (e.g. +# the setting GENERATE_TREEVIEW). It is highly recommended to start with a +# default header using +# doxygen -w html new_header.html new_footer.html new_stylesheet.css +# YourConfigFile +# and then modify the file new_header.html. See also section "Doxygen usage" +# for information on how to generate the default header that doxygen normally +# uses. +# Note: The header is subject to change so you typically have to regenerate the +# default header when upgrading to a newer version of doxygen. For a description +# of the possible markers and block names see the documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_HEADER = -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a -# standard footer. +# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each +# generated HTML page. If the tag is left blank doxygen will generate a standard +# footer. See HTML_HEADER for more information on how to generate a default +# footer and what special commands can be used inside the footer. See also +# section "Doxygen usage" for information on how to generate the default footer +# that doxygen normally uses. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_FOOTER = -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own -# stylesheet in the HTML output directory as well, or it will be erased! +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style +# sheet that is used by each HTML page. It can be used to fine-tune the look of +# the HTML output. If left blank doxygen will generate a default style sheet. +# See also section "Doxygen usage" for information on how to generate the style +# sheet that doxygen normally uses. +# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as +# it is more robust and this tag (HTML_STYLESHEET) will in the future become +# obsolete. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_STYLESHEET = +# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined +# cascading style sheets that are included after the standard style sheets +# created by doxygen. Using this option one can overrule certain style aspects. +# This is preferred over using HTML_STYLESHEET since it does not replace the +# standard style sheet and is therefore more robust against future updates. +# Doxygen will copy the style sheet files to the output directory. +# Note: The order of the extra style sheet files is of importance (e.g. the last +# style sheet in the list overrules the setting of the previous ones in the +# list). For an example see the documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_EXTRA_STYLESHEET = + # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or # other source files which should be copied to the HTML output directory. Note # that these files will be copied to the base HTML output directory. Use the -# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these -# files. In the HTML_STYLESHEET file, use the file name only. Also note that -# the files will be copied as-is; there are no commands or markers available. +# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these +# files. In the HTML_STYLESHEET file, use the file name only. Also note that the +# files will be copied as-is; there are no commands or markers available. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_FILES = -# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. -# Doxygen will adjust the colors in the stylesheet and background images -# according to this color. Hue is specified as an angle on a colorwheel, -# see http://en.wikipedia.org/wiki/Hue for more information. -# For instance the value 0 represents red, 60 is yellow, 120 is green, -# 180 is cyan, 240 is blue, 300 purple, and 360 is red again. -# The allowed range is 0 to 359. +# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen +# will adjust the colors in the style sheet and background images according to +# this color. Hue is specified as an angle on a colorwheel, see +# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 +# purple, and 360 is red again. +# Minimum value: 0, maximum value: 359, default value: 220. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_COLORSTYLE_HUE = 220 -# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of -# the colors in the HTML output. For a value of 0 the output will use -# grayscales only. A value of 255 will produce the most vivid colors. +# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors +# in the HTML output. For a value of 0 the output will use grayscales only. A +# value of 255 will produce the most vivid colors. +# Minimum value: 0, maximum value: 255, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_COLORSTYLE_SAT = 100 -# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to -# the luminance component of the colors in the HTML output. Values below -# 100 gradually make the output lighter, whereas values above 100 make -# the output darker. The value divided by 100 is the actual gamma applied, -# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2, -# and 100 does not change the gamma. +# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the +# luminance component of the colors in the HTML output. Values below 100 +# gradually make the output lighter, whereas values above 100 make the output +# darker. The value divided by 100 is the actual gamma applied, so 80 represents +# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not +# change the gamma. +# Minimum value: 40, maximum value: 240, default value: 80. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_COLORSTYLE_GAMMA = 80 # If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML -# page will contain the date and time when the page was generated. Setting -# this to NO can help when comparing the output of multiple runs. +# page will contain the date and time when the page was generated. Setting this +# to YES can help to show when doxygen was last run and thus if the +# documentation is up to date. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_TIMESTAMP = YES -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to -# NO a bullet list will be used. - -HTML_ALIGN_MEMBERS = YES - # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the -# page has loaded. For this to work a browser that supports -# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox -# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). +# page has loaded. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_DYNAMIC_SECTIONS = NO -# If the GENERATE_DOCSET tag is set to YES, additional index files -# will be generated that can be used as input for Apple's Xcode 3 -# integrated development environment, introduced with OSX 10.5 (Leopard). -# To create a documentation set, doxygen will generate a Makefile in the -# HTML output directory. Running make will produce the docset in that -# directory and running "make install" will install the docset in -# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find -# it at startup. -# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries +# shown in the various tree structured indices initially; the user can expand +# and collapse entries dynamically later on. Doxygen will expand the tree to +# such a level that at most the specified number of entries are visible (unless +# a fully collapsed tree already exceeds this amount). So setting the number of +# entries 1 will produce a full collapsed tree by default. 0 is a special value +# representing an infinite number of entries and will result in a full expanded +# tree by default. +# Minimum value: 0, maximum value: 9999, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_INDEX_NUM_ENTRIES = 100 + +# If the GENERATE_DOCSET tag is set to YES, additional index files will be +# generated that can be used as input for Apple's Xcode 3 integrated development +# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a +# Makefile in the HTML output directory. Running make will produce the docset in +# that directory and running make install will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at +# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. GENERATE_DOCSET = NO -# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the -# feed. A documentation feed provides an umbrella under which multiple -# documentation sets from a single provider (such as a company or product suite) -# can be grouped. +# This tag determines the name of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# The default value is: Doxygen generated docs. +# This tag requires that the tag GENERATE_DOCSET is set to YES. DOCSET_FEEDNAME = "Doxygen generated docs" -# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that -# should uniquely identify the documentation set bundle. This should be a -# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen -# will append .docset to the name. +# This tag specifies a string that should uniquely identify the documentation +# set bundle. This should be a reverse domain-name style string, e.g. +# com.mycompany.MyDocSet. Doxygen will append .docset to the name. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_DOCSET is set to YES. DOCSET_BUNDLE_ID = org.doxygen.Project -# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify +# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify # the documentation publisher. This should be a reverse domain-name style # string, e.g. com.mycompany.MyDocSet.documentation. +# The default value is: org.doxygen.Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. DOCSET_PUBLISHER_ID = org.doxygen.Publisher -# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher. +# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. +# The default value is: Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. DOCSET_PUBLISHER_NAME = Publisher -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) -# of the generated HTML documentation. +# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three +# additional HTML index files: index.hhp, index.hhc, and index.hhk. The +# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop +# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on +# Windows. +# +# The HTML Help Workshop contains a compiler that can convert all HTML output +# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML +# files are now used as the Windows 98 help format, and will replace the old +# Windows help format (.hlp) on all Windows platforms in the future. Compressed +# HTML files also contain an index, a table of contents, and you can search for +# words in the documentation. The HTML workshop also contains a viewer for +# compressed HTML files. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. GENERATE_HTMLHELP = NO -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be +# The CHM_FILE tag can be used to specify the file name of the resulting .chm +# file. You can add a path in front of the file if the result should not be # written to the html output directory. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. CHM_FILE = -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run -# the HTML help compiler on the generated index.hhp. +# The HHC_LOCATION tag can be used to specify the location (absolute path +# including file name) of the HTML help compiler (hhc.exe). If non-empty, +# doxygen will try to run the HTML help compiler on the generated index.hhp. +# The file has to be specified with full path. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. HHC_LOCATION = -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that -# it should be included in the master .chm file (NO). +# The GENERATE_CHI flag controls if a separate .chi index file is generated +# (YES) or that it should be included in the master .chm file (NO). +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. GENERATE_CHI = NO -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING -# is used to encode HtmlHelp index (hhk), content (hhc) and project file -# content. +# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc) +# and project file content. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. CHM_INDEX_ENCODING = -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a -# normal table of contents (NO) in the .chm file. +# The BINARY_TOC flag controls whether a binary table of contents is generated +# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it +# enables the Previous and Next buttons. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. BINARY_TOC = NO -# The TOC_EXPAND flag can be set to YES to add extra items for group members -# to the contents of the HTML help documentation and to the tree view. +# The TOC_EXPAND flag can be set to YES to add extra items for group members to +# the table of contents of the HTML help documentation and to the tree view. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. TOC_EXPAND = NO # If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and -# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated -# that can be used as input for Qt's qhelpgenerator to generate a -# Qt Compressed Help (.qch) of the generated HTML documentation. +# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that +# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help +# (.qch) of the generated HTML documentation. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. GENERATE_QHP = NO -# If the QHG_LOCATION tag is specified, the QCH_FILE tag can -# be used to specify the file name of the resulting .qch file. -# The path specified is relative to the HTML output folder. +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify +# the file name of the resulting .qch file. The path specified is relative to +# the HTML output folder. +# This tag requires that the tag GENERATE_QHP is set to YES. QCH_FILE = -# The QHP_NAMESPACE tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see -# http://doc.trolltech.com/qthelpproject.html#namespace +# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help +# Project output. For more information please see Qt Help Project / Namespace +# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_QHP is set to YES. QHP_NAMESPACE = org.doxygen.Project -# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see -# http://doc.trolltech.com/qthelpproject.html#virtual-folders +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt +# Help Project output. For more information please see Qt Help Project / Virtual +# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- +# folders). +# The default value is: doc. +# This tag requires that the tag GENERATE_QHP is set to YES. QHP_VIRTUAL_FOLDER = doc -# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to -# add. For more information please see -# http://doc.trolltech.com/qthelpproject.html#custom-filters +# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom +# filter to add. For more information please see Qt Help Project / Custom +# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- +# filters). +# This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = -# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the -# custom filter to add. For more information please see -# -# Qt Help Project / Custom Filters. +# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the +# custom filter to add. For more information please see Qt Help Project / Custom +# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- +# filters). +# This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this -# project's -# filter section matches. -# -# Qt Help Project / Filter Attributes. +# project's filter section matches. Qt Help Project / Filter Attributes (see: +# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = -# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can -# be used to specify the location of Qt's qhelpgenerator. -# If non-empty doxygen will try to run qhelpgenerator on the generated -# .qhp file. +# The QHG_LOCATION tag can be used to specify the location of Qt's +# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the +# generated .qhp file. +# This tag requires that the tag GENERATE_QHP is set to YES. QHG_LOCATION = -# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files -# will be generated, which together with the HTML files, form an Eclipse help -# plugin. To install this plugin and make it available under the help contents -# menu in Eclipse, the contents of the directory containing the HTML and XML -# files needs to be copied into the plugins directory of eclipse. The name of -# the directory within the plugins directory should be the same as -# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before -# the help appears. +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be +# generated, together with the HTML files, they form an Eclipse help plugin. To +# install this plugin and make it available under the help contents menu in +# Eclipse, the contents of the directory containing the HTML and XML files needs +# to be copied into the plugins directory of eclipse. The name of the directory +# within the plugins directory should be the same as the ECLIPSE_DOC_ID value. +# After copying Eclipse needs to be restarted before the help appears. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. GENERATE_ECLIPSEHELP = NO -# A unique identifier for the eclipse help plugin. When installing the plugin -# the directory name containing the HTML and XML files should also have -# this name. +# A unique identifier for the Eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have this +# name. Each documentation set should have its own identifier. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES. ECLIPSE_DOC_ID = org.doxygen.Project -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and -# the value YES disables it. +# If you want full control over the layout of the generated HTML pages it might +# be necessary to disable the index and replace it with your own. The +# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top +# of each HTML page. A value of NO enables the index and the value YES disables +# it. Since the tabs in the index contain the same information as the navigation +# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. DISABLE_INDEX = NO -# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values -# (range [0,1..20]) that doxygen will group on one line in the generated HTML -# documentation. Note that a value of 0 will completely suppress the enum -# values from appearing in the overview section. - -ENUM_VALUES_PER_LINE = 4 - # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index -# structure should be generated to display hierarchical information. -# If the tag value is set to YES, a side panel will be generated -# containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). -# Windows users are probably better off using the HTML help feature. +# structure should be generated to display hierarchical information. If the tag +# value is set to YES, a side panel will be generated containing a tree-like +# index structure (just like the one that is generated for HTML Help). For this +# to work a browser that supports JavaScript, DHTML, CSS and frames is required +# (i.e. any modern browser). Windows users are probably better off using the +# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can +# further fine-tune the look of the index. As an example, the default style +# sheet generated by doxygen has an example that shows how to put an image at +# the root of the tree instead of the PROJECT_NAME. Since the tree basically has +# the same information as the tab index, you could consider setting +# DISABLE_INDEX to YES when enabling this option. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. GENERATE_TREEVIEW = YES -# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, -# and Class Hierarchy pages using a tree view instead of an ordered list. +# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that +# doxygen will group on one line in the generated HTML documentation. +# +# Note that a value of 0 will completely suppress the enum values from appearing +# in the overview section. +# Minimum value: 0, maximum value: 20, default value: 4. +# This tag requires that the tag GENERATE_HTML is set to YES. -USE_INLINE_TREES = NO +ENUM_VALUES_PER_LINE = 4 -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree -# is shown. +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used +# to set the initial width (in pixels) of the frame in which the tree is shown. +# Minimum value: 0, maximum value: 1500, default value: 250. +# This tag requires that the tag GENERATE_HTML is set to YES. TREEVIEW_WIDTH = 250 -# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open -# links to external symbols imported via tag files in a separate window. +# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to +# external symbols imported via tag files in a separate window. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. EXT_LINKS_IN_WINDOW = NO -# Use this tag to change the font size of Latex formulas included -# as images in the HTML documentation. The default is 10. Note that -# when you change the font size after a successful doxygen run you need -# to manually remove any form_*.png images from the HTML output directory -# to force them to be regenerated. +# Use this tag to change the font size of LaTeX formulas included as images in +# the HTML documentation. When you change the font size after a successful +# doxygen run you need to manually remove any form_*.png images from the HTML +# output directory to force them to be regenerated. +# Minimum value: 8, maximum value: 50, default value: 10. +# This tag requires that the tag GENERATE_HTML is set to YES. FORMULA_FONTSIZE = 10 # Use the FORMULA_TRANPARENT tag to determine whether or not the images -# generated for formulas are transparent PNGs. Transparent PNGs are -# not supported properly for IE 6.0, but are supported on all modern browsers. -# Note that when changing this option you need to delete any form_*.png files -# in the HTML output before the changes have effect. +# generated for formulas are transparent PNGs. Transparent PNGs are not +# supported properly for IE 6.0, but are supported on all modern browsers. +# +# Note that when changing this option you need to delete any form_*.png files in +# the HTML output directory before the changes have effect. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. FORMULA_TRANSPARENT = YES -# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax -# (see http://www.mathjax.org) which uses client side Javascript for the -# rendering instead of using prerendered bitmaps. Use this if you do not -# have LaTeX installed or if you want to formulas look prettier in the HTML -# output. When enabled you also need to install MathJax separately and -# configure the path to it using the MATHJAX_RELPATH option. +# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see +# http://www.mathjax.org) which uses client side Javascript for the rendering +# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX +# installed or if you want to formulas look prettier in the HTML output. When +# enabled you may also need to install MathJax separately and configure the path +# to it using the MATHJAX_RELPATH option. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. USE_MATHJAX = NO -# When MathJax is enabled you need to specify the location relative to the -# HTML output directory using the MATHJAX_RELPATH option. The destination -# directory should contain the MathJax.js script. For instance, if the mathjax -# directory is located at the same level as the HTML output directory, then -# MATHJAX_RELPATH should be ../mathjax. The default value points to the -# mathjax.org site, so you can quickly see the result without installing -# MathJax, but it is strongly recommended to install a local copy of MathJax -# before deployment. +# When MathJax is enabled you can set the default output format to be used for +# the MathJax output. See the MathJax site (see: +# http://docs.mathjax.org/en/latest/output.html) for more details. +# Possible values are: HTML-CSS (which is slower, but has the best +# compatibility), NativeMML (i.e. MathML) and SVG. +# The default value is: HTML-CSS. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_FORMAT = HTML-CSS + +# When MathJax is enabled you need to specify the location relative to the HTML +# output directory using the MATHJAX_RELPATH option. The destination directory +# should contain the MathJax.js script. For instance, if the mathjax directory +# is located at the same level as the HTML output directory, then +# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax +# Content Delivery Network so you can quickly see the result without installing +# MathJax. However, it is strongly recommended to install a local copy of +# MathJax from http://www.mathjax.org before deployment. +# The default value is: http://cdn.mathjax.org/mathjax/latest. +# This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://www.mathjax.org/mathjax -# When the SEARCHENGINE tag is enabled doxygen will generate a search box -# for the HTML output. The underlying search engine uses javascript -# and DHTML and should work on any modern browser. Note that when using -# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets -# (GENERATE_DOCSET) there is already a search function so this one should -# typically be disabled. For large projects the javascript based search engine -# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. +# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax +# extension names that should be enabled during MathJax rendering. For example +# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_EXTENSIONS = + +# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces +# of code that will be used on startup of the MathJax code. See the MathJax site +# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an +# example see the documentation. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_CODEFILE = + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box for +# the HTML output. The underlying search engine uses javascript and DHTML and +# should work on any modern browser. Note that when using HTML help +# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) +# there is already a search function so this one should typically be disabled. +# For large projects the javascript based search engine can be slow, then +# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to +# search using the keyboard; to jump to the search box use + S +# (what the is depends on the OS and browser, but it is typically +# , /