jscript: Added decodeURI implementation.

dlls/jscript/global.c

@@ -845,9 +845,9 @@ static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags
         }
     }
 
+    TRACE("%s -> %s\n", debugstr_w(str), debugstr_w(ret));
     SysFreeString(str);
 
-    TRACE("%s -> %s\n", debugstr_w(str), debugstr_w(ret));
     if(retv) {
         V_VT(retv) = VT_BSTR;
         V_BSTR(retv) = ret;
@@ -860,8 +860,97 @@ static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags
 static HRESULT JSGlobal_decodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp,
         VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp)
 {
-    FIXME("\n");
+    BSTR str, ret;
-    return E_NOTIMPL;
+    WCHAR *ptr;
+    int i, len = 0, val, res;
+    char buf[4];
+    WCHAR out;
+    HRESULT hres;
+
+    TRACE("\n");
+
+    if(!arg_cnt(dp)) {
+        if(retv) {
+            ret = SysAllocString(undefinedW);
+            if(!ret)
+                return E_OUTOFMEMORY;
+
+            V_VT(retv) = VT_BSTR;
+            V_BSTR(retv) = ret;
+        }
+
+        return S_OK;
+    }
+
+    hres = to_string(ctx, get_arg(dp,0), ei, &str);
+    if(FAILED(hres))
+        return hres;
+
+    for(ptr=str; *ptr; ptr++) {
+        if(*ptr != '%') {
+            len++;
+        }else {
+            res = 0;
+            for(i=0; i<4; i++) {
+                if(ptr[i*3]!='%' || hex_to_int(ptr[i*3+1])==-1 || (val=hex_to_int(ptr[i*3+2]))==-1)
+                    break;
+                val += hex_to_int(ptr[i*3+1])<<4;
+                buf[i] = val;
+
+                res = MultiByteToWideChar(CP_UTF8, 0, buf, i+1, &out, 1);
+                if(res)
+                    break;
+            }
+
+            if(!res) {
+                SysFreeString(str);
+                return throw_uri_error(ctx, ei, JS_E_INVALID_URI_CODING, NULL);
+            }
+
+            ptr += i*3+2;
+            len++;
+        }
+    }
+
+    ret = SysAllocStringLen(NULL, len);
+    if(!ret) {
+        SysFreeString(str);
+        return E_OUTOFMEMORY;
+    }
+
+    len = 0;
+    for(ptr=str; *ptr; ptr++) {
+        if(*ptr != '%') {
+            ret[len] = *ptr;
+            len++;
+        }else {
+            for(i=0; i<4; i++) {
+                if(ptr[i*3]!='%' || hex_to_int(ptr[i*3+1])==-1 || (val=hex_to_int(ptr[i*3+2]))==-1)
+                    break;
+                val += hex_to_int(ptr[i*3+1])<<4;
+                buf[i] = val;
+
+                res = MultiByteToWideChar(CP_UTF8, 0, buf, i+1, ret+len, 1);
+                if(res)
+                    break;
+            }
+
+            ptr += i*3+2;
+            len++;
+        }
+    }
+
+    TRACE("%s -> %s\n", debugstr_w(str), debugstr_w(ret));
+    SysFreeString(str);
+
+    if(retv) {
+        V_VT(retv) = VT_BSTR;
+        V_BSTR(retv) = ret;
+    }else {
+        SysFreeString(ret);
+    }
+
+    return S_OK;
 }
 
 static HRESULT JSGlobal_encodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp,

dlls/jscript/jscript.h

@@ -467,6 +467,7 @@ static inline DWORD make_grfdex(script_ctx_t *ctx, DWORD flags)
 #define JS_E_VBARRAY_EXPECTED        MAKE_JSERROR(IDS_NOT_VBARRAY)
 #define JS_E_JSCRIPT_EXPECTED        MAKE_JSERROR(IDS_JSCRIPT_EXPECTED)
 #define JS_E_REGEXP_SYNTAX           MAKE_JSERROR(IDS_REGEXP_SYNTAX_ERROR)
