update translations for 5.4.0 alpha1

and force-fix errors using pocheck

Change-Id: Idd8a43ec96b75f779aab472e67c1471299160b87

1 files changed, 259 insertions, 276 deletions

diff --git a/source/et/basic/source/classes.po b/source/et/basic/source/classes.po
index 62da8309642..d30f1952650 100644
--- a/source/et/basic/source/classes.po
+++ b/source/et/basic/source/classes.po
@@ -3,25 +3,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2015-08-25 12:33+0200\n"
-"PO-Revision-Date: 2015-08-25 19:48+0000\n"
-"Last-Translator: system user <>\n"
+"POT-Creation-Date: 2017-04-12 14:13+0200\n"
+"PO-Revision-Date: 2015-10-22 11:53+0000\n"
+"Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1440532089.000000\n"
+"X-Generator: LibreOffice\n"
+"X-POOTLE-MTIME: 1445514818.000000\n"
 
 #: sb.src
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_SYNTAX & ERRCODE_RES_MASK\n"
-"string.text"
+"Syntax error.\n"
+"itemlist.text"
 msgid "Syntax error."
 msgstr "Süntaksiviga."
 
@@ -29,8 +29,8 @@ msgstr "Süntaksiviga."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_NO_GOSUB & ERRCODE_RES_MASK\n"
-"string.text"
+"Return without Gosub.\n"
+"itemlist.text"
 msgid "Return without Gosub."
 msgstr "Return ilma Gosub'ita."
 
@@ -38,8 +38,8 @@ msgstr "Return ilma Gosub'ita."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_REDO_FROM_START & ERRCODE_RES_MASK\n"
-"string.text"
+"Incorrect entry; please retry.\n"
+"itemlist.text"
 msgid "Incorrect entry; please retry."
 msgstr "Vigane sisestus; palun proovi uuesti."
 
@@ -47,8 +47,8 @@ msgstr "Vigane sisestus; palun proovi uuesti."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_BAD_ARGUMENT & ERRCODE_RES_MASK\n"
-"string.text"
+"Invalid procedure call.\n"
+"itemlist.text"
 msgid "Invalid procedure call."
 msgstr "Vigane protseduuri väljakutse."
 
@@ -56,8 +56,8 @@ msgstr "Vigane protseduuri väljakutse."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_MATH_OVERFLOW & ERRCODE_RES_MASK\n"
-"string.text"
+"Overflow.\n"
+"itemlist.text"
 msgid "Overflow."
 msgstr "Ületäitumine."
 
@@ -65,8 +65,8 @@ msgstr "Ületäitumine."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_NO_MEMORY & ERRCODE_RES_MASK\n"
-"string.text"
+"Not enough memory.\n"
+"itemlist.text"
 msgid "Not enough memory."
 msgstr "Vaba mälu pole piisavalt."
 
@@ -74,8 +74,8 @@ msgstr "Vaba mälu pole piisavalt."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_ALREADY_DIM & ERRCODE_RES_MASK\n"
-"string.text"
+"Array already dimensioned.\n"
+"itemlist.text"
 msgid "Array already dimensioned."
 msgstr "Massiiv on juba defineeritud."
 
@@ -83,8 +83,8 @@ msgstr "Massiiv on juba defineeritud."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_OUT_OF_RANGE & ERRCODE_RES_MASK\n"
-"string.text"
+"Index out of defined range.\n"
+"itemlist.text"
 msgid "Index out of defined range."
 msgstr "Indeks väljub defineeritud vahemikust."
 
@@ -92,8 +92,8 @@ msgstr "Indeks väljub defineeritud vahemikust."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_DUPLICATE_DEF & ERRCODE_RES_MASK\n"
-"string.text"
+"Duplicate definition.\n"
+"itemlist.text"
 msgid "Duplicate definition."
 msgstr "Topeltdefinitsioon."
 
@@ -101,8 +101,8 @@ msgstr "Topeltdefinitsioon."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_ZERODIV & ERRCODE_RES_MASK\n"
-"string.text"
+"Division by zero.\n"
+"itemlist.text"
 msgid "Division by zero."
 msgstr "Nulliga jagamine."
 
@@ -110,8 +110,8 @@ msgstr "Nulliga jagamine."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_VAR_UNDEFINED & ERRCODE_RES_MASK\n"
-"string.text"
+"Variable not defined.\n"
+"itemlist.text"
 msgid "Variable not defined."
 msgstr "Muutuja ei ole defineeritud."
 
@@ -119,8 +119,8 @@ msgstr "Muutuja ei ole defineeritud."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_CONVERSION & ERRCODE_RES_MASK\n"
-"string.text"
+"Data type mismatch.\n"
+"itemlist.text"
 msgid "Data type mismatch."
 msgstr "Andmetüüpide sobimatus."
 
@@ -128,8 +128,8 @@ msgstr "Andmetüüpide sobimatus."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_BAD_PARAMETER & ERRCODE_RES_MASK\n"
-"string.text"
+"Invalid parameter.\n"
+"itemlist.text"
 msgid "Invalid parameter."
 msgstr "Vigane parameeter."
 
@@ -137,8 +137,8 @@ msgstr "Vigane parameeter."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_USER_ABORT & ERRCODE_RES_MASK\n"
-"string.text"
+"Process interrupted by user.\n"
+"itemlist.text"
 msgid "Process interrupted by user."
 msgstr "Protsess katkestati kasutaja poolt."
 
@@ -146,8 +146,8 @@ msgstr "Protsess katkestati kasutaja poolt."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_BAD_RESUME & ERRCODE_RES_MASK\n"
-"string.text"
+"Resume without error.\n"
+"itemlist.text"
 msgid "Resume without error."
 msgstr "Jätkata ilma veata."
 
