- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin scripts branch, master, updated. 5043584361445bd86ec5c43f8d6925b222fbe9bd
by Michal Čihař 25 Feb '10

25 Feb '10

The branch, master has been updated via 5043584361445bd86ec5c43f8d6925b222fbe9bd (commit) from e6796538aab188515753c63e544157177651e823 (commit) - Log ----------------------------------------------------------------- commit 5043584361445bd86ec5c43f8d6925b222fbe9bd Author: Michal Čihař <michal(a)cihar.com> Date: Thu Feb 25 17:16:39 2010 +0100 Avoid using repo-config. ----------------------------------------------------------------------- Summary of changes: git-hooks/git-ciabot | 2 +- git-hooks/post-receive | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/git-hooks/git-ciabot b/git-hooks/git-ciabot index 1fb1b37..8367301 100755 --- a/git-hooks/git-ciabot +++ b/git-hooks/git-ciabot @@ -22,7 +22,7 @@ # # The project as known to CIA -project="$(git repo-config hooks.cia-project)" +project="$(git config hooks.cia-project)" # Set to true if you want the full log to be sent noisy=false diff --git a/git-hooks/post-receive b/git-hooks/post-receive index e83343f..f71b8fd 100755 --- a/git-hooks/post-receive +++ b/git-hooks/post-receive @@ -671,7 +671,7 @@ announcerecipients=$(git config hooks.announcelist) envelopesender=$(git config hooks.envelopesender) emailprefix=$(git config hooks.emailprefix || echo '[SCM] ') custom_showrev=$(git config hooks.showrev) -cia_project=$(git repo-config hooks.cia-project) +cia_project=$(git config hooks.cia-project) # --- Main loop # Allow dual mode: run from the command line just like the update hook, or hooks/post-receive -- phpMyAdmin scripts

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin scripts branch, master, updated. e6796538aab188515753c63e544157177651e823
by Michal Čihař 25 Feb '10

25 Feb '10