+#define JS_E_INVALID_URI_CODING      MAKE_JSERROR(IDS_URI_INVALID_CODING)
 #define JS_E_INVALID_URI_CHAR        MAKE_JSERROR(IDS_URI_INVALID_CHAR)
 #define JS_E_INVALID_LENGTH          MAKE_JSERROR(IDS_INVALID_LENGTH)
 #define JS_E_ARRAY_EXPECTED          MAKE_JSERROR(IDS_ARRAY_EXPECTED)

dlls/jscript/jscript.rc

@@ -45,6 +45,7 @@ STRINGTABLE
     IDS_NOT_VBARRAY         "VBArray object expected"
     IDS_JSCRIPT_EXPECTED    "JScript object expected"
     IDS_REGEXP_SYNTAX_ERROR "Syntax error in regular expression"
+    IDS_URI_INVALID_CODING  "URI to be decoded is incorrect"
     IDS_URI_INVALID_CHAR    "URI to be encoded contains invalid characters"
     IDS_INVALID_LENGTH      "Array length must be a finite positive integer"
     IDS_ARRAY_EXPECTED      "Array object expected"

dlls/jscript/resource.h

@@ -46,5 +46,6 @@
 #define IDS_JSCRIPT_EXPECTED                0x1396
 #define IDS_REGEXP_SYNTAX_ERROR             0x1399
 #define IDS_URI_INVALID_CHAR                0x13A0
+#define IDS_URI_INVALID_CODING              0x13A1
 #define IDS_INVALID_LENGTH                  0x13A5
 #define IDS_ARRAY_EXPECTED                  0x13A7

po/ar.po

@@ -2300,15 +2300,19 @@ msgstr ""
 msgid "Syntax error in regular expression"
 msgstr ""
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr ""
 
-#: jscript.rc:49
+#: jscript.rc:48
-msgid "Array length must be a finite positive integer"
+msgid "URI to be decoded is incorrect"
 msgstr ""
 
 #: jscript.rc:50
+msgid "Array length must be a finite positive integer"
+msgstr ""
+
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr ""
 

po/bg.po

@@ -2327,15 +2327,19 @@ msgstr ""
 msgid "Syntax error in regular expression"
 msgstr ""
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr ""
 
-#: jscript.rc:49
+#: jscript.rc:48
-msgid "Array length must be a finite positive integer"
+msgid "URI to be decoded is incorrect"
 msgstr ""
 
 #: jscript.rc:50
+msgid "Array length must be a finite positive integer"
+msgstr ""
+
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr ""
 

po/ca.po

@@ -2270,15 +2270,19 @@ msgstr ""
 msgid "Syntax error in regular expression"
 msgstr ""
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr ""
 
-#: jscript.rc:49
+#: jscript.rc:48
-msgid "Array length must be a finite positive integer"
+msgid "URI to be decoded is incorrect"
 msgstr ""
 
 #: jscript.rc:50
+msgid "Array length must be a finite positive integer"
+msgstr ""
+
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr ""
 

po/cs.po

@@ -2396,15 +2396,19 @@ msgstr ""
 msgid "Syntax error in regular expression"
 msgstr ""
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr ""
 
-#: jscript.rc:49
+#: jscript.rc:48
-msgid "Array length must be a finite positive integer"
+msgid "URI to be decoded is incorrect"
 msgstr ""
 
 #: jscript.rc:50
+msgid "Array length must be a finite positive integer"
+msgstr ""
+
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr ""
 

po/da.po

@@ -2424,15 +2424,20 @@ msgstr "JScript objekt forventet"
 msgid "Syntax error in regular expression"
 msgstr "Syntax fejl i regulært udtryk"
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr "URI, der skal kodes indeholder ugyldige tegn"
 
-#: jscript.rc:49
+#: jscript.rc:48
+#, fuzzy
+msgid "URI to be decoded is incorrect"
+msgstr "URI, der skal kodes indeholder ugyldige tegn"
+
+#: jscript.rc:50
 msgid "Array length must be a finite positive integer"
 msgstr "Array længde skal være et endeligt positivt heltal"
 