@@ -155,8 +155,8 @@ msgstr "Jätkata ilma veata."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_STACK_OVERFLOW & ERRCODE_RES_MASK\n"
-"string.text"
+"Not enough stack memory.\n"
+"itemlist.text"
 msgid "Not enough stack memory."
 msgstr "Pinumälu pole piisavalt."
 
@@ -164,8 +164,8 @@ msgstr "Pinumälu pole piisavalt."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_PROC_UNDEFINED & ERRCODE_RES_MASK\n"
-"string.text"
+"Sub-procedure or function procedure not defined.\n"
+"itemlist.text"
 msgid "Sub-procedure or function procedure not defined."
 msgstr "Alamprotseduur või funktsioon ei ole defineeritud."
 
@@ -173,8 +173,8 @@ msgstr "Alamprotseduur või funktsioon ei ole defineeritud."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_BAD_DLL_LOAD & ERRCODE_RES_MASK\n"
-"string.text"
+"Error loading DLL file.\n"
+"itemlist.text"
 msgid "Error loading DLL file."
 msgstr "Viga DLL-faili laadimisel."
 
@@ -182,8 +182,8 @@ msgstr "Viga DLL-faili laadimisel."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_BAD_DLL_CALL & ERRCODE_RES_MASK\n"
-"string.text"
+"Wrong DLL call convention.\n"
+"itemlist.text"
 msgid "Wrong DLL call convention."
 msgstr "Vale DLL-i väljakutse konventsioon."
 
@@ -191,8 +191,8 @@ msgstr "Vale DLL-i väljakutse konventsioon."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_INTERNAL_ERROR & ERRCODE_RES_MASK\n"
-"string.text"
+"Internal error $(ARG1).\n"
+"itemlist.text"
 msgid "Internal error $(ARG1)."
 msgstr "Sisemine viga $(ARG1)."
 
@@ -200,8 +200,8 @@ msgstr "Sisemine viga $(ARG1)."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_BAD_CHANNEL & ERRCODE_RES_MASK\n"
-"string.text"
+"Invalid file name or file number.\n"
+"itemlist.text"
 msgid "Invalid file name or file number."
 msgstr "Vigane failinimi või failide arv."
 
@@ -209,8 +209,8 @@ msgstr "Vigane failinimi või failide arv."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_FILE_NOT_FOUND & ERRCODE_RES_MASK\n"
-"string.text"
+"File not found.\n"
+"itemlist.text"
 msgid "File not found."
 msgstr "Faili ei leitud."
 
@@ -218,8 +218,8 @@ msgstr "Faili ei leitud."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_BAD_FILE_MODE & ERRCODE_RES_MASK\n"
-"string.text"
+"Incorrect file mode.\n"
+"itemlist.text"
 msgid "Incorrect file mode."
 msgstr "Vale failirežiim."
 
@@ -227,8 +227,8 @@ msgstr "Vale failirežiim."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_FILE_ALREADY_OPEN & ERRCODE_RES_MASK\n"
-"string.text"
+"File already open.\n"
+"itemlist.text"
 msgid "File already open."
 msgstr "Fail on juba avatud."
 
@@ -236,8 +236,8 @@ msgstr "Fail on juba avatud."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_IO_ERROR & ERRCODE_RES_MASK\n"
-"string.text"
+"Device I/O error.\n"
+"itemlist.text"
 msgid "Device I/O error."
 msgstr "Seadme sisend-/väljundviga."
 
@@ -245,8 +245,8 @@ msgstr "Seadme sisend-/väljundviga."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_FILE_EXISTS & ERRCODE_RES_MASK\n"
-"string.text"
+"File already exists.\n"
+"itemlist.text"
 msgid "File already exists."
 msgstr "Fail on juba olemas."
 
@@ -254,8 +254,8 @@ msgstr "Fail on juba olemas."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_BAD_RECORD_LENGTH & ERRCODE_RES_MASK\n"
-"string.text"
+"Incorrect record length.\n"
+"itemlist.text"
 msgid "Incorrect record length."
 msgstr "Sobimatu kirje pikkus."
 
@@ -263,8 +263,8 @@ msgstr "Sobimatu kirje pikkus."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_DISK_FULL & ERRCODE_RES_MASK\n"
-"string.text"
+"Disk or hard drive full.\n"
+"itemlist.text"
 msgid "Disk or hard drive full."
 msgstr "Ketas on täis."
 
@@ -272,8 +272,8 @@ msgstr "Ketas on täis."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_READ_PAST_EOF & ERRCODE_RES_MASK\n"
-"string.text"
+"Reading exceeds EOF.\n"
+"itemlist.text"
 msgid "Reading exceeds EOF."
 msgstr "Lugemine ületab faililõpumärki."
 
@@ -281,8 +281,8 @@ msgstr "Lugemine ületab faililõpumärki."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_BAD_RECORD_NUMBER & ERRCODE_RES_MASK\n"
-"string.text"
+"Incorrect record number.\n"
+"itemlist.text"
 msgid "Incorrect record number."
 msgstr "Sobimatu kirje number."
 
@@ -290,8 +290,8 @@ msgstr "Sobimatu kirje number."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_TOO_MANY_FILES & ERRCODE_RES_MASK\n"
-"string.text"
+"Too many files.\n"
+"itemlist.text"
 msgid "Too many files."
 msgstr "Liiga palju faile."
 
@@ -299,8 +299,8 @@ msgstr "Liiga palju faile."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_NO_DEVICE & ERRCODE_RES_MASK\n"
-"string.text"
+"Device not available.\n"
+"itemlist.text"
 msgid "Device not available."
 msgstr "Seade ei ole kättesaadav."
 
@@ -308,8 +308,8 @@ msgstr "Seade ei ole kättesaadav."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_ACCESS_DENIED & ERRCODE_RES_MASK\n"
-"string.text"
+"Access denied.\n"
+"itemlist.text"
 msgid "Access denied."
 msgstr "Ligipääsu pole."
 