The branch, master has been updated via e6796538aab188515753c63e544157177651e823 (commit) via 3272c3d9c0336660f7a922f40e03f51e58894472 (commit) via 7b2513d0877cb02d17fba7a3782fd9b8104d52e8 (commit) via ed4f19cbcc44d2bd5607d1639e1b90c902c229bb (commit) via 12cb553fc77138f3405d6c0befb7df9a8eab0e91 (commit) from 02593571f4d0448d24024d62c73cb022f36c2078 (commit) - Log ----------------------------------------------------------------- commit e6796538aab188515753c63e544157177651e823 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Feb 25 17:14:41 2010 +0100 Fix viewer url. commit 3272c3d9c0336660f7a922f40e03f51e58894472 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Feb 25 17:13:43 2010 +0100 Adjust config. commit 7b2513d0877cb02d17fba7a3782fd9b8104d52e8 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Feb 25 17:13:33 2010 +0100 Call new bot. commit ed4f19cbcc44d2bd5607d1639e1b90c902c229bb Author: Michal Čihař <michal(a)cihar.com> Date: Thu Feb 25 17:12:05 2010 +0100 Add another ciabot. This one seems to better fit our needs. commit 12cb553fc77138f3405d6c0befb7df9a8eab0e91 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Feb 25 17:08:05 2010 +0100 CIA notification per commit. ----------------------------------------------------------------------- Summary of changes: git-hooks/git-ciabot | 109 ++++++++++++++++++++++++++++++++++++++++++++++++ git-hooks/post-receive | 4 +- 2 files changed, 112 insertions(+), 1 deletions(-) create mode 100755 git-hooks/git-ciabot diff --git a/git-hooks/git-ciabot b/git-hooks/git-ciabot new file mode 100755 index 0000000..1fb1b37 --- /dev/null +++ b/git-hooks/git-ciabot @@ -0,0 +1,109 @@ +#!/usr/bin/env bash +# Distributed under the terms of the GNU General Public License v2 +# Copyright (c) 2006 Fernando J. Pereda <ferdy(a)gentoo.org> +# +# Git CIA bot in bash. (no, not the POSIX shell, bash). +# It is *heavily* based on Git ciabot.pl by Petr Baudis. +# +# It is meant to be run either on a post-commit hook or in an update +# hook: +# +# post-commit: It parses latest commit and current HEAD to get the +# information it needs. +# +# update: You have to call it once per merged commit: +# +# refname=$1 +# oldhead=$2 +# newhead=$3 +# for merged in $(git rev-list ${oldhead}..${newhead} | tac) ; do +# /path/to/ciabot.bash ${refname} ${merged} +# done +# + +# The project as known to CIA +project="$(git repo-config hooks.cia-project)" + +# Set to true if you want the full log to be sent +noisy=false + +# Addresses for the e-mail +from="you(a)yourthing.com" +to="cia(a)cia.vc" + +# SMTP client to use +sendmail="/usr/sbin/sendmail -t" + +# Changeset URL +url="http://phpmyadmin.git.sourceforge.net/git/gitweb.cgi?p=phpmyadmin/`basename $PWD`;a=commit;h=@@sha1@@" + +# You shouldn't be touching anything else. +if [[ $# = 0 ]] ; then + refname=$(git symbolic-ref HEAD 2>/dev/null) + merged=$(git rev-parse HEAD) +else + refname=$1 + merged=$2 +fi + +refname=${refname##refs/heads/} + +gitver=$(git --version) +gitver=${gitver##* } + +rev=$(git describe ${merged} 2>/dev/null) +[[ -z ${rev} ]] && rev=${merged:0:12} + +rawcommit=$(git cat-file commit ${merged}) + +author=$(sed -n -e '/^author .*<$[^(a)]*$.*$/s--\1-p' \ + <<< "${rawcommit}") + +logmessage=$(sed -e '1,/^$/d' <<< "${rawcommit}") +${noisy} || logmessage=$(head -n 1 <<< "${logmessage}") +logmessage=${logmessage//&/&} +logmessage=${logmessage//</<} +logmessage=${logmessage//>/>} + +ts=$(sed -n -e '/^author .*> $[0-9]\+$.*$/s--\1-p' \ + <<< "${rawcommit}") + +out=" +<message> + <generator> + <name>CIA Bash client for Git</name> + <version>${gitver}</version> + <url>http://dev.gentoo.org/~ferdy/stuff/ciabot.bash</url> + </generator> + <source> + <project>${project}</project> + <branch>${refname}</branch> + </source> + <timestamp>${ts}</timestamp> + <body> + <commit> + <author>${author}</author> + <revision>${rev}</revision> + <files> + $(git diff-tree -r --name-only ${merged} | + sed -e '1d' -e 's-.*-<file>&</file>-') + </files> + <log> +${logmessage} + </log> + <url>${url//@@sha1@@/${merged}}</url> + </commit> + </body> +</message>" + +${sendmail} << EOM +Message-ID: <${merged:0:12}.${author}@${project}> +From: ${from} +To: ${to} +Content-type: text/xml +Subject: DeliverXML +${out} +EOM + +# vim: set tw=70 : + diff --git a/git-hooks/post-receive b/git-hooks/post-receive index 34dcf4b..e83343f 100755 --- a/git-hooks/post-receive +++ b/git-hooks/post-receive @@ -686,7 +686,9 @@ else do generate_email $oldrev $newrev $refname | send_mail if [ -n "$cia_project" ]; then - /gitrepo/p/ph/phpmyadmin/scripts/hooks/git-ciabot.pl $newrev $refname + for merged in $(git-rev-list $newrev ^$oldrev | tac); do + /gitrepo/p/ph/phpmyadmin/scripts/hooks/git-ciabot $merged $refname + done fi done fi hooks/post-receive -- phpMyAdmin scripts

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin scripts branch, master, updated. 02593571f4d0448d24024d62c73cb022f36c2078
by Michal Čihař 25 Feb '10

25 Feb '10