-#: jscript.rc:50
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr "Array objekt forventet"
 

po/de.po

@@ -2333,15 +2333,20 @@ msgstr "JScript Objekt erwartet"
 msgid "Syntax error in regular expression"
 msgstr "Syntax Fehler in regulärem Ausdruck"
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr "Zu verschlüsselnde URI enthält ungültige Zeichen"
 
-#: jscript.rc:49
+#: jscript.rc:48
+#, fuzzy
+msgid "URI to be decoded is incorrect"
+msgstr "Zu verschlüsselnde URI enthält ungültige Zeichen"
+
+#: jscript.rc:50
 msgid "Array length must be a finite positive integer"
 msgstr "Array-Größe muss eine endliche, positive Ganzzahl sein"
 
-#: jscript.rc:50
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr "Array Objekt erwartet"
 

po/el.po

@@ -2311,15 +2311,19 @@ msgstr ""
 msgid "Syntax error in regular expression"
 msgstr ""
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr ""
 
-#: jscript.rc:49
+#: jscript.rc:48
-msgid "Array length must be a finite positive integer"
+msgid "URI to be decoded is incorrect"
 msgstr ""
 
 #: jscript.rc:50
+msgid "Array length must be a finite positive integer"
+msgstr ""
+
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr ""
 

po/en.po

@@ -2270,15 +2270,19 @@ msgstr "JScript object expected"
 msgid "Syntax error in regular expression"
 msgstr "Syntax error in regular expression"
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr "URI to be encoded contains invalid characters"
 
-#: jscript.rc:49
+#: jscript.rc:48
+msgid "URI to be decoded is incorrect"
+msgstr "URI to be decoded is incorrect"
+
+#: jscript.rc:50
 msgid "Array length must be a finite positive integer"
 msgstr "Array length must be a finite positive integer"
 
-#: jscript.rc:50
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr "Array object expected"
 

po/en_US.po

@@ -2334,15 +2334,19 @@ msgstr "JScript object expected"
 msgid "Syntax error in regular expression"
 msgstr "Syntax error in regular expression"
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr "URI to be encoded contains invalid characters"
 
-#: jscript.rc:49
+#: jscript.rc:48
+msgid "URI to be decoded is incorrect"
+msgstr "URI to be decoded is incorrect"
+
+#: jscript.rc:50
 msgid "Array length must be a finite positive integer"
 msgstr "Array length must be a finite positive integer"
 
-#: jscript.rc:50
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr "Array object expected"
 

po/eo.po

@@ -2336,15 +2336,19 @@ msgstr ""
 msgid "Syntax error in regular expression"
 msgstr ""
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr ""
 
-#: jscript.rc:49
+#: jscript.rc:48
-msgid "Array length must be a finite positive integer"
+msgid "URI to be decoded is incorrect"
 msgstr ""
 
 #: jscript.rc:50
+msgid "Array length must be a finite positive integer"
+msgstr ""
+
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr ""
 

po/es.po

@@ -2387,15 +2387,20 @@ msgstr "Objeto JScript esperado"
 msgid "Syntax error in regular expression"
 msgstr "Error de sintaxis en la expresion regular"
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr "URI a codificar contiene caracteres no válidos"
 
-#: jscript.rc:49
+#: jscript.rc:48
+#, fuzzy
+msgid "URI to be decoded is incorrect"
+msgstr "URI a codificar contiene caracteres no válidos"
+
+#: jscript.rc:50
 msgid "Array length must be a finite positive integer"
 msgstr "La longitud del arreglo debe ser un entero positivo finito"
 
-#: jscript.rc:50
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr "Objeto Arreglo esperado"
 

po/fa.po

@@ -2300,15 +2300,19 @@ msgstr ""
 msgid "Syntax error in regular expression"
 msgstr ""
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr ""
 
-#: jscript.rc:49
+#: jscript.rc:48
-msgid "Array length must be a finite positive integer"
+msgid "URI to be decoded is incorrect"
 msgstr ""
 
 #: jscript.rc:50