@@ -317,8 +317,8 @@ msgstr "Ligipääsu pole."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_NOT_READY & ERRCODE_RES_MASK\n"
-"string.text"
+"Disk not ready.\n"
+"itemlist.text"
 msgid "Disk not ready."
 msgstr "Ketas ei ole valmis."
 
@@ -326,8 +326,8 @@ msgstr "Ketas ei ole valmis."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_NOT_IMPLEMENTED & ERRCODE_RES_MASK\n"
-"string.text"
+"Not implemented.\n"
+"itemlist.text"
 msgid "Not implemented."
 msgstr "Ei ole realiseeritud."
 
@@ -335,8 +335,8 @@ msgstr "Ei ole realiseeritud."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_DIFFERENT_DRIVE & ERRCODE_RES_MASK\n"
-"string.text"
+"Renaming on different drives impossible.\n"
+"itemlist.text"
 msgid "Renaming on different drives impossible."
 msgstr "Ümbernimetamine erinevatel ketastel pole võimalik."
 
@@ -344,8 +344,8 @@ msgstr "Ümbernimetamine erinevatel ketastel pole võimalik."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_ACCESS_ERROR & ERRCODE_RES_MASK\n"
-"string.text"
+"Path/File access error.\n"
+"itemlist.text"
 msgid "Path/File access error."
 msgstr "Asukoha või faili juurdepääsu viga."
 
@@ -353,8 +353,8 @@ msgstr "Asukoha või faili juurdepääsu viga."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_PATH_NOT_FOUND & ERRCODE_RES_MASK\n"
-"string.text"
+"Path not found.\n"
+"itemlist.text"
 msgid "Path not found."
 msgstr "Asukohta ei leitud."
 
@@ -362,8 +362,8 @@ msgstr "Asukohta ei leitud."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_NO_OBJECT & ERRCODE_RES_MASK\n"
-"string.text"
+"Object variable not set.\n"
+"itemlist.text"
 msgid "Object variable not set."
 msgstr "Objektmuutuja ei ole seatud."
 
@@ -371,8 +371,8 @@ msgstr "Objektmuutuja ei ole seatud."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_BAD_PATTERN & ERRCODE_RES_MASK\n"
-"string.text"
+"Invalid string pattern.\n"
+"itemlist.text"
 msgid "Invalid string pattern."
 msgstr "Sobimatu stringi muster."
 
@@ -380,8 +380,8 @@ msgstr "Sobimatu stringi muster."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_IS_NULL & ERRCODE_RES_MASK\n"
-"string.text"
+"Use of zero not permitted.\n"
+"itemlist.text"
 msgid "Use of zero not permitted."
 msgstr "Nulli kasutamine ei ole lubatud."
 
@@ -389,8 +389,8 @@ msgstr "Nulli kasutamine ei ole lubatud."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_DDE_ERROR & ERRCODE_RES_MASK\n"
-"string.text"
+"DDE Error.\n"
+"itemlist.text"
 msgid "DDE Error."
 msgstr "DDE viga."
 
@@ -398,8 +398,8 @@ msgstr "DDE viga."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_DDE_WAITINGACK & ERRCODE_RES_MASK\n"
-"string.text"
+"Awaiting response to DDE connection.\n"
+"itemlist.text"
 msgid "Awaiting response to DDE connection."
 msgstr "DDE ühenduse vastuse ootamine."
 
@@ -407,8 +407,8 @@ msgstr "DDE ühenduse vastuse ootamine."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_DDE_OUTOFCHANNELS & ERRCODE_RES_MASK\n"
-"string.text"
+"No DDE channels available.\n"
+"itemlist.text"
 msgid "No DDE channels available."
 msgstr "DDE kanalid pole saadaval."
 
@@ -416,8 +416,8 @@ msgstr "DDE kanalid pole saadaval."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_DDE_NO_RESPONSE & ERRCODE_RES_MASK\n"
-"string.text"
+"No application responded to DDE connect initiation.\n"
+"itemlist.text"
 msgid "No application responded to DDE connect initiation."
 msgstr "Ükski rakendus ei vastanud DDE ühenduse algatamisele."
 
@@ -425,8 +425,8 @@ msgstr "Ükski rakendus ei vastanud DDE ühenduse algatamisele."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_DDE_MULT_RESPONSES & ERRCODE_RES_MASK\n"
-"string.text"
+"Too many applications responded to DDE connect initiation.\n"
+"itemlist.text"
 msgid "Too many applications responded to DDE connect initiation."
 msgstr "Liiga palju rakendusi vastas DDE ühenduse algatamisele."
 
@@ -434,8 +434,8 @@ msgstr "Liiga palju rakendusi vastas DDE ühenduse algatamisele."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_DDE_CHANNEL_LOCKED & ERRCODE_RES_MASK\n"
-"string.text"
+"DDE channel locked.\n"
+"itemlist.text"
 msgid "DDE channel locked."
 msgstr "DDE kanal lukustatud."
 
@@ -443,8 +443,8 @@ msgstr "DDE kanal lukustatud."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_DDE_NOTPROCESSED & ERRCODE_RES_MASK\n"
-"string.text"
+"External application cannot execute DDE operation.\n"
+"itemlist.text"
 msgid "External application cannot execute DDE operation."
 msgstr "Väline rakendus ei saa täita DDE operatsiooni."
 
@@ -452,8 +452,8 @@ msgstr "Väline rakendus ei saa täita DDE operatsiooni."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_DDE_TIMEOUT & ERRCODE_RES_MASK\n"
-"string.text"
+"Timeout while waiting for DDE response.\n"
+"itemlist.text"
 msgid "Timeout while waiting for DDE response."
 msgstr "Aegumine DDE vastuse ootamisel."
 
