The branch, master has been updated via add9bc3a38faa0abc30ac1d51d8fa1bdf40883cf (commit) via 831f7ae5ee073751d296ebc5e206680f44a43d49 (commit) via ff4e8787e969fc2b08677f536ee1ec77dd61ba54 (commit) via e725396bf1504aef8eea09f05c8a43946b74e73e (commit) via b3a0603400f48bafca17e48e1343d7a562eea557 (commit) via 4c9c7efe42cd043e0d662b1abd714dac6deb49e0 (commit) via d8718062e30ca3b504ef063213b0d00098f29540 (commit) via be119f48d71052a0b71c3ba5b2858f0369e87d7e (commit) from 31a023f96090c16bc791ee3bf2decb4d23c45388 (commit)

- Log ----------------------------------------------------------------- commit add9bc3a38faa0abc30ac1d51d8fa1bdf40883cf Author: Michal Čihař mcihar@novell.com Date: Thu Apr 1 09:53:54 2010 +0200

Fix pgettext when there is no translation.

commit 831f7ae5ee073751d296ebc5e206680f44a43d49 Author: fantonifabio fantonifabio@tiscali.it Date: Wed Mar 31 18:42:13 2010 +0200

Translation update done using Pootle.

commit ff4e8787e969fc2b08677f536ee1ec77dd61ba54 Author: fantonifabio fantonifabio@tiscali.it Date: Wed Mar 31 18:41:52 2010 +0200

Translation update done using Pootle.

commit e725396bf1504aef8eea09f05c8a43946b74e73e Author: fantonifabio fantonifabio@tiscali.it Date: Wed Mar 31 18:41:18 2010 +0200

Translation update done using Pootle.

commit b3a0603400f48bafca17e48e1343d7a562eea557 Author: fantonifabio fantonifabio@tiscali.it Date: Wed Mar 31 18:39:31 2010 +0200

Translation update done using Pootle.

commit 4c9c7efe42cd043e0d662b1abd714dac6deb49e0 Author: fantonifabio fantonifabio@tiscali.it Date: Wed Mar 31 18:39:12 2010 +0200

Translation update done using Pootle.

commit d8718062e30ca3b504ef063213b0d00098f29540 Author: fantonifabio fantonifabio@tiscali.it Date: Wed Mar 31 18:38:59 2010 +0200

Translation update done using Pootle.

commit be119f48d71052a0b71c3ba5b2858f0369e87d7e Author: fantonifabio fantonifabio@tiscali.it Date: Wed Mar 31 18:37:54 2010 +0200

Translation update done using Pootle.

-----------------------------------------------------------------------

Summary of changes: libraries/php-gettext/gettext.php | 7 ++++++- po/it.po | 19 +++++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/libraries/php-gettext/gettext.php b/libraries/php-gettext/gettext.php index a121f9c..80d2497 100644 --- a/libraries/php-gettext/gettext.php +++ b/libraries/php-gettext/gettext.php @@ -409,7 +409,12 @@ class gettext_reader {

function pgettext($context, $msgid) { $key = $context . chr(4) . $msgid; - return $this->translate($key); + $ret = $this->translate($key); + if (strpos($ret, "\004") !== FALSE) { + return $msgid; + } else { + return $ret; + } }

function npgettext($context, $singular, $plural, $number) { diff --git a/po/it.po b/po/it.po index 6e6374f..6187c8e 100644 --- a/po/it.po +++ b/po/it.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-03-30 23:18+0200\n" -"PO-Revision-Date: 2010-03-31 08:11+0200\n" +"PO-Revision-Date: 2010-03-31 18:42+0200\n" "Last-Translator: fantonifabio@tiscali.it\n" "Language-Team: italian it@li.org\n" "Language: it\n" @@ -827,6 +827,9 @@ msgid "" "exists in your phpMyAdmin directory. You should remove it once phpMyAdmin " "has been configured." msgstr "" +"La cartella [code]config[/code], che è utilizzata dallo script di " +"installazione, esiste ancora nella cartella del tuo phpMyAdmin. Si consiglia " +"di rimuoverla una volta configurato phpMyAdmin."

#: libraries/messages.inc.php:174 msgid "" @@ -1609,14 +1612,12 @@ msgid "Free pages" msgstr "Pagine libere"

#: libraries/messages.inc.php:351 -#, fuzzy msgid "Full start" -msgstr "Testo completo" +msgstr "Pieno avvio"

#: libraries/messages.inc.php:352 -#, fuzzy msgid "Full stop" -msgstr "Testo completo" +msgstr "Pieno spegnimento"

#: libraries/messages.inc.php:353 msgid "Full Texts" @@ -1660,7 +1661,7 @@ msgstr "Tedesco"

#: libraries/messages.inc.php:364 msgid "Get more themes!" -msgstr "" +msgstr "Ottieni altri temi!"

#: libraries/messages.inc.php:365 msgid "global" @@ -1765,6 +1766,8 @@ msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." msgstr "" +"Quando la tabella Host è usata, questo campo è ignorato e i valori " +"memorizzati nella tabella Host invece utilizzati."

#: libraries/messages.inc.php:391 msgid "Microsoft Excel 2000" @@ -1808,11 +1811,11 @@ msgstr "Utilizza gli IGNORE INSERTS"

#: libraries/messages.inc.php:402 msgid "Column names in first row" -msgstr "" +msgstr "I nomi delle colonne in prima fila"

#: libraries/messages.inc.php:403 msgid "Do not import empty rows" -msgstr "" +msgstr "Non importare righe vuote"

#: libraries/messages.inc.php:404 msgid "Import/Export coordinates for PDF schema"

hooks/post-receive