+msgid "Array length must be a finite positive integer"
+msgstr ""
+
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr ""
 

po/fi.po

@@ -2355,15 +2355,19 @@ msgstr ""
 msgid "Syntax error in regular expression"
 msgstr ""
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr ""
 
-#: jscript.rc:49
+#: jscript.rc:48
-msgid "Array length must be a finite positive integer"
+msgid "URI to be decoded is incorrect"
 msgstr ""
 
 #: jscript.rc:50
+msgid "Array length must be a finite positive integer"
+msgstr ""
+
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr ""
 

po/fr.po

@@ -2343,15 +2343,20 @@ msgstr "Objet JScript attendu"
 msgid "Syntax error in regular expression"
 msgstr "Erreur de syntaxe dans l'expression rationnelle"
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr "L'URI à coder contient des caractères invalides"
 
-#: jscript.rc:49
+#: jscript.rc:48
+#, fuzzy
+msgid "URI to be decoded is incorrect"
+msgstr "L'URI à coder contient des caractères invalides"
+
+#: jscript.rc:50
 msgid "Array length must be a finite positive integer"
 msgstr "La longueur d'un tableau doit être un entier positif"
 
-#: jscript.rc:50
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr "Objet tableau attendu"
 

po/he.po

@@ -2300,15 +2300,19 @@ msgstr ""
 msgid "Syntax error in regular expression"
 msgstr ""
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr ""
 
-#: jscript.rc:49
+#: jscript.rc:48
-msgid "Array length must be a finite positive integer"
+msgid "URI to be decoded is incorrect"
 msgstr ""
 
 #: jscript.rc:50
+msgid "Array length must be a finite positive integer"
+msgstr ""
+
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr ""
 

po/hi.po

@@ -2278,15 +2278,19 @@ msgstr ""
 msgid "Syntax error in regular expression"
 msgstr ""
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr ""
 
-#: jscript.rc:49
+#: jscript.rc:48
-msgid "Array length must be a finite positive integer"
+msgid "URI to be decoded is incorrect"
 msgstr ""
 
 #: jscript.rc:50
+msgid "Array length must be a finite positive integer"
+msgstr ""
+
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr ""
 

po/hu.po

@@ -2425,15 +2425,20 @@ msgstr "JScript objektumot vártam"
 msgid "Syntax error in regular expression"
 msgstr "Szinttaktikai hiba a reguláris kifejezésben"
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr "A kódolandó URI érvénytelen karaktereket tartalmaz"
 
-#: jscript.rc:49
+#: jscript.rc:48
+#, fuzzy
+msgid "URI to be decoded is incorrect"
+msgstr "A kódolandó URI érvénytelen karaktereket tartalmaz"
+
+#: jscript.rc:50
 msgid "Array length must be a finite positive integer"
 msgstr "A tömb hosszának egy véges pozitív egész számnak kell lennie"
 
-#: jscript.rc:50
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr "Tömb objektumot vártam"
 

po/it.po

@@ -2495,15 +2495,20 @@ msgstr "Richiesto un oggetto JScript"
 msgid "Syntax error in regular expression"
 msgstr "Errore di sintassi nell'espressione regolare"
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr "L'URI da codificare contiene caratteri non validi"
 
-#: jscript.rc:49
+#: jscript.rc:48
+#, fuzzy
+msgid "URI to be decoded is incorrect"
+msgstr "L'URI da codificare contiene caratteri non validi"
+
+#: jscript.rc:50
 msgid "Array length must be a finite positive integer"
 msgstr "La lunghezza dell'array deve essere un intero finito e positivo"
 
-#: jscript.rc:50
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr "Richiesto un oggetto array"
 

po/ja.po

@@ -2329,15 +2329,20 @@ msgstr "JScript オブジェクトを期待していました"
 msgid "Syntax error in regular expression"
 msgstr "正規表現に文法誤りがあります"
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr "エンコードされるURIに無効な文字が含まれています"
 