@@ -461,8 +461,8 @@ msgstr "Aegumine DDE vastuse ootamisel."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_DDE_USER_INTERRUPT & ERRCODE_RES_MASK\n"
-"string.text"
+"User pressed ESCAPE during DDE operation.\n"
+"itemlist.text"
 msgid "User pressed ESCAPE during DDE operation."
 msgstr "Kasutaja vajutas DDE operatsiooni ajal nuppu ESCAPE."
 
@@ -470,8 +470,8 @@ msgstr "Kasutaja vajutas DDE operatsiooni ajal nuppu ESCAPE."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_DDE_BUSY & ERRCODE_RES_MASK\n"
-"string.text"
+"External application busy.\n"
+"itemlist.text"
 msgid "External application busy."
 msgstr "Väline rakendus on hõivatud."
 
@@ -479,8 +479,8 @@ msgstr "Väline rakendus on hõivatud."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_DDE_NO_DATA & ERRCODE_RES_MASK\n"
-"string.text"
+"DDE operation without data.\n"
+"itemlist.text"
 msgid "DDE operation without data."
 msgstr "DDE operatsioon ilma andmeteta."
 
@@ -488,8 +488,8 @@ msgstr "DDE operatsioon ilma andmeteta."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_DDE_WRONG_DATA_FORMAT & ERRCODE_RES_MASK\n"
-"string.text"
+"Data are in wrong format.\n"
+"itemlist.text"
 msgid "Data are in wrong format."
 msgstr "Andmed on vales vormingus."
 
@@ -497,8 +497,8 @@ msgstr "Andmed on vales vormingus."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_DDE_PARTNER_QUIT & ERRCODE_RES_MASK\n"
-"string.text"
+"External application has been terminated.\n"
+"itemlist.text"
 msgid "External application has been terminated."
 msgstr "Välise rakenduse töö katkestati."
 
@@ -506,8 +506,8 @@ msgstr "Välise rakenduse töö katkestati."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_DDE_CONV_CLOSED & ERRCODE_RES_MASK\n"
-"string.text"
+"DDE connection interrupted or modified.\n"
+"itemlist.text"
 msgid "DDE connection interrupted or modified."
 msgstr "DDE ühendus on katkestatud või muudetud."
 
@@ -515,8 +515,8 @@ msgstr "DDE ühendus on katkestatud või muudetud."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_DDE_NO_CHANNEL & ERRCODE_RES_MASK\n"
-"string.text"
+"DDE method invoked with no channel open.\n"
+"itemlist.text"
 msgid "DDE method invoked with no channel open."
 msgstr "DDE meetod kutsuti välja ilma avatud kanalita."
 
@@ -524,8 +524,8 @@ msgstr "DDE meetod kutsuti välja ilma avatud kanalita."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_DDE_INVALID_LINK & ERRCODE_RES_MASK\n"
-"string.text"
+"Invalid DDE link format.\n"
+"itemlist.text"
 msgid "Invalid DDE link format."
 msgstr "Sobimatu DDE lingi vorming."
 
@@ -533,8 +533,8 @@ msgstr "Sobimatu DDE lingi vorming."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_DDE_QUEUE_OVERFLOW & ERRCODE_RES_MASK\n"
-"string.text"
+"DDE message has been lost.\n"
+"itemlist.text"
 msgid "DDE message has been lost."
 msgstr "DDE sõnum kadus ära."
 
@@ -542,8 +542,8 @@ msgstr "DDE sõnum kadus ära."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_DDE_LINK_ALREADY_EST & ERRCODE_RES_MASK\n"
-"string.text"
+"Paste link already performed.\n"
+"itemlist.text"
 msgid "Paste link already performed."
 msgstr "Lingi asetamine on juba sooritatud."
 
@@ -551,8 +551,8 @@ msgstr "Lingi asetamine on juba sooritatud."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_DDE_LINK_INV_TOPIC & ERRCODE_RES_MASK\n"
-"string.text"
+"Link mode cannot be set due to invalid link topic.\n"
+"itemlist.text"
 msgid "Link mode cannot be set due to invalid link topic."
 msgstr "Vigase lingi teema tõttu pole võimalik määrata lingi režiimi."
 
@@ -560,8 +560,8 @@ msgstr "Vigase lingi teema tõttu pole võimalik määrata lingi režiimi."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_DDE_DLL_NOT_FOUND & ERRCODE_RES_MASK\n"
-"string.text"
+"DDE requires the DDEML.DLL file.\n"
+"itemlist.text"
 msgid "DDE requires the DDEML.DLL file."
 msgstr "DDE vajab DDEML.DLL faili."
 
@@ -569,8 +569,8 @@ msgstr "DDE vajab DDEML.DLL faili."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_CANNOT_LOAD & ERRCODE_RES_MASK\n"
-"string.text"
+"Module cannot be loaded; invalid format.\n"
+"itemlist.text"
 msgid "Module cannot be loaded; invalid format."
 msgstr "Mooduli laadimine ei õnnestunud; sobimatu vorming."
 
@@ -578,8 +578,8 @@ msgstr "Mooduli laadimine ei õnnestunud; sobimatu vorming."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_BAD_INDEX & ERRCODE_RES_MASK\n"
-"string.text"
+"Invalid object index.\n"
+"itemlist.text"
 msgid "Invalid object index."
 msgstr "Sobimatu objekti indeks."
 
@@ -587,8 +587,8 @@ msgstr "Sobimatu objekti indeks."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_NO_ACTIVE_OBJECT & ERRCODE_RES_MASK\n"
-"string.text"
+"Object is not available.\n"
+"itemlist.text"
 msgid "Object is not available."
 msgstr "Objekt ei ole kättesaadav."
 
@@ -596,8 +596,8 @@ msgstr "Objekt ei ole kättesaadav."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_BAD_PROP_VALUE & ERRCODE_RES_MASK\n"
-"string.text"
+"Incorrect property value.\n"
+"itemlist.text"
 msgid "Incorrect property value."
 msgstr "Sobimatu atribuudi väärtus."
 
