cvs: phpdoc /en/reference/json book.xml constants.xml reference.xml setup.xml /en/reference/json/functions json-decode.xml json-encode.xml

From: Date: Wed, 23 Apr 2008 17:58:34 +0000
Subject: cvs: phpdoc /en/reference/json book.xml constants.xml reference.xml setup.xml /en/reference/json/functions json-decode.xml json-encode.xml
Groups: php.doc.cvs 
Request: Send a blank email to doc-cvs+get-1565@lists.php.net to get a copy of this message
bjori Wed Apr 23 17:58:34 2008 UTC Modified files: /phpdoc/en/reference/json book.xml constants.xml reference.xml setup.xml /phpdoc/en/reference/json/functions json-decode.xml json-encode.xml Log: Revert accidental translation commit

http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/json/book.xml?r1=1.4&r2=1.5&diff_format=u Index: phpdoc/en/reference/json/book.xml diff -u phpdoc/en/reference/json/book.xml:1.4 phpdoc/en/reference/json/book.xml:1.5 --- phpdoc/en/reference/json/book.xml:1.4 Wed Apr 23 17:44:24 2008 +++ phpdoc/en/reference/json/book.xml Wed Apr 23 17:58:34 2008 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.4 $ --> -<!-- EN-Revision: 1.3 Maintainer: kalle Status: ready --> +<!-- $Revision: 1.5 $ --> <!-- Purpose: basic.other --> <!-- Membership: pecl, bundled --> @@ -11,9 +10,10 @@ <preface xml:id="intro.json"> &reftitle.intro; <para> - Denne udvidelse implementere <link xlink:href="&url.josn;">JavaScript Objekt Notation (JSON)</link> - data-udvekslings format. Enkodningens behandleren er baseret på JSON_checker analyseren af Douglas - Crockford. + This extension implements the <link + xlink:href="&url.json;">JavaScript Object Notation (JSON)</link> + data-interchange format. The decoding is handled by a parser based on + the JSON_checker by Douglas Crockford. </para> </preface> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/json/constants.xml?r1=1.3&r2=1.4&diff_format=u Index: phpdoc/en/reference/json/constants.xml diff -u phpdoc/en/reference/json/constants.xml:1.3 phpdoc/en/reference/json/constants.xml:1.4 --- phpdoc/en/reference/json/constants.xml:1.3 Wed Apr 23 17:44:24 2008 +++ phpdoc/en/reference/json/constants.xml Wed Apr 23 17:58:34 2008 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.3 $ --> -<!-- EN-Revision: 1.2 Maintainer: kalle Status: ready --> +<!-- $Revision: 1.4 $ --> <appendix xml:id="json.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> &reftitle.constants; http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/json/reference.xml?r1=1.7&r2=1.8&diff_format=u Index: phpdoc/en/reference/json/reference.xml diff -u phpdoc/en/reference/json/reference.xml:1.7 phpdoc/en/reference/json/reference.xml:1.8 --- phpdoc/en/reference/json/reference.xml:1.7 Wed Apr 23 17:44:24 2008 +++ phpdoc/en/reference/json/reference.xml Wed Apr 23 17:58:34 2008 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> -<!-- EN-Revision: 1.6 Maintainer: kalle Status: ready --> +<!-- $Revision: 1.8 $ --> <reference xml:id="ref.json" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>JSON &Functions;</title> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/json/setup.xml?r1=1.3&r2=1.4&diff_format=u Index: phpdoc/en/reference/json/setup.xml diff -u phpdoc/en/reference/json/setup.xml:1.3 phpdoc/en/reference/json/setup.xml:1.4 --- phpdoc/en/reference/json/setup.xml:1.3 Wed Apr 23 17:44:24 2008 +++ phpdoc/en/reference/json/setup.xml Wed Apr 23 17:58:34 2008 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.3 $ --> -<!-- EN-Revision: 1.2 Maintainer: kalle Status: ready --> +<!-- $Revision: 1.4 $ --> <chapter xml:id="json.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> &reftitle.setup; @@ -8,8 +7,7 @@ <section xml:id="json.requirements"> &reftitle.required; <para> - Fra og med PHP 5.2.0, er JSON udvidelsen bundtet og kompileret ind i PHP - som standard. + As of PHP 5.2.0, the JSON extension is bundled and compiled into PHP by default. </para> <para> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/json/functions/json-decode.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc/en/reference/json/functions/json-decode.xml diff -u phpdoc/en/reference/json/functions/json-decode.xml:1.5 phpdoc/en/reference/json/functions/json-decode.xml:1.6 --- phpdoc/en/reference/json/functions/json-decode.xml:1.5 Wed Apr 23 17:44:25 2008 +++ phpdoc/en/reference/json/functions/json-decode.xml Wed Apr 23 17:58:34 2008 @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.5 $ --> -<!-- EN-Revision: 1.4 Maintainer: kalle Status: ready --> - +<!-- $Revision: 1.6 $ --> <refentry xml:id="function.json-decode" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>json_decode</refname> - <refpurpose>Afkoder en JSON streng</refpurpose> + <refpurpose>Decodes a JSON string</refpurpose> </refnamediv> <refsect1 role="description"> @@ -16,7 +14,7 @@ <methodparam choice="opt"><type>bool</type><parameter>assoc</parameter></methodparam> </methodsynopsis> <para> - Tager en JSON enkodet streng og konverter den til en PHP variabel. + Takes a JSON encoded string and converts it into a PHP variable. </para> </refsect1> @@ -28,7 +26,7 @@ <term><parameter>json</parameter></term> <listitem> <para> - JSON streng til at afkode. + The <parameter>json</parameter> <type>string</type> being decoded. </para> </listitem> </varlistentry> @@ -36,8 +34,8 @@ <term><parameter>assoc</parameter></term> <listitem> <para> - Når &true;, vil returnerede objekter bliver konverteret til - et associative <type>array</type>s. + When &true;, returned <type>object</type>s will be converted into + associative <type>array</type>s. </para> </listitem> </varlistentry> @@ -48,8 +46,9 @@ <refsect1 role="returnvalues"> &reftitle.returnvalues; <para> - Returnere et objekt eller hvis den valgfrie <parameter>assoc</parameter> - parameter er &true;, et assocativt <type>array</type> er returneret i stedet. + Returns an <type>object</type> or if the optional + <parameter>assoc</parameter> parameter is &true;, an associative + <type>array</type> is instead returned. </para> </refsect1> @@ -57,7 +56,7 @@ &reftitle.examples; <para> <example> - <title><function>json_decode</function> eksempler</title> + <title><function>json_decode</function> examples</title> <programlisting role="php"> <![CDATA[ <?php @@ -111,8 +110,8 @@ &reftitle.notes; <caution> <para> - Denne funktion vil returnere &false; hvis den enkodet JSON data struktur's - dybde er mere en 127 elementer. + This function will return false if the JSON encoded data is deeper than + 127 elements. </para> </caution> </refsect1> @@ -131,7 +130,7 @@ <tbody> <row> <entry>5.2.3</entry> - <entry>Max struktur dybde blev ændret fra 20 til 128</entry> + <entry>The nesting limit was increased from 20 to 128</entry> </row> </tbody> </tgroup> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/json/functions/json-encode.xml?r1=1.4&r2=1.5&diff_format=u Index: phpdoc/en/reference/json/functions/json-encode.xml diff -u phpdoc/en/reference/json/functions/json-encode.xml:1.4 phpdoc/en/reference/json/functions/json-encode.xml:1.5 --- phpdoc/en/reference/json/functions/json-encode.xml:1.4 Wed Apr 23 17:44:25 2008 +++ phpdoc/en/reference/json/functions/json-encode.xml Wed Apr 23 17:58:34 2008 @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> -<!-- EN-Revision: 1.3 Maintainer: kalle Status: ready --> - +<!-- $Revision: 1.5 $ --> <refentry xml:id="function.json-encode" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>json_encode</refname> - <refpurpose>Returner en JSON enkodet streng</refpurpose> + <refpurpose>Returns the JSON representation of a value</refpurpose> </refnamediv> <refsect1 role="description"> @@ -15,7 +13,8 @@ <methodparam><type>mixed</type><parameter>value</parameter></methodparam> </methodsynopsis> <para> - Returner en JSON enkodet streng af <parameter>value</parameter>. + Returns a string containing the JSON representation of + <parameter>value</parameter>. </para> </refsect1> @@ -27,11 +26,11 @@ <term><parameter>value</parameter></term> <listitem> <para> - <parameter>value</parameter> parameteren kan have hvilken som helst type, dog - ikke en <type>resource</type>. + The <parameter>value</parameter> being encoded. Can be any type except + a <type>resource</type>. </para> <para> - Denne funktion virker kun med UTF-8 enkodet data. + This function only works with UTF-8 encoded data. </para> </listitem> </varlistentry> @@ -42,7 +41,7 @@ <refsect1 role="returnvalues"> &reftitle.returnvalues; <para> - Returner en JSON enkodet streng ved success. + Returns a JSON encoded <type>string</type> on success. </para> </refsect1> @@ -61,7 +60,7 @@ <row> <entry>5.2.1</entry> <entry> - Tilføjet support for basale JSON enkodings typer + Added support to JSON encode basic types </entry> </row> </tbody> @@ -74,7 +73,7 @@ &reftitle.examples; <para> <example> - <title><function>json_encode</function> eksempel</title> + <title>A <function>json_encode</function> example</title> <programlisting role="php"> <![CDATA[ <?php
« previous php.doc.cvs (#1565) next »