-#: jscript.rc:49
+#: jscript.rc:48
+#, fuzzy
+msgid "URI to be decoded is incorrect"
+msgstr "エンコードされるURIに無効な文字が含まれています"
+
+#: jscript.rc:50
 msgid "Array length must be a finite positive integer"
 msgstr "配列の長さは有限の正整数でなければなりません"
 
-#: jscript.rc:50
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr "配列オブジェクトを期待していました"
 

po/ko.po

@@ -2329,15 +2329,20 @@ msgstr "JScript 객체가 필요함"
 msgid "Syntax error in regular expression"
 msgstr "정규 표현식에 문법오류가 있음"
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr "URI 는 올바르지 않은 문자를 포함해서 인코딩되었음"
 
-#: jscript.rc:49
+#: jscript.rc:48
+#, fuzzy
+msgid "URI to be decoded is incorrect"
+msgstr "URI 는 올바르지 않은 문자를 포함해서 인코딩되었음"
+
+#: jscript.rc:50
 msgid "Array length must be a finite positive integer"
 msgstr "배열 길이는 반드시  한정된 양의 정수이어야 함"
 
-#: jscript.rc:50
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr "배열 객체가 필요함"
 

po/lt.po

@@ -2339,15 +2339,20 @@ msgstr "Tikėtasi JScript objekto"
 msgid "Syntax error in regular expression"
 msgstr "Sintaksės klaida reguliariajame reiškinyje"
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr "Koduotiname URI yra netinkamų simbolių"
 
-#: jscript.rc:49
+#: jscript.rc:48
+#, fuzzy
+msgid "URI to be decoded is incorrect"
+msgstr "Koduotiname URI yra netinkamų simbolių"
+
+#: jscript.rc:50
 msgid "Array length must be a finite positive integer"
 msgstr "Masyvo dydis turi būti teigiamas sveikasis skaičius"
 
-#: jscript.rc:50
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr "Tikėtasi masyvo objekto"
 

po/ml.po

@@ -2278,15 +2278,19 @@ msgstr ""
 msgid "Syntax error in regular expression"
 msgstr ""
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr ""
 
-#: jscript.rc:49
+#: jscript.rc:48
-msgid "Array length must be a finite positive integer"
+msgid "URI to be decoded is incorrect"
 msgstr ""
 
 #: jscript.rc:50
+msgid "Array length must be a finite positive integer"
+msgstr ""
+
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr ""
 

po/nb_NO.po

@@ -2478,15 +2478,20 @@ msgstr "Forventet JScript-objekt"
 msgid "Syntax error in regular expression"
 msgstr "Syntaksfeil i regulært uttrykk"
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr "URI'en som skulle kodes inneholder ugyldige tegn"
 
-#: jscript.rc:49
+#: jscript.rc:48
+#, fuzzy
+msgid "URI to be decoded is incorrect"
+msgstr "URI'en som skulle kodes inneholder ugyldige tegn"
+
+#: jscript.rc:50
 msgid "Array length must be a finite positive integer"
 msgstr "Rekkens lengde må være et endelig, positivt tall"
 
-#: jscript.rc:50
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr "Forventet rekke-objekt"
 

po/nl.po

@@ -2360,15 +2360,20 @@ msgstr "JScript object verwacht"
 msgid "Syntax error in regular expression"
 msgstr "Syntax fout in reguliere expressie"
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr "De te coderen URI bevat ongeldige tekens"
 
-#: jscript.rc:49
+#: jscript.rc:48
+#, fuzzy
+msgid "URI to be decoded is incorrect"
+msgstr "De te coderen URI bevat ongeldige tekens"
+
+#: jscript.rc:50
 msgid "Array length must be a finite positive integer"
 msgstr "Array lengte moet een eindig, positief geheel getal zijn"
 
-#: jscript.rc:50
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr "Array object verwacht"
 

po/or.po

@@ -2278,15 +2278,19 @@ msgstr ""
 msgid "Syntax error in regular expression"
 msgstr ""
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr ""
 
-#: jscript.rc:49
+#: jscript.rc:48
-msgid "Array length must be a finite positive integer"
+msgid "URI to be decoded is incorrect"
 msgstr ""
 
 #: jscript.rc:50