@@ -605,8 +605,8 @@ msgstr "Sobimatu atribuudi väärtus."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_PROP_READONLY & ERRCODE_RES_MASK\n"
-"string.text"
+"This property is read-only.\n"
+"itemlist.text"
 msgid "This property is read-only."
 msgstr "See atribuut on ainult lugemiseks."
 
@@ -614,8 +614,8 @@ msgstr "See atribuut on ainult lugemiseks."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_PROP_WRITEONLY & ERRCODE_RES_MASK\n"
-"string.text"
+"This property is write only.\n"
+"itemlist.text"
 msgid "This property is write only."
 msgstr "See atribuut on ainult kirjutamiseks."
 
@@ -623,8 +623,8 @@ msgstr "See atribuut on ainult kirjutamiseks."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_INVALID_OBJECT & ERRCODE_RES_MASK\n"
-"string.text"
+"Invalid object reference.\n"
+"itemlist.text"
 msgid "Invalid object reference."
 msgstr "Vigane objekti viide."
 
@@ -632,8 +632,8 @@ msgstr "Vigane objekti viide."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_NO_METHOD & ERRCODE_RES_MASK\n"
-"string.text"
+"Property or method not found: $(ARG1).\n"
+"itemlist.text"
 msgid "Property or method not found: $(ARG1)."
 msgstr "Atribuuti või meetodit ei leitud: $(ARG1)."
 
@@ -641,8 +641,8 @@ msgstr "Atribuuti või meetodit ei leitud: $(ARG1)."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_NEEDS_OBJECT & ERRCODE_RES_MASK\n"
-"string.text"
+"Object required.\n"
+"itemlist.text"
 msgid "Object required."
 msgstr "Objekt on vajalik."
 
@@ -650,8 +650,8 @@ msgstr "Objekt on vajalik."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_INVALID_USAGE_OBJECT & ERRCODE_RES_MASK\n"
-"string.text"
+"Invalid use of an object.\n"
+"itemlist.text"
 msgid "Invalid use of an object."
 msgstr "Sobimatu objekti kasutamine."
 
@@ -659,8 +659,8 @@ msgstr "Sobimatu objekti kasutamine."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_NO_OLE & ERRCODE_RES_MASK\n"
-"string.text"
+"OLE Automation is not supported by this object.\n"
+"itemlist.text"
 msgid "OLE Automation is not supported by this object."
 msgstr "See objekt ei toeta OLE-automatiseerimist."
 
@@ -668,8 +668,8 @@ msgstr "See objekt ei toeta OLE-automatiseerimist."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_BAD_METHOD & ERRCODE_RES_MASK\n"
-"string.text"
+"This property or method is not supported by the object.\n"
+"itemlist.text"
 msgid "This property or method is not supported by the object."
 msgstr "See objekt ei toeta antud atribuuti või meetodit."
 
@@ -677,8 +677,8 @@ msgstr "See objekt ei toeta antud atribuuti või meetodit."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_OLE_ERROR & ERRCODE_RES_MASK\n"
-"string.text"
+"OLE Automation Error.\n"
+"itemlist.text"
 msgid "OLE Automation Error."
 msgstr "OLE-automatiseerimise viga."
 
@@ -686,8 +686,8 @@ msgstr "OLE-automatiseerimise viga."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_BAD_ACTION & ERRCODE_RES_MASK\n"
-"string.text"
+"This action is not supported by given object.\n"
+"itemlist.text"
 msgid "This action is not supported by given object."
 msgstr "See objekt ei toeta antud toimingut."
 
@@ -695,8 +695,8 @@ msgstr "See objekt ei toeta antud toimingut."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_NO_NAMED_ARGS & ERRCODE_RES_MASK\n"
-"string.text"
+"Named arguments are not supported by given object.\n"
+"itemlist.text"
 msgid "Named arguments are not supported by given object."
 msgstr "See objekt ei toeta nimega argumente."
 
@@ -704,8 +704,8 @@ msgstr "See objekt ei toeta nimega argumente."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_BAD_LOCALE & ERRCODE_RES_MASK\n"
-"string.text"
+"The current locale setting is not supported by the given object.\n"
+"itemlist.text"
 msgid "The current locale setting is not supported by the given object."
 msgstr "Objekt ei toeta hetkel seatud lokaati."
 
@@ -713,8 +713,8 @@ msgstr "Objekt ei toeta hetkel seatud lokaati."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_NAMED_NOT_FOUND & ERRCODE_RES_MASK\n"
-"string.text"
+"Named argument not found.\n"
+"itemlist.text"
 msgid "Named argument not found."
 msgstr "Nimega argumenti ei leitud."
 
@@ -722,8 +722,8 @@ msgstr "Nimega argumenti ei leitud."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_NOT_OPTIONAL & ERRCODE_RES_MASK\n"
-"string.text"
+"Argument is not optional.\n"
+"itemlist.text"
 msgid "Argument is not optional."
 msgstr "Argument on kohustuslik."
 
@@ -731,8 +731,8 @@ msgstr "Argument on kohustuslik."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_WRONG_ARGS & ERRCODE_RES_MASK\n"
-"string.text"
+"Invalid number of arguments.\n"
+"itemlist.text"
 msgid "Invalid number of arguments."
 msgstr "Vigane argumentide arv."
 
@@ -740,8 +740,8 @@ msgstr "Vigane argumentide arv."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_NOT_A_COLL & ERRCODE_RES_MASK\n"
-"string.text"
+"Object is not a list.\n"
+"itemlist.text"
 msgid "Object is not a list."
 msgstr "Objekt ei ole loendis."
 
@@ -749,8 +749,8 @@ msgstr "Objekt ei ole loendis."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_BAD_ORDINAL & ERRCODE_RES_MASK\n"
-"string.text"
+"Invalid ordinal number.\n"
+"itemlist.text"
 msgid "Invalid ordinal number."
 msgstr "Sobimatu järgarv."
 
