The branch, master has been updated
       via  ff10167d6db1417ebd12ce2a2dde33db4a6106f4 (commit)
       via  26914daa0bcf77e603fcb70d94d11a57f18943e5 (commit)
       via  c97b2a16c804628661cdee8baae62670c8d9d823 (commit)
       via  f666bf909ad1838e0ab8627fda964329d76596fa (commit)
       via  acff4a171e8774db29f386528b1043fde0fa404e (commit)
       via  55bc294629b279a3f5dd433b9ddbfc31676e525c (commit)
       via  684523bde31c31d0ee66e6b2ba4bf15777ea5ab8 (commit)
       via  86cc850c4f682ef92c54934baa71d2da8c3426da (commit)
      from  44f99c2f47166f753ecd23a00404207b3a2be29b (commit)


- Log -----------------------------------------------------------------
commit ff10167d6db1417ebd12ce2a2dde33db4a6106f4
Author: Domen <[email protected]>
Date:   Fri Jan 7 20:04:09 2011 +0200

    Translation update done using Pootle.

commit 26914daa0bcf77e603fcb70d94d11a57f18943e5
Author: Domen <[email protected]>
Date:   Fri Jan 7 20:02:58 2011 +0200

    Translation update done using Pootle.

commit c97b2a16c804628661cdee8baae62670c8d9d823
Merge: f666bf909ad1838e0ab8627fda964329d76596fa 
44f99c2f47166f753ecd23a00404207b3a2be29b
Author: Pootle server <[email protected]>
Date:   Fri Jan 7 18:40:06 2011 +0100

    Merge remote branch 'origin/master'

commit f666bf909ad1838e0ab8627fda964329d76596fa
Merge: acff4a171e8774db29f386528b1043fde0fa404e 
653debdc0ec11df4ab7934b9bac3262edd879812
Author: Pootle server <[email protected]>
Date:   Fri Jan 7 16:40:08 2011 +0100

    Merge remote branch 'origin/master'

commit acff4a171e8774db29f386528b1043fde0fa404e
Author: Marc Delisle <[email protected]>
Date:   Fri Jan 7 16:32:39 2011 +0200

    Translation update done using Pootle.

commit 55bc294629b279a3f5dd433b9ddbfc31676e525c
Author: Marc Delisle <[email protected]>
Date:   Fri Jan 7 16:31:46 2011 +0200

    Translation update done using Pootle.

commit 684523bde31c31d0ee66e6b2ba4bf15777ea5ab8
Author: Marc Delisle <[email protected]>
Date:   Fri Jan 7 16:30:51 2011 +0200

    Translation update done using Pootle.

commit 86cc850c4f682ef92c54934baa71d2da8c3426da
Author: Marc Delisle <[email protected]>
Date:   Fri Jan 7 16:30:43 2011 +0200

    Translation update done using Pootle.

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

Summary of changes:
 po/en_GB.po |   11 ++++++-----
 po/fr.po    |    9 +++++----
 po/sl.po    |   13 +++++++------
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/po/en_GB.po b/po/en_GB.po
index 8212a5b..4167631 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4,13 +4,13 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: 2011-01-07 07:51-0500\n"
-"PO-Revision-Date: 2011-01-01 10:21+0200\n"
-"Last-Translator: Robert Readman <[email protected]>\n"
+"PO-Revision-Date: 2011-01-07 16:30+0200\n"
+"Last-Translator: Marc Delisle <[email protected]>\n"
 "Language-Team: english-gb <[email protected]>\n"
+"Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
@@ -4573,10 +4573,9 @@ msgid "bzipped"
 msgstr "bzipped"
 
 #: libraries/display_export.lib.php:326
-#, fuzzy
 #| msgid "Save output to a file"
 msgid "View output as text"
-msgstr "Save output to a file"
+msgstr "View output as text"
 
 #: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
@@ -4592,6 +4591,8 @@ msgid ""
 "Scroll down to fill in the options for the selected format and ignore the "
 "options for other formats."
 msgstr ""
+"Scroll down to fill in the options for the selected format and ignore the "
+"options for other formats."
 
 #: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
 msgid "Encoding Conversion:"
diff --git a/po/fr.po b/po/fr.po
index bc3ff35..679194c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,13 +4,13 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: 2011-01-07 07:51-0500\n"
-"PO-Revision-Date: 2010-12-29 20:40+0200\n"
+"PO-Revision-Date: 2011-01-07 16:32+0200\n"
 "Last-Translator: Marc Delisle <[email protected]>\n"
 "Language-Team: french <[email protected]>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
@@ -4629,10 +4629,9 @@ msgid "bzipped"
 msgstr " «bzippé »"
 
 #: libraries/display_export.lib.php:326
-#, fuzzy
 #| msgid "Save output to a file"
 msgid "View output as text"
-msgstr "Diriger la sortie vers un fichier"
+msgstr "Afficher les résultats"
 
 #: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
@@ -4648,6 +4647,8 @@ msgid ""
 "Scroll down to fill in the options for the selected format and ignore the "
 "options for other formats."
 msgstr ""
+"Faites défiler la page pour compléter les options du format choisi et "
+"ignorez les options des autres formats."
 
 #: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
 msgid "Encoding Conversion:"
diff --git a/po/sl.po b/po/sl.po
index 906e21a..03fee71 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,15 +4,15 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: 2011-01-07 07:51-0500\n"
-"PO-Revision-Date: 2011-01-01 22:58+0200\n"
+"PO-Revision-Date: 2011-01-07 20:04+0200\n"
 "Last-Translator: Domen <[email protected]>\n"
 "Language-Team: slovenian <[email protected]>\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
+"n%100==4 ? 2 : 3);\n"
 "X-Generator: Pootle 2.0.5\n"
 
 #: browse_foreigners.php:35 browse_foreigners.php:53
@@ -4602,10 +4602,9 @@ msgid "bzipped"
 msgstr "bzipano"
 
 #: libraries/display_export.lib.php:326
-#, fuzzy
 #| msgid "Save output to a file"
 msgid "View output as text"
-msgstr "Shrani izhod v datoteko"
+msgstr "Ogled izhoda kot besedilo"
 
 #: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
@@ -4621,6 +4620,8 @@ msgid ""
 "Scroll down to fill in the options for the selected format and ignore the "
 "options for other formats."
 msgstr ""
+"Pomaknite se dol, da vnesete možnosti za izbrane oblike in ignorirate "
+"možnosti za ostale oblike."
 
 #: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260
 msgid "Encoding Conversion:"


hooks/post-receive
-- 
phpMyAdmin

------------------------------------------------------------------------------
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web.   Learn how to 
best implement a security strategy that keeps consumers' information secure 
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl 
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to