+msgid "Array length must be a finite positive integer"
+msgstr ""
+
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr ""
 

po/pa.po

@@ -2278,15 +2278,19 @@ msgstr ""
 msgid "Syntax error in regular expression"
 msgstr ""
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr ""
 
-#: jscript.rc:49
+#: jscript.rc:48
-msgid "Array length must be a finite positive integer"
+msgid "URI to be decoded is incorrect"
 msgstr ""
 
 #: jscript.rc:50
+msgid "Array length must be a finite positive integer"
+msgstr ""
+
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr ""
 

po/pl.po

@@ -2342,15 +2342,20 @@ msgstr "Oczekiwany obiekt JScript"
 msgid "Syntax error in regular expression"
 msgstr "Błąd składni w regularnym wyrażeniu"
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr "Kodowane URI zawiera niewłaściwe znaki"
 
-#: jscript.rc:49
+#: jscript.rc:48
+#, fuzzy
+msgid "URI to be decoded is incorrect"
+msgstr "Kodowane URI zawiera niewłaściwe znaki"
+
+#: jscript.rc:50
 msgid "Array length must be a finite positive integer"
 msgstr "Długość tablicy musi być skończoną dodatnią liczbą stałą"
 
-#: jscript.rc:50
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr "Oczekiwany obiekt tablicowy"
 

po/pt_BR.po

@@ -2472,15 +2472,20 @@ msgstr "Objeto JScript esperado"
 msgid "Syntax error in regular expression"
 msgstr "Erro de sintaxe na expressão regular"
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr "URI a ser codificado contém caracteres inválidos"
 
-#: jscript.rc:49
+#: jscript.rc:48
+#, fuzzy
+msgid "URI to be decoded is incorrect"
+msgstr "URI a ser codificado contém caracteres inválidos"
+
+#: jscript.rc:50
 msgid "Array length must be a finite positive integer"
 msgstr "Tamanho do vetor tem que ser um inteiro finito positivo"
 
-#: jscript.rc:50
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr "Objeto Array esperado"
 

po/pt_PT.po

@@ -2518,15 +2518,20 @@ msgstr "Objecto JScript esperado"
 msgid "Syntax error in regular expression"
 msgstr "Erro de sintaxe na expressão regular"
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr "URI a ser codificado contém caracteres inválidos"
 
-#: jscript.rc:49
+#: jscript.rc:48
+#, fuzzy
+msgid "URI to be decoded is incorrect"
+msgstr "URI a ser codificado contém caracteres inválidos"
+
+#: jscript.rc:50
 msgid "Array length must be a finite positive integer"
 msgstr "Tamanho do vector tem de ser um inteiro finito positivo"
 
-#: jscript.rc:50
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr "Objecto Array esperado"
 

po/rm.po

@@ -2295,15 +2295,19 @@ msgstr ""
 msgid "Syntax error in regular expression"
 msgstr ""
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr ""
 
-#: jscript.rc:49
+#: jscript.rc:48
-msgid "Array length must be a finite positive integer"
+msgid "URI to be decoded is incorrect"
 msgstr ""
 
 #: jscript.rc:50
+msgid "Array length must be a finite positive integer"
+msgstr ""
+
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr ""
 

po/ro.po

@@ -2525,15 +2525,20 @@ msgstr "Se așteaptă un obiect JScript"
 msgid "Syntax error in regular expression"
 msgstr "Eroare de sintaxă în expresia regulată"
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr "URI care trebuie codificat conține caractere nevalide"
 
-#: jscript.rc:49
+#: jscript.rc:48
+#, fuzzy
+msgid "URI to be decoded is incorrect"
+msgstr "URI care trebuie codificat conține caractere nevalide"
+
+#: jscript.rc:50
 msgid "Array length must be a finite positive integer"
 msgstr "Lungimea unei matrice trebuie să fie un număr întreg pozitiv"
 
-#: jscript.rc:50
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr "Se așteaptă un obiect matrice"
 

po/ru.po