@@ -758,8 +758,8 @@ msgstr "Sobimatu järgarv."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_DLLPROC_NOT_FOUND & ERRCODE_RES_MASK\n"
-"string.text"
+"Specified DLL function not found.\n"
+"itemlist.text"
 msgid "Specified DLL function not found."
 msgstr "Etteantud DLL-funktsiooni ei leitud."
 
@@ -767,8 +767,8 @@ msgstr "Etteantud DLL-funktsiooni ei leitud."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_BAD_CLIPBD_FORMAT & ERRCODE_RES_MASK\n"
-"string.text"
+"Invalid clipboard format.\n"
+"itemlist.text"
 msgid "Invalid clipboard format."
 msgstr "Vigane lõikepuhvri vorming."
 
@@ -776,8 +776,8 @@ msgstr "Vigane lõikepuhvri vorming."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_PROPERTY_NOT_FOUND & ERRCODE_RES_MASK\n"
-"string.text"
+"Object does not have this property.\n"
+"itemlist.text"
 msgid "Object does not have this property."
 msgstr "Objektil pole seda atribuuti."
 
@@ -785,8 +785,8 @@ msgstr "Objektil pole seda atribuuti."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_METHOD_NOT_FOUND & ERRCODE_RES_MASK\n"
-"string.text"
+"Object does not have this method.\n"
+"itemlist.text"
 msgid "Object does not have this method."
 msgstr "Objektil puudub see meetod."
 
@@ -794,8 +794,8 @@ msgstr "Objektil puudub see meetod."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_ARG_MISSING & ERRCODE_RES_MASK\n"
-"string.text"
+"Required argument lacking.\n"
+"itemlist.text"
 msgid "Required argument lacking."
 msgstr "Vajalik argument on puudu."
 
@@ -803,17 +803,8 @@ msgstr "Vajalik argument on puudu."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_BAD_NUMBER_OF_ARGS & ERRCODE_RES_MASK\n"
-"string.text"
-msgid "Invalid number of arguments."
-msgstr "Vigane argumentide arv."
-
-#: sb.src
-msgctxt ""
-"sb.src\n"
-"RID_BASIC_START\n"
-"ERRCODE_BASIC_METHOD_FAILED & ERRCODE_RES_MASK\n"
-"string.text"
+"Error executing a method.\n"
+"itemlist.text"
 msgid "Error executing a method."
 msgstr "Viga meetodi täitmisel."
 
@@ -821,8 +812,8 @@ msgstr "Viga meetodi täitmisel."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_SETPROP_FAILED & ERRCODE_RES_MASK\n"
-"string.text"
+"Unable to set property.\n"
+"itemlist.text"
 msgid "Unable to set property."
 msgstr "Viga atribuudi sättimisel."
 
@@ -830,8 +821,8 @@ msgstr "Viga atribuudi sättimisel."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_GETPROP_FAILED & ERRCODE_RES_MASK\n"
-"string.text"
+"Unable to determine property.\n"
+"itemlist.text"
 msgid "Unable to determine property."
 msgstr "Atribuudi kindlaksmääramine pole võimalik."
 
@@ -839,8 +830,8 @@ msgstr "Atribuudi kindlaksmääramine pole võimalik."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_UNEXPECTED & ERRCODE_RES_MASK\n"
-"string.text"
+"Unexpected symbol: $(ARG1).\n"
+"itemlist.text"
 msgid "Unexpected symbol: $(ARG1)."
 msgstr "Ootamatu sümbol: $(ARG1)."
 
@@ -848,8 +839,8 @@ msgstr "Ootamatu sümbol: $(ARG1)."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_EXPECTED & ERRCODE_RES_MASK\n"
-"string.text"
+"Expected: $(ARG1).\n"
+"itemlist.text"
 msgid "Expected: $(ARG1)."
 msgstr "Oodati: $(ARG1)."
 
@@ -857,8 +848,8 @@ msgstr "Oodati: $(ARG1)."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_SYMBOL_EXPECTED & ERRCODE_RES_MASK\n"
-"string.text"
+"Symbol expected.\n"
+"itemlist.text"
 msgid "Symbol expected."
 msgstr "Oodati sümbolit."
 
@@ -866,8 +857,8 @@ msgstr "Oodati sümbolit."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_VAR_EXPECTED & ERRCODE_RES_MASK\n"
-"string.text"
+"Variable expected.\n"
+"itemlist.text"
 msgid "Variable expected."
 msgstr "Oodati muutujat."
 
@@ -875,8 +866,8 @@ msgstr "Oodati muutujat."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_LABEL_EXPECTED & ERRCODE_RES_MASK\n"
-"string.text"
+"Label expected.\n"
+"itemlist.text"
 msgid "Label expected."
 msgstr "Oodati silti."
 
@@ -884,8 +875,8 @@ msgstr "Oodati silti."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_LVALUE_EXPECTED & ERRCODE_RES_MASK\n"
-"string.text"
+"Value cannot be applied.\n"
+"itemlist.text"
 msgid "Value cannot be applied."
 msgstr "Väärtust pole võimalik rakendada."
 
@@ -893,8 +884,8 @@ msgstr "Väärtust pole võimalik rakendada."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_VAR_DEFINED & ERRCODE_RES_MASK\n"
-"string.text"
+"Variable $(ARG1) already defined.\n"
+"itemlist.text"
 msgid "Variable $(ARG1) already defined."
 msgstr "Muutuja $(ARG1) on juba defineeritud."
 
@@ -902,8 +893,8 @@ msgstr "Muutuja $(ARG1) on juba defineeritud."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_PROC_DEFINED & ERRCODE_RES_MASK\n"
-"string.text"
+"Sub procedure or function procedure $(ARG1) already defined.\n"
+"itemlist.text"
 msgid "Sub procedure or function procedure $(ARG1) already defined."
 msgstr "Alamprotseduur või funktsioon $(ARG1) on juba defineeritud."
 