The branch, master has been updated via 02593571f4d0448d24024d62c73cb022f36c2078 (commit) via def1b959efa2e14bb2d27cd71a1d01d341a1d7cc (commit) from 8198049d1d02fd73e2449630c2d2153e0cad69d6 (commit) - Log ----------------------------------------------------------------- commit 02593571f4d0448d24024d62c73cb022f36c2078 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Feb 25 17:03:48 2010 +0100 Document hooks.cia-project. commit def1b959efa2e14bb2d27cd71a1d01d341a1d7cc Author: Michal Čihař <michal(a)cihar.com> Date: Thu Feb 25 17:03:06 2010 +0100 Reintroduce CIA notifications. ----------------------------------------------------------------------- Summary of changes: git-hooks/post-receive | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/git-hooks/post-receive b/git-hooks/post-receive index fa1c953..34dcf4b 100755 --- a/git-hooks/post-receive +++ b/git-hooks/post-receive @@ -48,6 +48,8 @@ # "t=%s; printf 'http://.../?id=%%s' \$t; echo;echo; git show -C \$t; echo" # Be careful if "..." contains things that will be expanded by shell "eval" # or printf. +# hooks.cia-project +# Name of CIA project to notify # # Notes # ----- @@ -678,11 +680,13 @@ if [ -n "$1" -a -n "$2" -a -n "$3" ]; then # Output to the terminal in command line mode - if someone wanted to # resend an email; they could redirect the output to sendmail # themselves - cia_project="" PAGER= generate_email $2 $3 $1 else while read oldrev newrev refname do generate_email $oldrev $newrev $refname | send_mail + if [ -n "$cia_project" ]; then + /gitrepo/p/ph/phpmyadmin/scripts/hooks/git-ciabot.pl $newrev $refname + fi done fi hooks/post-receive -- phpMyAdmin scripts

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin scripts branch, master, updated. 8198049d1d02fd73e2449630c2d2153e0cad69d6
by Michal Čihař 25 Feb '10

25 Feb '10

The branch, master has been updated via 8198049d1d02fd73e2449630c2d2153e0cad69d6 (commit) from 3b2dc1f4610e7c0cc1723c11b922f24bbd4f17bc (commit) - Log ----------------------------------------------------------------- commit 8198049d1d02fd73e2449630c2d2153e0cad69d6 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Feb 25 16:57:46 2010 +0100 Include diff. ----------------------------------------------------------------------- Summary of changes: git-hooks/post-receive | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/git-hooks/post-receive b/git-hooks/post-receive index 48ae3e1..fa1c953 100755 --- a/git-hooks/post-receive +++ b/git-hooks/post-receive @@ -411,7 +411,7 @@ generate_update_branch_email() # non-fast-forward updates. echo "" echo "Summary of changes:" - git diff-tree --stat --summary --find-copies-harder $oldrev..$newrev + git diff-tree -p --stat --summary --find-copies-harder $oldrev..$newrev } # hooks/post-receive -- phpMyAdmin scripts

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin scripts branch, master, updated. 3b2dc1f4610e7c0cc1723c11b922f24bbd4f17bc
by Michal Čihař 25 Feb '10

25 Feb '10

The branch, master has been updated via 3b2dc1f4610e7c0cc1723c11b922f24bbd4f17bc (commit) from 4988f62d6ef0d6205219d09c3df4f84901d3446f (commit) - Log ----------------------------------------------------------------- commit 3b2dc1f4610e7c0cc1723c11b922f24bbd4f17bc Author: Michal Čihař <michal(a)cihar.com> Date: Thu Feb 25 16:53:03 2010 +0100 More updates to email hook. ----------------------------------------------------------------------- Summary of changes: git-hooks/post-receive | 21 +++------------------ 1 files changed, 3 insertions(+), 18 deletions(-) hooks/post-receive -- phpMyAdmin scripts

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_2_9_0-2244-g4cff76ec
by Marc Delisle 25 Feb '10

25 Feb '10