@@ -2338,15 +2338,20 @@ msgstr "Ожидается объект типа 'JScript'"
 msgid "Syntax error in regular expression"
 msgstr "Синтаксическая ошибка в регулярном выражении"
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr "URI содержит неверные символы"
 
-#: jscript.rc:49
+#: jscript.rc:48
+#, fuzzy
+msgid "URI to be decoded is incorrect"
+msgstr "URI содержит неверные символы"
+
+#: jscript.rc:50
 msgid "Array length must be a finite positive integer"
 msgstr "Длиной массива должно быть конечное положительное число"
 
-#: jscript.rc:50
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr "Ожидается объект типа 'Array'"
 

po/sk.po

@@ -2311,15 +2311,19 @@ msgstr ""
 msgid "Syntax error in regular expression"
 msgstr ""
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr ""
 
-#: jscript.rc:49
+#: jscript.rc:48
-msgid "Array length must be a finite positive integer"
+msgid "URI to be decoded is incorrect"
 msgstr ""
 
 #: jscript.rc:50
+msgid "Array length must be a finite positive integer"
+msgstr ""
+
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr ""
 

po/sl.po

@@ -2354,15 +2354,20 @@ msgstr "Pričakovan je bil predmet JScript"
 msgid "Syntax error in regular expression"
 msgstr "Napaka skladnje v logičnem izrazu"
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr "URI za kodiranje vsebuje neveljavne znake"
 
-#: jscript.rc:49
+#: jscript.rc:48
+#, fuzzy
+msgid "URI to be decoded is incorrect"
+msgstr "URI za kodiranje vsebuje neveljavne znake"
+
+#: jscript.rc:50
 msgid "Array length must be a finite positive integer"
 msgstr "Dolžina polja mora bit pozitivno celo število"
 
-#: jscript.rc:50
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr "Pričakovan je bil predmet polja"
 

po/sr_RS@cyrillic.po

@@ -2353,15 +2353,20 @@ msgstr "Очекивани објекат JScript врсте"
 msgid "Syntax error in regular expression"
 msgstr "Синтаксна грешка у регуларном изразу"
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr "URI садржи неисправне знакове"
 
-#: jscript.rc:49
+#: jscript.rc:48
+#, fuzzy
+msgid "URI to be decoded is incorrect"
+msgstr "URI садржи неисправне знакове"
+
+#: jscript.rc:50
 msgid "Array length must be a finite positive integer"
 msgstr "Низ дужине мора бити коначан позитиван цео број"
 
-#: jscript.rc:50
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr "Очекивани низ објекта"
 

po/sr_RS@latin.po

@@ -2379,15 +2379,20 @@ msgstr "Očekivani objekat JScript vrste"
 msgid "Syntax error in regular expression"
 msgstr "Sintaksna greška u regularnom izrazu"
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr "URI sadrži neispravne znakove"
 
-#: jscript.rc:49
+#: jscript.rc:48
+#, fuzzy
+msgid "URI to be decoded is incorrect"
+msgstr "URI sadrži neispravne znakove"
+
+#: jscript.rc:50
 msgid "Array length must be a finite positive integer"
 msgstr "Niz dužine mora biti konačan pozitivan ceo broj"
 
-#: jscript.rc:50
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr "Očekivani niz objekta"
 

po/sv.po

@@ -2347,15 +2347,20 @@ msgstr "JScript-objekt förväntades"
 msgid "Syntax error in regular expression"
 msgstr "Syntaxfel i reguljärt uttryck"
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr "Den URI som ska kodas innehåller ogiltiga tecken"
 
-#: jscript.rc:49
+#: jscript.rc:48
+#, fuzzy
+msgid "URI to be decoded is incorrect"
+msgstr "Den URI som ska kodas innehåller ogiltiga tecken"
+
+#: jscript.rc:50
 msgid "Array length must be a finite positive integer"
 msgstr "Array-längd måste vara ett positivt ändligt heltal"
 
-#: jscript.rc:50
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr "Array-objekt förväntades"
 

po/te.po

@@ -2278,15 +2278,19 @@ msgstr ""
 msgid "Syntax error in regular expression"
 msgstr ""
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr ""
 
