com doc/pt_br: Update translation: reference/array/ functions/array-merge.xml
[email protected] (Adiel Cristo) Thu, 28 Jan 2021 18:29:06 +0000
| Newsgroups | php.doc.pt-br |
|---|---|
| Message-ID | <[email protected]> |
Commit: dd831989aec8cc8f6ed5682f2f7f02e62b909352 Author: Luiz Pedro <[email protected]> Mon, 11 Jan 2021 23:56:04 -0300 Committer: Adiel Cristo <[email protected]> Thu, 28 Jan 2021 15:29:06 -0300 Parents: 6be11c70ce382a1edb06c2084072c6857df04797 Branches: master Link: http://git.php.net/?p=doc/pt_br.git;a=commitdiff;h=dd831989aec8cc8f6ed5682f2f7f02e62b909352 Log: Update translation Closes php/doc-pt_br#3 Bugs: https://bugs.php.net/3 Changed paths: M reference/array/functions/array-merge.xml Diff: diff --git a/reference/array/functions/array-merge.xml b/reference/array/functions/array-merge.xml index 4bff9cb7a..2a035402d 100644 --- a/reference/array/functions/array-merge.xml +++ b/reference/array/functions/array-merge.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- EN-Revision: e41aab5ecacf449e51179886c17f1d41735b0234 Maintainer: ae Status: ready --><!-- CREDITS: lucasr,felipe,ae --> +<!-- EN-Revision: 9e0f03ac354d797d1d16c0fcc1663e5e170f2727 Maintainer: ae Status: ready --><!-- CREDITS: lucasr,felipe,ae,github:LPJFilho --> <refentry xml:id="function.array-merge" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>array_merge</refname> @@ -21,7 +21,7 @@ Se os arrays dados têm as mesmas chaves string, então o último valor para uma chave irá sobrescrever o valor anterior. Se, no entanto, os arrays tem as mesmas chaves numéricas, o último valor para uma chave <emphasis - role="strong">not</emphasis> sobrescreverá o valor original, e sim adicionado ao array + role="strong">não</emphasis> sobrescreverá o valor original, e sim adicionado ao array resultante. </para> <para>