[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-4097-gfc8cbf0

[Michal Čihař]

The branch, master has been updated
       via  fc8cbf0c2882a484a6fb65dbab19bc0c482fe523 (commit)
       via  bf53d9766d699edc439e59761432c71f6191ee97 (commit)
       via  6745ee722446dd84a3c95f4a89f81ac35344fc49 (commit)
       via  310d339945060a097d2a49776ddb00225782ab7a (commit)
       via  afce5339e19922feb3acf277e253cb87b2880af2 (commit)
       via  4d8fc234f8a338349e592881db5229d2108e2e1c (commit)
       via  50272604526ee9f98bd8a1fbd543d466db41f4ad (commit)
       via  6dfa097b578dce1425d3a225590bd13d82218a0f (commit)
       via  94f05bfb5cab10b00dd9ebb60677ff8c911c1523 (commit)
       via  6fb04650a8dcf35b152fd71088c029f50ebed707 (commit)
       via  e66f4ce7610c0a22da44476e455111f6673cdb7f (commit)
       via  b42ebd4429ec1a2aa61058aadd2819e1dfbbe8af (commit)
       via  14e345de7bb6a84283c708bc0e0019edd935730c (commit)
       via  e369cc64df6dd0424097cfe592054559bea48a35 (commit)
       via  1067a1c2eeafe398ed316f38a562b3d85e8d2230 (commit)
      from  93da8607b19f192b35e097ed86c767074bd8aae6 (commit)


- Log -----------------------------------------------------------------
commit fc8cbf0c2882a484a6fb65dbab19bc0c482fe523
Merge: 93da8607b19f192b35e097ed86c767074bd8aae6 bf53d9766d699edc439e59761432c71f6191ee97
Author: Michal Čihař <mcihar at novell.com>
Date:   Tue May 25 16:12:51 2010 +0200

    Merge branch 'QA_3_3'
    
    Conflicts:
    	lang/afrikaans-utf-8.inc.php
    	lang/albanian-utf-8.inc.php
    	lang/arabic-utf-8.inc.php
    	lang/azerbaijani-utf-8.inc.php
    	lang/bangla-utf-8.inc.php
    	lang/basque-utf-8.inc.php
    	lang/belarusian_cyrillic-utf-8.inc.php
    	lang/belarusian_latin-utf-8.inc.php
    	lang/bosnian-utf-8.inc.php
    	lang/brazilian_portuguese-utf-8.inc.php
    	lang/bulgarian-utf-8.inc.php
    	lang/catalan-utf-8.inc.php
    	lang/chinese_simplified-utf-8.inc.php
    	lang/chinese_traditional-utf-8.inc.php
    	lang/croatian-utf-8.inc.php
    	lang/czech-utf-8.inc.php
    	lang/danish-utf-8.inc.php
    	lang/dutch-utf-8.inc.php
    	lang/english-utf-8.inc.php
    	lang/estonian-utf-8.inc.php
    	lang/finnish-utf-8.inc.php
    	lang/french-utf-8.inc.php
    	lang/galician-utf-8.inc.php
    	lang/georgian-utf-8.inc.php
    	lang/german-utf-8.inc.php
    	lang/greek-utf-8.inc.php
    	lang/hebrew-utf-8.inc.php
    	lang/hindi-utf-8.inc.php
    	lang/hungarian-utf-8.inc.php
    	lang/indonesian-utf-8.inc.php
    	lang/italian-utf-8.inc.php
    	lang/japanese-utf-8.inc.php
    	lang/korean-utf-8.inc.php
    	lang/latvian-utf-8.inc.php
    	lang/lithuanian-utf-8.inc.php
    	lang/macedonian_cyrillic-utf-8.inc.php
    	lang/malay-utf-8.inc.php
    	lang/mongolian-utf-8.inc.php
    	lang/norwegian-utf-8.inc.php
    	lang/persian-utf-8.inc.php
    	lang/polish-utf-8.inc.php
    	lang/portuguese-utf-8.inc.php
    	lang/romanian-utf-8.inc.php
    	lang/russian-utf-8.inc.php
    	lang/serbian_cyrillic-utf-8.inc.php
    	lang/serbian_latin-utf-8.inc.php
    	lang/sinhala-utf-8.inc.php
    	lang/slovak-utf-8.inc.php
    	lang/slovenian-utf-8.inc.php
    	lang/sort_lang.sh
    	lang/spanish-utf-8.inc.php
    	lang/swedish-utf-8.inc.php
    	lang/tatarish-utf-8.inc.php
    	lang/thai-utf-8.inc.php
    	lang/turkish-utf-8.inc.php
    	lang/ukrainian-utf-8.inc.php
    	lang/uzbek_cyrillic-utf-8.inc.php
    	lang/uzbek_latin-utf-8.inc.php

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

Summary of changes:
 ChangeLog |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 160d5f8..4a5b826 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -88,6 +88,7 @@ $Id$
 - bug #2998889 [import] Import button does not work in Catalan
 - [browse] Fix handling of sort order if only column is specified.
 + [lang] Greek update, thanks to Panagiotis Papazoglou - panos78
++ [lang] Updated lot of translation based on work done in master branch.
 
 3.3.3.0 (2010-05-10)
 - patch #2982480 [navi] Do not group if there would be one table in group,


hooks/post-receive
-- 
phpMyAdmin