The branch, master has been updated via 8765b0d5c24239df9c1d7872d83a309510cddb9a (commit) via 7df085a03fe5404ca533fd930a57bb03f3576ad5 (commit) via fd8863867a82718764aecef104f6fa53102e4918 (commit) from fbe57a674c107d228209f85336ef83570f7ffa27 (commit)
- Log ----------------------------------------------------------------- commit 8765b0d5c24239df9c1d7872d83a309510cddb9a Merge: 7df085a03fe5404ca533fd930a57bb03f3576ad5 fbe57a674c107d228209f85336ef83570f7ffa27 Author: Michal Čihař mcihar@novell.com Date: Tue Jun 1 14:14:37 2010 +0200
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/localized_docs
commit 7df085a03fe5404ca533fd930a57bb03f3576ad5 Author: Michal Čihař mcihar@novell.com Date: Tue Jun 1 14:14:20 2010 +0200
Fix some errors in translations.
commit fd8863867a82718764aecef104f6fa53102e4918 Author: Michal Čihař mcihar@novell.com Date: Tue Jun 1 14:14:01 2010 +0200
Add script for showing summary.
-----------------------------------------------------------------------
Summary of changes: locales-stats | 2 +- po/hy.po | 4 ++-- po/sk.po | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/locales-stats b/locales-stats index c191442..b918850 100755 --- a/locales-stats +++ b/locales-stats @@ -1,6 +1,6 @@ #!/bin/sh for x in po/*.po ; do - lang=`echo $x | sed 's@po/(.*).po@\1@'` + lang=`basename $x` echo -n "$lang: " msgfmt --statistics --check -o - $x > /dev/null done diff --git a/po/hy.po b/po/hy.po index fa19037..49d8be1 100644 --- a/po/hy.po +++ b/po/hy.po @@ -523,7 +523,7 @@ msgid "" "?>\n" msgstr "" "<?php\n" -"$cfg['blowfish_secret'] = 'ba17c1ec07d65003'; // օգտագործեք այստեղ Ձեր ընտրության արժեքը$i=0;$i++;$cfg['Servers'][$i]['auth_type'] = 'cookie';?>" +"$cfg['blowfish_secret'] = 'ba17c1ec07d65003'; // օգտագործեք այստեղ Ձեր ընտրության արժեքը$i=0;$i++;$cfg['Servers'][$i]['auth_type'] = 'cookie';?>\n"
#. type: Content of: <html><body><div><ol><li><ul><li> #: ../phpmyadmin/Documentation.html:238 @@ -544,7 +544,7 @@ msgid "" "?>\n" msgstr "" "<?php\n" -"$i=0;$i++;$cfg['Servers'][$i]['user'] = 'root';$cfg['Servers'][$i]['password'] = 'cbb74bc'; // օգտագործեք այստեղ Ձեր ծածկագիրը$cfg['Servers'][$i]['auth_type'] = 'config';?>" +"$i=0;$i++;$cfg['Servers'][$i]['user'] = 'root';$cfg['Servers'][$i]['password'] = 'cbb74bc'; // օգտագործեք այստեղ Ձեր ծածկագիրը$cfg['Servers'][$i]['auth_type'] = 'config';?>\n"
#. type: Content of: <html><body><div><ol><li><ul><li> #: ../phpmyadmin/Documentation.html:249 diff --git a/po/sk.po b/po/sk.po index 5e822c0..38684d6 100644 --- a/po/sk.po +++ b/po/sk.po @@ -10,11 +10,11 @@ msgstr "" "POT-Creation-Date: 2010-05-25 14:42+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME EMAIL@ADDRESS\n" -"Language-Team: LANGUAGE LL@li.org\n" -"Language: \n" +"Language-Team: Slovak sk@li.org\n" +"Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: ENCODING\n" +"Content-Transfer-Encoding: 8-bit\n" "#-#-#-#-# sk-html.pot (phpMyAdmin documentation VERSION) #-#-#-#-#\n" "#-#-#-#-# sk-txt.pot (phpMyAdmin documentation VERSION) #-#-#-#-#\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
hooks/post-receive