@@ -911,8 +902,8 @@ msgstr "Alamprotseduur või funktsioon $(ARG1) on juba defineeritud."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_LABEL_DEFINED & ERRCODE_RES_MASK\n"
-"string.text"
+"Label $(ARG1) already defined.\n"
+"itemlist.text"
 msgid "Label $(ARG1) already defined."
 msgstr "Silt $(ARG1) on juba defineeritud."
 
@@ -920,8 +911,8 @@ msgstr "Silt $(ARG1) on juba defineeritud."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_UNDEF_VAR & ERRCODE_RES_MASK\n"
-"string.text"
+"Variable $(ARG1) not found.\n"
+"itemlist.text"
 msgid "Variable $(ARG1) not found."
 msgstr "Muutujat $(ARG1) ei leitud."
 
@@ -929,8 +920,8 @@ msgstr "Muutujat $(ARG1) ei leitud."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_UNDEF_ARRAY & ERRCODE_RES_MASK\n"
-"string.text"
+"Array or procedure $(ARG1) not found.\n"
+"itemlist.text"
 msgid "Array or procedure $(ARG1) not found."
 msgstr "Massiivi või protseduuri $(ARG1) ei leitud."
 
@@ -938,8 +929,8 @@ msgstr "Massiivi või protseduuri $(ARG1) ei leitud."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_UNDEF_PROC & ERRCODE_RES_MASK\n"
-"string.text"
+"Procedure $(ARG1) not found.\n"
+"itemlist.text"
 msgid "Procedure $(ARG1) not found."
 msgstr "Protseduuri $(ARG1) ei leitud."
 
@@ -947,8 +938,8 @@ msgstr "Protseduuri $(ARG1) ei leitud."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_UNDEF_LABEL & ERRCODE_RES_MASK\n"
-"string.text"
+"Label $(ARG1) undefined.\n"
+"itemlist.text"
 msgid "Label $(ARG1) undefined."
 msgstr "Silt $(ARG1) on defineerimata."
 
@@ -956,8 +947,8 @@ msgstr "Silt $(ARG1) on defineerimata."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_UNDEF_TYPE & ERRCODE_RES_MASK\n"
-"string.text"
+"Unknown data type $(ARG1).\n"
+"itemlist.text"
 msgid "Unknown data type $(ARG1)."
 msgstr "Tundmatu andmetüüp $(ARG1)."
 
@@ -965,8 +956,8 @@ msgstr "Tundmatu andmetüüp $(ARG1)."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_BAD_EXIT & ERRCODE_RES_MASK\n"
-"string.text"
+"Exit $(ARG1) expected.\n"
+"itemlist.text"
 msgid "Exit $(ARG1) expected."
 msgstr "Oodati $(ARG1)-st väljumist."
 
@@ -974,8 +965,8 @@ msgstr "Oodati $(ARG1)-st väljumist."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_BAD_BLOCK & ERRCODE_RES_MASK\n"
-"string.text"
+"Statement block still open: $(ARG1) missing.\n"
+"itemlist.text"
 msgid "Statement block still open: $(ARG1) missing."
 msgstr "Plokklause jäi avatuks: $(ARG1) puudub."
 
@@ -983,8 +974,8 @@ msgstr "Plokklause jäi avatuks: $(ARG1) puudub."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_BAD_BRACKETS & ERRCODE_RES_MASK\n"
-"string.text"
+"Parentheses do not match.\n"
+"itemlist.text"
 msgid "Parentheses do not match."
 msgstr "Sulud ei ühti."
 
@@ -992,8 +983,8 @@ msgstr "Sulud ei ühti."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_BAD_DECLARATION & ERRCODE_RES_MASK\n"
-"string.text"
+"Symbol $(ARG1) already defined differently.\n"
+"itemlist.text"
 msgid "Symbol $(ARG1) already defined differently."
 msgstr "Sümbol $(ARG1) on juba teisiti defineeritud."
 
@@ -1001,8 +992,8 @@ msgstr "Sümbol $(ARG1) on juba teisiti defineeritud."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_BAD_PARAMETERS & ERRCODE_RES_MASK\n"
-"string.text"
+"Parameters do not correspond to procedure.\n"
+"itemlist.text"
 msgid "Parameters do not correspond to procedure."
 msgstr "Parameetrid ei vasta protseduurile."
 
@@ -1010,8 +1001,8 @@ msgstr "Parameetrid ei vasta protseduurile."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_BAD_CHAR_IN_NUMBER & ERRCODE_RES_MASK\n"
-"string.text"
+"Invalid character in number.\n"
+"itemlist.text"
 msgid "Invalid character in number."
 msgstr "Vigane sümbol arvus."
 
@@ -1019,8 +1010,8 @@ msgstr "Vigane sümbol arvus."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_MUST_HAVE_DIMS & ERRCODE_RES_MASK\n"
-"string.text"
+"Array must be dimensioned.\n"
+"itemlist.text"
 msgid "Array must be dimensioned."
 msgstr "Massiiv peab olema kindlate mõõtmetega."
 
@@ -1028,8 +1019,8 @@ msgstr "Massiiv peab olema kindlate mõõtmetega."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_NO_IF & ERRCODE_RES_MASK\n"
-"string.text"
+"Else/Endif without If.\n"
+"itemlist.text"
 msgid "Else/Endif without If."
 msgstr "Else/Endif ilma If-ita."
 
@@ -1037,8 +1028,8 @@ msgstr "Else/Endif ilma If-ita."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_NOT_IN_SUBR & ERRCODE_RES_MASK\n"
-"string.text"
+"$(ARG1) not allowed within a procedure.\n"
+"itemlist.text"
 msgid "$(ARG1) not allowed within a procedure."
 msgstr "$(ARG1) ei ole protseduuri sees lubatud."
 