The following commit has been merged in the master branch: commit 4cff76ec9b240625db52b6747d6f841335ae6b75 Author: Marc Delisle <lem9(a)users.sourceforge.net> Date: Thu Feb 25 07:36:36 2010 -0500 Testing commit (short message) This is a longer message aaaaa bbbbbb cccccc diff --git a/export.php b/export.php index 5c958b7..ace2aff 100644 --- a/export.php +++ b/export.php @@ -334,7 +334,7 @@ if (!$save_on_server) { header('Content-Type: ' . $mime_type); header('Expires: ' . gmdate('D, d M Y H:i:s') . ' GMT'); - // lem9: Tested behavior of + // Tested behavior of // IE 5.50.4807.2300 // IE 6.0.2800.1106 (small glitch, asks twice when I click Open) // IE 6.0.2900.2180 -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 4e2e70a4235c4dee35d3c0e43a683b0d4f8fe2c4
by Michal Čihař 25 Feb '10

25 Feb '10

The following commit has been merged in the master branch: commit 4e2e70a4235c4dee35d3c0e43a683b0d4f8fe2c4 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Feb 25 09:52:50 2010 +0100 Fix typo. diff --git a/po/cs.po b/po/cs.po index 9808d99..b95e59b 100644 --- a/po/cs.po +++ b/po/cs.po @@ -280,7 +280,7 @@ msgid "" "MySQL user who can read/write only the desired database. It's up to you to " "look up the appropriate part in the MySQL manual." msgstr "" -"phpMYAdmin může řídit celý MySQL server (potřebuje práva super-uživatele) " +"phpMyAdmin může řídit celý MySQL server (potřebuje práva super-uživatele) " "stejně tak dobře jako i jednotlivou databázi. Pro vykonání řídících akcí na " "jednotlivé databázi musí být řádně nastaven MySQL uživatel který má " "oprávnění pro čtení/zápis na požadované databázi. Jak nastavit tohoto " -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 39a547cd30ab197030c2fc641ead0e3895984595
by Michal Čihař 25 Feb '10

25 Feb '10

The following commit has been merged in the master branch: commit 39a547cd30ab197030c2fc641ead0e3895984595 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Feb 25 09:51:24 2010 +0100 Regenerate docs, include missing images. diff --git a/addendum/html_comment.zh_CN b/addendum/html_comment.zh_CN index daf6dbd..c2e7e6f 100644 --- a/addendum/html_comment.zh_CN +++ b/addendum/html_comment.zh_CN @@ -1,10 +1,10 @@ PO4A-HEADER:mode=before;position=<head>  diff --git a/addendum/html_head.zh_CN b/addendum/html_head.zh_CN index b9798d5..baada1e 100644 --- a/addendum/html_head.zh_CN +++ b/addendum/html_head.zh_CN @@ -1,7 +1,6 @@ PO4A-HEADER:mode=after;position=<div id="body">;beginboundary=<ul> <p> -This is translated version of a <a -href="http://www.phpmyadmin.net/documentation/">phpMyAdmin -documentation</a>. You can contribute to it on our <a -href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. +这是一份 <a href="http://www.phpmyadmin.net/documentation/">phpMyAdmin +文档</a>的翻译。你可以到<a +href="https://l10n.cihar.com/projects/pmadoc/">翻译服务器</a>来帮助我们完善它。 </p> diff --git a/output/ca/themes/original/img/docs_menu_bg.png b/output/ca/themes/original/img/docs_menu_bg.png new file mode 100644 index 0000000..8fe0d97 Binary files /dev/null and b/output/ca/themes/original/img/docs_menu_bg.png differ diff --git a/output/ca/themes/original/img/logo_right.png b/output/ca/themes/original/img/logo_right.png new file mode 100644 index 0000000..44da9f2 Binary files /dev/null and b/output/ca/themes/original/img/logo_right.png differ diff --git a/output/cs/themes/original/img/docs_menu_bg.png b/output/cs/themes/original/img/docs_menu_bg.png new file mode 100644 index 0000000..8fe0d97 Binary files /dev/null and b/output/cs/themes/original/img/docs_menu_bg.png differ diff --git a/output/cs/themes/original/img/logo_right.png b/output/cs/themes/original/img/logo_right.png new file mode 100644 index 0000000..44da9f2 Binary files /dev/null and b/output/cs/themes/original/img/logo_right.png differ diff --git a/output/de/themes/original/img/docs_menu_bg.png b/output/de/themes/original/img/docs_menu_bg.png new file mode 100644 index 0000000..8fe0d97 Binary files /dev/null and b/output/de/themes/original/img/docs_menu_bg.png differ diff --git a/output/de/themes/original/img/logo_right.png b/output/de/themes/original/img/logo_right.png new file mode 100644 index 0000000..44da9f2 Binary files /dev/null and b/output/de/themes/original/img/logo_right.png differ diff --git a/output/en_GB/themes/original/img/docs_menu_bg.png b/output/en_GB/themes/original/img/docs_menu_bg.png new file mode 100644 index 0000000..8fe0d97 Binary files /dev/null and b/output/en_GB/themes/original/img/docs_menu_bg.png differ diff --git a/output/en_GB/themes/original/img/logo_right.png b/output/en_GB/themes/original/img/logo_right.png new file mode 100644 index 0000000..44da9f2 Binary files /dev/null and b/output/en_GB/themes/original/img/logo_right.png differ diff --git a/output/es/themes/original/img/docs_menu_bg.png b/output/es/themes/original/img/docs_menu_bg.png new file mode 100644 index 0000000..8fe0d97 Binary files /dev/null and b/output/es/themes/original/img/docs_menu_bg.png differ diff --git a/output/es/themes/original/img/logo_right.png b/output/es/themes/original/img/logo_right.png new file mode 100644 index 0000000..44da9f2 Binary files /dev/null and b/output/es/themes/original/img/logo_right.png differ diff --git a/output/fi/themes/original/img/docs_menu_bg.png b/output/fi/themes/original/img/docs_menu_bg.png new file mode 100644 index 0000000..8fe0d97 Binary files /dev/null and b/output/fi/themes/original/img/docs_menu_bg.png differ diff --git a/output/fi/themes/original/img/logo_right.png b/output/fi/themes/original/img/logo_right.png new file mode 100644 index 0000000..44da9f2 Binary files /dev/null and b/output/fi/themes/original/img/logo_right.png differ diff --git a/output/fr/themes/original/img/docs_menu_bg.png b/output/fr/themes/original/img/docs_menu_bg.png new file mode 100644 index 0000000..8fe0d97 Binary files /dev/null and b/output/fr/themes/original/img/docs_menu_bg.png differ diff --git a/output/fr/themes/original/img/logo_right.png b/output/fr/themes/original/img/logo_right.png new file mode 100644 index 0000000..44da9f2 Binary files /dev/null and b/output/fr/themes/original/img/logo_right.png differ diff --git a/output/gl/themes/original/img/docs_menu_bg.png b/output/gl/themes/original/img/docs_menu_bg.png new file mode 100644 index 0000000..8fe0d97 Binary files /dev/null and b/output/gl/themes/original/img/docs_menu_bg.png differ diff --git a/output/gl/themes/original/img/logo_right.png b/output/gl/themes/original/img/logo_right.png new file mode 100644 index 0000000..44da9f2 Binary files /dev/null and b/output/gl/themes/original/img/logo_right.png differ diff --git a/output/hu/themes/original/img/docs_menu_bg.png b/output/hu/themes/original/img/docs_menu_bg.png new file mode 100644 index 0000000..8fe0d97 Binary files /dev/null and b/output/hu/themes/original/img/docs_menu_bg.png differ diff --git a/output/hu/themes/original/img/logo_right.png b/output/hu/themes/original/img/logo_right.png new file mode 100644 index 0000000..44da9f2 Binary files /dev/null and b/output/hu/themes/original/img/logo_right.png differ diff --git a/output/hy/themes/original/img/docs_menu_bg.png b/output/hy/themes/original/img/docs_menu_bg.png new file mode 100644 index 0000000..8fe0d97 Binary files /dev/null and b/output/hy/themes/original/img/docs_menu_bg.png differ diff --git a/output/hy/themes/original/img/logo_right.png b/output/hy/themes/original/img/logo_right.png new file mode 100644 index 0000000..44da9f2 Binary files /dev/null and b/output/hy/themes/original/img/logo_right.png differ diff --git a/output/it/themes/original/img/docs_menu_bg.png b/output/it/themes/original/img/docs_menu_bg.png new file mode 100644 index 0000000..8fe0d97 Binary files /dev/null and b/output/it/themes/original/img/docs_menu_bg.png differ diff --git a/output/it/themes/original/img/logo_right.png b/output/it/themes/original/img/logo_right.png new file mode 100644 index 0000000..44da9f2 Binary files /dev/null and b/output/it/themes/original/img/logo_right.png differ diff --git a/output/jp/themes/original/img/docs_menu_bg.png b/output/jp/themes/original/img/docs_menu_bg.png new file mode 100644 index 0000000..8fe0d97 Binary files /dev/null and b/output/jp/themes/original/img/docs_menu_bg.png differ diff --git a/output/jp/themes/original/img/logo_right.png b/output/jp/themes/original/img/logo_right.png new file mode 100644 index 0000000..44da9f2 Binary files /dev/null and b/output/jp/themes/original/img/logo_right.png differ diff --git a/output/ka/themes/original/img/docs_menu_bg.png b/output/ka/themes/original/img/docs_menu_bg.png new file mode 100644 index 0000000..8fe0d97 Binary files /dev/null and b/output/ka/themes/original/img/docs_menu_bg.png differ diff --git a/output/ka/themes/original/img/logo_right.png b/output/ka/themes/original/img/logo_right.png new file mode 100644 index 0000000..44da9f2 Binary files /dev/null and b/output/ka/themes/original/img/logo_right.png differ diff --git a/output/lt/themes/original/img/docs_menu_bg.png b/output/lt/themes/original/img/docs_menu_bg.png new file mode 100644 index 0000000..8fe0d97 Binary files /dev/null and b/output/lt/themes/original/img/docs_menu_bg.png differ diff --git a/output/lt/themes/original/img/logo_right.png b/output/lt/themes/original/img/logo_right.png new file mode 100644 index 0000000..44da9f2 Binary files /dev/null and b/output/lt/themes/original/img/logo_right.png differ diff --git a/output/mn/themes/original/img/docs_menu_bg.png b/output/mn/themes/original/img/docs_menu_bg.png new file mode 100644 index 0000000..8fe0d97 Binary files /dev/null and b/output/mn/themes/original/img/docs_menu_bg.png differ diff --git a/output/mn/themes/original/img/logo_right.png b/output/mn/themes/original/img/logo_right.png new file mode 100644 index 0000000..44da9f2 Binary files /dev/null and b/output/mn/themes/original/img/logo_right.png differ diff --git a/output/nl/themes/original/img/docs_menu_bg.png b/output/nl/themes/original/img/docs_menu_bg.png new file mode 100644 index 0000000..8fe0d97 Binary files /dev/null and b/output/nl/themes/original/img/docs_menu_bg.png differ diff --git a/output/nl/themes/original/img/logo_right.png b/output/nl/themes/original/img/logo_right.png new file mode 100644 index 0000000..44da9f2 Binary files /dev/null and b/output/nl/themes/original/img/logo_right.png differ diff --git a/output/no/themes/original/img/docs_menu_bg.png b/output/no/themes/original/img/docs_menu_bg.png new file mode 100644 index 0000000..8fe0d97 Binary files /dev/null and b/output/no/themes/original/img/docs_menu_bg.png differ diff --git a/output/no/themes/original/img/logo_right.png b/output/no/themes/original/img/logo_right.png new file mode 100644 index 0000000..44da9f2 Binary files /dev/null and b/output/no/themes/original/img/logo_right.png differ diff --git a/output/pl/themes/original/img/docs_menu_bg.png b/output/pl/themes/original/img/docs_menu_bg.png new file mode 100644 index 0000000..8fe0d97 Binary files /dev/null and b/output/pl/themes/original/img/docs_menu_bg.png differ diff --git a/output/pl/themes/original/img/logo_right.png b/output/pl/themes/original/img/logo_right.png new file mode 100644 index 0000000..44da9f2 Binary files /dev/null and b/output/pl/themes/original/img/logo_right.png differ diff --git a/output/pt_BR/themes/original/img/docs_menu_bg.png b/output/pt_BR/themes/original/img/docs_menu_bg.png new file mode 100644 index 0000000..8fe0d97 Binary files /dev/null and b/output/pt_BR/themes/original/img/docs_menu_bg.png differ diff --git a/output/pt_BR/themes/original/img/logo_right.png b/output/pt_BR/themes/original/img/logo_right.png new file mode 100644 index 0000000..44da9f2 Binary files /dev/null and b/output/pt_BR/themes/original/img/logo_right.png differ diff --git a/output/ro/themes/original/img/docs_menu_bg.png b/output/ro/themes/original/img/docs_menu_bg.png new file mode 100644 index 0000000..8fe0d97 Binary files /dev/null and b/output/ro/themes/original/img/docs_menu_bg.png differ diff --git a/output/ro/themes/original/img/logo_right.png b/output/ro/themes/original/img/logo_right.png new file mode 100644 index 0000000..44da9f2 Binary files /dev/null and b/output/ro/themes/original/img/logo_right.png differ diff --git a/output/sv/themes/original/img/docs_menu_bg.png b/output/sv/themes/original/img/docs_menu_bg.png new file mode 100644 index 0000000..8fe0d97 Binary files /dev/null and b/output/sv/themes/original/img/docs_menu_bg.png differ diff --git a/output/sv/themes/original/img/logo_right.png b/output/sv/themes/original/img/logo_right.png new file mode 100644 index 0000000..44da9f2 Binary files /dev/null and b/output/sv/themes/original/img/logo_right.png differ diff --git a/output/tr/themes/original/img/docs_menu_bg.png b/output/tr/themes/original/img/docs_menu_bg.png new file mode 100644 index 0000000..8fe0d97 Binary files /dev/null and b/output/tr/themes/original/img/docs_menu_bg.png differ diff --git a/output/tr/themes/original/img/logo_right.png b/output/tr/themes/original/img/logo_right.png new file mode 100644 index 0000000..44da9f2 Binary files /dev/null and b/output/tr/themes/original/img/logo_right.png differ diff --git a/output/zh_CN/Documentation.html b/output/zh_CN/Documentation.html index 3c23647..eef9d56 100644 --- a/output/zh_CN/Documentation.html +++ b/output/zh_CN/Documentation.html @@ -10,11 +10,11 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78   <head> @@ -55,10 +55,9 @@ Questions)"> FAQ</abbr></a></li> <div id="body"> <p> -This is translated version of a <a -href="http://www.phpmyadmin.net/documentation/">phpMyAdmin -documentation</a>. You can contribute to it on our <a -href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. +这是一份 <a href="http://www.phpmyadmin.net/documentation/">phpMyAdmin +文档</a>的翻译。你可以到<a +href="https://l10n.cihar.com/projects/pmadoc/">翻译服务器</a>来帮助我们完善它。 </p> <ul><li><a href="http://www.phpmyadmin.net/"> phpMyAdmin 主页 (英语)</a></li> <li><a href="https://sourceforge.net/projects/phpmyadmin/"> phpMyAdmin 在 diff --git a/output/zh_CN/themes/original/img/docs_menu_bg.png b/output/zh_CN/themes/original/img/docs_menu_bg.png new file mode 100644 index 0000000..8fe0d97 Binary files /dev/null and b/output/zh_CN/themes/original/img/docs_menu_bg.png differ diff --git a/output/zh_CN/themes/original/img/logo_right.png b/output/zh_CN/themes/original/img/logo_right.png new file mode 100644 index 0000000..44da9f2 Binary files /dev/null and b/output/zh_CN/themes/original/img/logo_right.png differ diff --git a/output/zh_TW/themes/original/img/docs_menu_bg.png b/output/zh_TW/themes/original/img/docs_menu_bg.png new file mode 100644 index 0000000..8fe0d97 Binary files /dev/null and b/output/zh_TW/themes/original/img/docs_menu_bg.png differ diff --git a/output/zh_TW/themes/original/img/logo_right.png b/output/zh_TW/themes/original/img/logo_right.png new file mode 100644 index 0000000..44da9f2 Binary files /dev/null and b/output/zh_TW/themes/original/img/logo_right.png differ diff --git a/po/zh_CN.po b/po/zh_CN.po index b04242f..daeb7ba 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -11,10 +11,10 @@ msgstr "" "PO-Revision-Date: 2010-02-25 07:15+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: none\n" -"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.1\n" @@ -51,9 +51,9 @@ msgid "" "our <a href=\"https://l10n.cihar.com/projects/pmadoc/\">translation server</" "a>." msgstr "" -"这是一份 <a href=\"http://www.phpmyadmin.net/documentation/\">phpMyAdmin " -"文档</a>的翻译。你可以到<a " -"href=\"https://l10n.cihar.com/projects/pmadoc/\">翻译服务器</a>来帮助我们完善它。" +"这是一份 <a href=\"http://www.phpmyadmin.net/documentation/\">phpMyAdmin 文档" +"</a>的翻译。你可以到<a href=\"https://l10n.cihar.com/projects/pmadoc/\">翻译" +"服务器</a>来帮助我们完善它。" #. type: Content of: <html><head><title> #: ../phpmyadmin/Documentation.html:13 -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 39a547cd30ab197030c2fc641ead0e3895984595
by Michal Čihař 25 Feb '10

