[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11703-g8738697

[Michal Čihař]

The branch, master has been updated
       via  8738697fb115b96fe7a686bf5fe28f0feda812a8 (commit)
       via  a03ba806136c7b0dab12bf962a5a7300296b00bb (commit)
       via  be6a44af7e0bb172a9df448af350f967e6baded9 (commit)
       via  c797818cdc8c0e822f981b48fbcae36b5b47b97c (commit)
       via  5a59f2f427d1f5b3c60104558d3a2433419e440e (commit)
       via  2ee25a31a26ba08c333f657b9f0bd784bda72300 (commit)
       via  40187e2381aa6b32309ff423632249f9753ed5ad (commit)
       via  9da30b2d8200601b148ee8ac5ea4987d366a7dda (commit)
      from  8489f415c944a41524bfec1c8e388b0572958882 (commit)


- Log -----------------------------------------------------------------
commit 8738697fb115b96fe7a686bf5fe28f0feda812a8
Merge: 8489f415c944a41524bfec1c8e388b0572958882 a03ba806136c7b0dab12bf962a5a7300296b00bb
Author: Michal Čihař <mcihar at suse.cz>
Date:   Fri Jul 22 13:39:29 2011 +0200

    Merge remote-tracking branch 'pootle/master'

commit a03ba806136c7b0dab12bf962a5a7300296b00bb
Merge: be6a44af7e0bb172a9df448af350f967e6baded9 60fdffbafaa32ba629638894f42403d34b53de20
Author: Pootle server <pootle at cihar.com>
Date:   Fri Jul 22 12:40:06 2011 +0200

    Merge remote-tracking branch 'origin/master'

commit be6a44af7e0bb172a9df448af350f967e6baded9
Author: Domen <dbc334 at gmail.com>
Date:   Fri Jul 22 11:14:22 2011 +0200

    Translation update done using Pootle.

commit c797818cdc8c0e822f981b48fbcae36b5b47b97c
Author: Domen <dbc334 at gmail.com>
Date:   Fri Jul 22 10:56:21 2011 +0200

    Translation update done using Pootle.

commit 5a59f2f427d1f5b3c60104558d3a2433419e440e
Author: Domen <dbc334 at gmail.com>
Date:   Fri Jul 22 10:55:58 2011 +0200

    Translation update done using Pootle.

commit 2ee25a31a26ba08c333f657b9f0bd784bda72300
Author: Domen <dbc334 at gmail.com>
Date:   Fri Jul 22 10:55:46 2011 +0200

    Translation update done using Pootle.

commit 40187e2381aa6b32309ff423632249f9753ed5ad
Author: Domen <dbc334 at gmail.com>
Date:   Fri Jul 22 10:46:29 2011 +0200

    Translation update done using Pootle.

commit 9da30b2d8200601b148ee8ac5ea4987d366a7dda
Author: Domen <dbc334 at gmail.com>
Date:   Fri Jul 22 10:45:36 2011 +0200

    Translation update done using Pootle.

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

Summary of changes:
 po/sl.po |   32 ++++++++++++++++++++++++++------
 1 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/po/sl.po b/po/sl.po
index 9c8cb4b..f7742a3 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,15 +4,15 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-07-22 10:17+0200\n"
-"PO-Revision-Date: 2011-07-21 19:45+0200\n"
+"PO-Revision-Date: 2011-07-22 11:14+0200\n"
 "Last-Translator: Domen <dbc334 at gmail.com>\n"
 "Language-Team: slovenian <sl at li.org>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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
@@ -1159,7 +1159,7 @@ msgstr "KiB"
 
 #: js/messages.php:100
 msgid "Average load"
-msgstr "Povprečno nalaganje"
+msgstr "Povprečna obremenitev"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:102
@@ -9882,7 +9882,6 @@ msgid "Monitor Instructions"
 msgstr "Navodila nadziranja"
 
 #: server_status.php:1337
-#, fuzzy
 #| msgid ""
 #| "The phpMyAdmin Monitor can assist you in optimizing the server "
 #| "configuration and track down time intensive\n"
@@ -9900,7 +9899,9 @@ msgstr ""
 "Nadziranje phpMyAdmin vam lahko pomaga pri optimiziranju konfiguracije "
 "strežnika in izsleditvi časovno zahtevnih\n"
 "        poizvedb. Za slednje morate nastaviti log_output na 'TABLE' in imeti "
-"ali slow_query_log ali general_log omogočeno."
+"ali slow_query_log ali general_log omogočeno. Vendar pomnite, da\n"
+"        general_log ustvari ogromno podatkov in poveča obremenitev strežnika "
+"do 15 %."
 
 #: server_status.php:1346
 msgid ""
@@ -9916,6 +9917,18 @@ msgid ""
 "statistics from the logs helping you find what caused the\n"
 "        activity spike.</p>"
 msgstr ""
+"<b>Uporaba nadziranja:</b><br/>\n"
+"        V redu, pripravljeni ste! Ko kliknete 'Začni nadziranje', se bo vaš "
+"brskalnik osvežil in prikazal grafikone\n"
+"        v rednih razmikih. Dodajate lahko grafikone in spremenite pogostost "
+"osveževanja pod 'Nastavitve' ali pa\n"
+"        odstranite kateri koli grafikon s klikom na ikono zobnika ob "
+"ustreznem grafikonu.\n"
+"        <p>Ko opazite nenavadno povečanje dejavnosti, izberite ustrezno "
+"časovno obdobje na katerem koli grafikonu tako, da pridržite\n"
+"        levi miškin gumb in kazalec povlečete čez grafikon. To bo naložilo "
+"statistike iz dnevnikov, kar vam bo pomagalo odkriti vzrok\n"
+"        povečane dejavnosti.</p>"
 
 #: server_status.php:1356
 msgid ""
@@ -9927,6 +9940,13 @@ msgid ""
 "not required any more.\n"
 "        "
 msgstr ""
+"<b>Pomnite:</b>\n"
+"        Omogočitev general_log lahko poveča obremenitev strežnika za 5–15 %. "
+"Zavedajte se tudi, da je ustvarjanje statistik iz dnevnikov\n"
+"        zelo obremenjujoče opravilo, zato je priporočljivo, da izberete samo "
+"majhen časovni razpon ter onemogočite general_log in počistite njene "
+"tabele, ko nadziranja ne potrebujete več.\n"
+"        "
 
 #: server_status.php:1369
 msgid "CPU Usage"


hooks/post-receive
-- 
phpMyAdmin