@@ -1046,8 +1037,8 @@ msgstr "$(ARG1) ei ole protseduuri sees lubatud."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_NOT_IN_MAIN & ERRCODE_RES_MASK\n"
-"string.text"
+"$(ARG1) not allowed outside a procedure.\n"
+"itemlist.text"
 msgid "$(ARG1) not allowed outside a procedure."
 msgstr "$(ARG1) ei ole väljaspool protseduuri lubatud."
 
@@ -1055,8 +1046,8 @@ msgstr "$(ARG1) ei ole väljaspool protseduuri lubatud."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_WRONG_DIMS & ERRCODE_RES_MASK\n"
-"string.text"
+"Dimension specifications do not match.\n"
+"itemlist.text"
 msgid "Dimension specifications do not match."
 msgstr "Mõõtmete spetsifikatsioonid ei ühti."
 
@@ -1064,8 +1055,8 @@ msgstr "Mõõtmete spetsifikatsioonid ei ühti."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_BAD_OPTION & ERRCODE_RES_MASK\n"
-"string.text"
+"Unknown option: $(ARG1).\n"
+"itemlist.text"
 msgid "Unknown option: $(ARG1)."
 msgstr "Tundmatu säte: $(ARG1)."
 
@@ -1073,8 +1064,8 @@ msgstr "Tundmatu säte: $(ARG1)."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_CONSTANT_REDECLARED & ERRCODE_RES_MASK\n"
-"string.text"
+"Constant $(ARG1) redefined.\n"
+"itemlist.text"
 msgid "Constant $(ARG1) redefined."
 msgstr "Konstandi $(ARG1) uuesti defineerimine."
 
@@ -1082,8 +1073,8 @@ msgstr "Konstandi $(ARG1) uuesti defineerimine."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_PROG_TOO_LARGE & ERRCODE_RES_MASK\n"
-"string.text"
+"Program too large.\n"
+"itemlist.text"
 msgid "Program too large."
 msgstr "Programm on liiga suur."
 
@@ -1091,8 +1082,8 @@ msgstr "Programm on liiga suur."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_NO_STRINGS_ARRAYS & ERRCODE_RES_MASK\n"
-"string.text"
+"Strings or arrays not permitted.\n"
+"itemlist.text"
 msgid "Strings or arrays not permitted."
 msgstr "Stringid ja massiivid ei ole lubatud."
 
@@ -1100,8 +1091,8 @@ msgstr "Stringid ja massiivid ei ole lubatud."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_EXCEPTION & ERRCODE_RES_MASK\n"
-"string.text"
+"An exception occurred $(ARG1).\n"
+"itemlist.text"
 msgid "An exception occurred $(ARG1)."
 msgstr "Ilmnes erind $(ARG1)."
 
@@ -1109,8 +1100,8 @@ msgstr "Ilmnes erind $(ARG1)."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_ARRAY_FIX & ERRCODE_RES_MASK\n"
-"string.text"
+"This array is fixed or temporarily locked.\n"
+"itemlist.text"
 msgid "This array is fixed or temporarily locked."
 msgstr "See massiiv on kas fikseeritud või ajutiselt lukus."
 
@@ -1118,8 +1109,8 @@ msgstr "See massiiv on kas fikseeritud või ajutiselt lukus."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_STRING_OVERFLOW & ERRCODE_RES_MASK\n"
-"string.text"
+"Out of string space.\n"
+"itemlist.text"
 msgid "Out of string space."
 msgstr "Stringi pikkus ületab lubatu."
 
@@ -1127,8 +1118,8 @@ msgstr "Stringi pikkus ületab lubatu."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_EXPR_TOO_COMPLEX & ERRCODE_RES_MASK\n"
-"string.text"
+"Expression Too Complex.\n"
+"itemlist.text"
 msgid "Expression Too Complex."
 msgstr "Avaldis on liiga keeruline."
 
@@ -1136,8 +1127,8 @@ msgstr "Avaldis on liiga keeruline."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_OPER_NOT_PERFORM & ERRCODE_RES_MASK\n"
-"string.text"
+"Can't perform requested operation.\n"
+"itemlist.text"
 msgid "Can't perform requested operation."
 msgstr "Soovitud toimingut ei saa sooritada."
 
@@ -1145,8 +1136,8 @@ msgstr "Soovitud toimingut ei saa sooritada."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_TOO_MANY_DLL & ERRCODE_RES_MASK\n"
-"string.text"
+"Too many DLL application clients.\n"
+"itemlist.text"
 msgid "Too many DLL application clients."
 msgstr "Liiga palju DLL-rakenduste kliente."
 
@@ -1154,8 +1145,8 @@ msgstr "Liiga palju DLL-rakenduste kliente."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_LOOP_NOT_INIT & ERRCODE_RES_MASK\n"
-"string.text"
+"For loop not initialized.\n"
+"itemlist.text"
 msgid "For loop not initialized."
 msgstr "Pole tsükli jaoks initsialiseeritud."
 
@@ -1163,8 +1154,8 @@ msgstr "Pole tsükli jaoks initsialiseeritud."
 msgctxt ""
 "sb.src\n"
 "RID_BASIC_START\n"
-"ERRCODE_BASIC_COMPAT & ERRCODE_RES_MASK\n"
-"string.text"
+"$(ARG1)\n"
+"itemlist.text"
 msgid "$(ARG1)"
 msgstr "$(ARG1)"
 
@@ -1179,14 +1170,6 @@ msgstr "Makro töö katkestati"
 #: sb.src
 msgctxt ""
 "sb.src\n"
-"IDS_SBERR_STOREREF\n"
-"string.text"
-msgid "Reference will not be saved: "
-msgstr "Viidet ei salvestata: "
-
-#: sb.src
-msgctxt ""
-"sb.src\n"
 "ERRCODE_BASMGR_LIBLOAD & ERRCODE_RES_MASK\n"
 "string.text"
 msgid "Error loading library '$(ARG1)'."