25 Feb '10

The following commit has been merged in the master branch: commit a7d647791ea1dadf6e51fe214426519ba05a2f37 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Feb 25 09:38:39 2010 +0100 Copy also images used in docs. diff --git a/admin/locales-update b/admin/locales-update index 23abc5a..43b20bd 100755 --- a/admin/locales-update +++ b/admin/locales-update @@ -95,6 +95,9 @@ for loc in po/*.po ; do files=`ls | grep -v docs.css | grep -v favicon.ico ` cp ../../../phpmyadmin/docs.css . cp ../../../phpmyadmin/favicon.ico . + mkdir -p themes/original/img + cp ../../../phpmyadmin/themes/original/img/logo_right.png themes/original/img + cp ../../../phpmyadmin/themes/original/img/docs_menu_bg.png themes/original/img cat > index.html <<EOT <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 39a547cd30ab197030c2fc641ead0e3895984595
by Michal Čihař 25 Feb '10

25 Feb '10

The following commit has been merged in the master branch: commit d4edcd1528d97ad90182261329ca301930ff37a7 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Feb 25 07:15:51 2010 +0200 Translation update done using Pootle. diff --git a/po/zh_CN.po b/po/zh_CN.po index 6ae1b08..b04242f 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-02-24 16:10+0100\n" -"PO-Revision-Date: 2010-02-25 03:43+0200\n" +"PO-Revision-Date: 2010-02-25 07:15+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: none\n" "Language: zh_CN\n" @@ -51,6 +51,9 @@ msgid "" "our <a href=\"https://l10n.cihar.com/projects/pmadoc/\">translation server</" "a>." msgstr "" +"这是一份 <a href=\"http://www.phpmyadmin.net/documentation/\">phpMyAdmin " +"文档</a>的翻译。你可以到<a " +"href=\"https://l10n.cihar.com/projects/pmadoc/\">翻译服务器</a>来帮助我们完善它。" #. type: Content of: <html><head><title> #: ../phpmyadmin/Documentation.html:13 -- phpMyAdmin localized documentation

1 0