Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b1cd192c2c78ccd3ef00927d456157d4c9f65cbf https://github.com/phpmyadmin/phpmyadmin/commit/b1cd192c2c78ccd3ef00927d4561... Author: Chunmin Tai taichunmin@gmail.com Date: 2012-12-16 (Sun, 16 Dec 2012)

Changed paths: M po/zh_TW.po

Log Message: ----------- Translated using Weblate (Chinese (Taiwan))

Currently translated at 84.6% (2167 of 2562)

Commit: 69d6ddb65122c44471ce53cbc68c38c24b6157f0 https://github.com/phpmyadmin/phpmyadmin/commit/69d6ddb65122c44471ce53cbc68c... Author: Weblate noreply@weblate.org Date: 2012-12-16 (Sun, 16 Dec 2012)

Changed paths: M ChangeLog M libraries/advisory_rules.txt

Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5

Commit: f352700435aee770d060fe877d69afc8345a1873 https://github.com/phpmyadmin/phpmyadmin/commit/f352700435aee770d060fe877d69... Author: Michal Čihař michal@cihar.com Date: 2012-12-16 (Sun, 16 Dec 2012)

Changed paths: M po/zh_TW.po

Log Message: ----------- Fix format string

Commit: d191efc706fe6e6af85cbc6e3c88f9fca749eb8f https://github.com/phpmyadmin/phpmyadmin/commit/d191efc706fe6e6af85cbc6e3c88... Author: Michal Čihař michal@cihar.com Date: 2012-12-16 (Sun, 16 Dec 2012)

Log Message: ----------- Merge commit '69d6ddb65122c44471ce53cbc68c38c24b6157f0'

Commit: 965f969dbc58673fe66e27b336dad48be5f8c061 https://github.com/phpmyadmin/phpmyadmin/commit/965f969dbc58673fe66e27b336da... Author: Michal Čihař michal@cihar.com Date: 2012-12-16 (Sun, 16 Dec 2012)

Changed paths: M po/zh_TW.po

Log Message: ----------- Merge branch 'QA_3_5'

Conflicts: po/zh_TW.po

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4850c8bdb7f4...965f969dbc58