-#: jscript.rc:49
+#: jscript.rc:48
-msgid "Array length must be a finite positive integer"
+msgid "URI to be decoded is incorrect"
 msgstr ""
 
 #: jscript.rc:50
+msgid "Array length must be a finite positive integer"
+msgstr ""
+
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr ""
 

po/th.po

@@ -2303,15 +2303,19 @@ msgstr ""
 msgid "Syntax error in regular expression"
 msgstr ""
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr ""
 
-#: jscript.rc:49
+#: jscript.rc:48
-msgid "Array length must be a finite positive integer"
+msgid "URI to be decoded is incorrect"
 msgstr ""
 
 #: jscript.rc:50
+msgid "Array length must be a finite positive integer"
+msgstr ""
+
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr ""
 

po/tr.po

@@ -2382,15 +2382,19 @@ msgstr ""
 msgid "Syntax error in regular expression"
 msgstr ""
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr ""
 
-#: jscript.rc:49
+#: jscript.rc:48
-msgid "Array length must be a finite positive integer"
+msgid "URI to be decoded is incorrect"
 msgstr ""
 
 #: jscript.rc:50
+msgid "Array length must be a finite positive integer"
+msgstr ""
+
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr ""
 

po/uk.po

@@ -2334,15 +2334,20 @@ msgstr "Очікується об'єкт JScript"
 msgid "Syntax error in regular expression"
 msgstr "Синтаксична помилка в регулярному виразі"
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr "URI, що буде закодований, містить неприпустимі символи"
 
-#: jscript.rc:49
+#: jscript.rc:48
+#, fuzzy
+msgid "URI to be decoded is incorrect"
+msgstr "URI, що буде закодований, містить неприпустимі символи"
+
+#: jscript.rc:50
 msgid "Array length must be a finite positive integer"
 msgstr "Довжиною масиву повинне бути скінченне додатнє ціле число"
 
-#: jscript.rc:50
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr "Очікується об'єкт Array"
 

po/wa.po

@@ -2306,15 +2306,19 @@ msgstr ""
 msgid "Syntax error in regular expression"
 msgstr ""
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr ""
 
-#: jscript.rc:49
+#: jscript.rc:48
-msgid "Array length must be a finite positive integer"
+msgid "URI to be decoded is incorrect"
 msgstr ""
 
 #: jscript.rc:50
+msgid "Array length must be a finite positive integer"
+msgstr ""
+
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr ""
 

po/wine.pot

@@ -2265,15 +2265,19 @@ msgstr ""
 msgid "Syntax error in regular expression"
 msgstr ""
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr ""
 
-#: jscript.rc:49
+#: jscript.rc:48
-msgid "Array length must be a finite positive integer"
+msgid "URI to be decoded is incorrect"
 msgstr ""
 
 #: jscript.rc:50
+msgid "Array length must be a finite positive integer"
+msgstr ""
+
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr ""
 

po/zh_CN.po

@@ -2356,15 +2356,19 @@ msgstr ""
 msgid "Syntax error in regular expression"
 msgstr ""
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr ""
 
-#: jscript.rc:49
+#: jscript.rc:48
-msgid "Array length must be a finite positive integer"
+msgid "URI to be decoded is incorrect"
 msgstr ""
 
 #: jscript.rc:50
+msgid "Array length must be a finite positive integer"
+msgstr ""
+
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr ""
 

po/zh_TW.po

@@ -2358,15 +2358,19 @@ msgstr ""
 msgid "Syntax error in regular expression"
 msgstr ""
 
-#: jscript.rc:48
+#: jscript.rc:49
 msgid "URI to be encoded contains invalid characters"
 msgstr ""
 
-#: jscript.rc:49
+#: jscript.rc:48
-msgid "Array length must be a finite positive integer"
+msgid "URI to be decoded is incorrect"
 msgstr ""
 
 #: jscript.rc:50
+msgid "Array length must be a finite positive integer"
+msgstr ""
+
+#: jscript.rc:51
 msgid "Array object expected"
 msgstr ""