gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS

Browse Source
This commit is contained in:
Madhura Jayaratne 2011-08-01 09:40:36 +05:30
commit 3611d48325
4 changed files with 71 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libraries/config/config_functions.lib.php
View File

@ -11,11 +11,11 @@
* for formatting. Takes variable number of arguments.
* Based on PMA_sanitize from sanitize.lib.php.
*
* @param string $lang_key key in $GLOBALS WITHOUT 'strSetup' prefix
* @param mixed $args arguments for sprintf
* @param string $lang_key key in $GLOBALS WITHOUT 'strSetup' prefix
* @param mixed $args,... arguments for sprintf
* @return string
*/
function PMA_lang($lang_key)
function PMA_lang($lang_key, $args = null)
{
$message = isset($GLOBALS["strConfig$lang_key"]) ? $GLOBALS["strConfig$lang_key"] : $lang_key;
@ -48,29 +48,4 @@ function PMA_lang_name($canonical_path, $type = 'name', $default = 'key')
? ($type == 'desc' ? PMA_lang($lang_key) : $GLOBALS["strConfig$lang_key"])
: ($default == 'key' ? $lang_key : $default);
}
/**
* Wraps link in <a> tags and replaces argument separator in internal links
* to the one returned by PMA_get_arg_separator()
*
* @param string $link
* @param string $text
* @return string
*/
function PMA_lang_link_replace($link, $text)
{
static $separator;
if (!isset($separator)) {
$separator = PMA_get_arg_separator('html');
}
if (!preg_match('#^https?://#', $link)) {
$link = str_replace('&', $separator, $link);
} else {
$link = PMA_linkURL($link);
}
return '<a href="' . $link . '">' . $text . '</a>';
}
?>

9
libraries/sanitizing.lib.php
View File

@ -9,9 +9,8 @@
/**
* Checks whether given link is valid
*
* @param string $url URL to check.
*
* @return boolean True if string can be used as link.
* @param string $url URL to check
* @return boolean True if string can be used as link
*/
function PMA_checkLink($url)
{
@ -37,7 +36,6 @@ function PMA_checkLink($url)
* Callback function for replacing [a@link@target] links in bb code.
*
* @param array $found Array of preg matches
*
* @return string Replaced string
*/
function PMA_replaceBBLink($found)
@ -82,10 +80,7 @@ function PMA_replaceBBLink($found)
* @param string $message the message
* @param boolean $escape whether to escape html in result
* @param boolean $safe whether string is safe (can keep < and > chars)
*
* @return string the sanitized message
*
* @access public
*/
function PMA_sanitize($message, $escape = false, $safe = false)
{

122
po/sv.po
View File

@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-07-30 14:14-0400\n"
"PO-Revision-Date: 2011-07-31 18:29+0200\n"
"PO-Revision-Date: 2011-07-31 20:58+0200\n"
"Last-Translator: <stefan@inkopsforum.se>\n"
"Language-Team: swedish <sv@li.org>\n"
"MIME-Version: 1.0\n"
@ -7119,28 +7119,24 @@ msgid "You must provide a trigger name"
msgstr "Du måste ange ett triggernamn"
#: libraries/rte/rte_triggers.lib.php:404
#, fuzzy
#| msgid "You must provide a routine name"
msgid "You must provide a valid timing for the trigger"
msgstr "Du måste ange ett rutinnamn"
msgstr "Du måste ange en giltig tidsgräns för triggern"
#: libraries/rte/rte_triggers.lib.php:409
#, fuzzy
#| msgid "You must provide a name and a type for each routine parameter."
msgid "You must provide a valid event for the trigger"
msgstr "Du måste ange ett namn och en typ för varje rutinparameter."
msgstr "Du måste ange en giltig händelse för triggern"
#: libraries/rte/rte_triggers.lib.php:415
#, fuzzy
#| msgid "You must provide a routine name"
msgid "You must provide a valid table name"
msgstr "Du måste ange ett rutinnamn"
msgstr "Du måste ange ett giltigt tabellnamn"
#: libraries/rte/rte_triggers.lib.php:421
#, fuzzy
#| msgid "You must provide a routine definition."
msgid "You must provide a trigger definition."
msgstr "Du måste ange en rutindefinition."
msgstr "Du måste ange en trigger definition."
#: libraries/rte/rte_words.lib.php:18
msgid "Add routine"
@ -7152,16 +7148,14 @@ msgid "Export of routine %s"
msgstr "Exportera rutin %s"
#: libraries/rte/rte_words.lib.php:21
#, fuzzy
#| msgid "Routines"
msgid "routine"
msgstr "Rutiner"
msgstr "Rutin"
#: libraries/rte/rte_words.lib.php:22
#, fuzzy
#| msgid "You do not have the necessary privileges to create a new routine"
msgid "You do not have the necessary privileges to create a routine"
msgstr "Du har inte tillräcklig behörighet för att skapa en ny rutin"
msgstr "Du har inte den nödvändiga behörigheent att skapa en rutin"
#: libraries/rte/rte_words.lib.php:23
#, php-format
@ -7173,10 +7167,9 @@ msgid "There are no routines to display."
msgstr "Det finns inga rutiner att visa."
#: libraries/rte/rte_words.lib.php:30
#, fuzzy
#| msgid "Add a trigger"
msgid "Add trigger"
msgstr "Lägg till en ny Trigger"
msgstr "Lägg till trigger"
#: libraries/rte/rte_words.lib.php:32
#, php-format
@ -7184,32 +7177,29 @@ msgid "Export of trigger %s"
msgstr "Exportera trigger %s"
#: libraries/rte/rte_words.lib.php:33
#, fuzzy
#| msgid "Triggers"
msgid "trigger"
msgstr "Trigger"
msgstr "trigger"
#: libraries/rte/rte_words.lib.php:34
#, fuzzy
#| msgid "You do not have the necessary privileges to create a new routine"
msgid "You do not have the necessary privileges to create a trigger"
msgstr "Du har inte tillräcklig behörighet för att skapa en ny rutin"
msgstr "Du har inte den nödvändiga behörigheten att skapa en trigger"
#: libraries/rte/rte_words.lib.php:35
#, fuzzy, php-format
#, php-format
#| msgid "No routine with name %1$s found in database %2$s"
msgid "No trigger with name %1$s found in database %2$s"
msgstr "Ingen rutin med namnet %1$s finns i databasen %2$s"
msgstr "Ingen trigger med namnet %1$s finns i databasen %2$s"
#: libraries/rte/rte_words.lib.php:36
msgid "There are no triggers to display."
msgstr "Det finns inga triggers att visa"
#: libraries/rte/rte_words.lib.php:42
#, fuzzy
#| msgid "Add an event"
msgid "Add event"
msgstr "Lägg till en ny händelse"
msgstr "Lägg till händelse"
#: libraries/rte/rte_words.lib.php:44
#, php-format
@ -7217,22 +7207,20 @@ msgid "Export of event %s"
msgstr "Exportera händelse %s"
#: libraries/rte/rte_words.lib.php:45
#, fuzzy
#| msgid "Event"
msgid "event"
msgstr "Händelse"
msgstr "händelse"
#: libraries/rte/rte_words.lib.php:46
#, fuzzy
#| msgid "You do not have the necessary privileges to create a new routine"
msgid "You do not have the necessary privileges to create an event"
msgstr "Du har inte tillräcklig behörighet för att skapa en ny rutin"
msgstr "Du har inte tillräcklig behörighet för att skapa en händelse"
#: libraries/rte/rte_words.lib.php:47
#, fuzzy, php-format
#, php-format
#| msgid "No event with name %s found in database %s"
msgid "No event with name %1$s found in database %2$s"
msgstr "Ingen händelse med namnet %s finns i databasen %s"
msgstr "Ingen händelse med namnet %1$s hittades i databasen %2$s"
#: libraries/rte/rte_words.lib.php:48
msgid "There are no events to display."
@ -9076,10 +9064,9 @@ msgstr "Alla statusvariabler"
#: server_status.php:619
msgid "Monitor"
msgstr ""
msgstr "Övervaka"
#: server_status.php:629 server_status.php:651
#, fuzzy
#| msgid "Refresh rate:"
msgid "Refresh rate: "
msgstr "Uppdateringsfrekvens:"
@ -9102,10 +9089,10 @@ msgstr "Liknande länkar:"
#. l10n: Questions is the name of a MySQL Status variable
#: server_status.php:738
#, fuzzy, php-format
#, php-format
#| msgid "Network traffic since startup: %s"
msgid "Questions since startup: %s"
msgstr "Nätverkstrafik sedan start:%s"
msgstr "Frågor sedan start: %s"
#: server_status.php:744 server_status.php:779 server_status.php:895
#: server_status.php:940
@ -9135,10 +9122,10 @@ msgid "Network traffic since startup: %s"
msgstr "Nätverkstrafik sedan start:%s"
#: server_status.php:852
#, fuzzy, php-format
#, php-format
#| msgid "This MySQL server has been running for %s. It started up on %s."
msgid "This MySQL server has been running for %1$s. It started up on %2$s."
msgstr "Denna MySQL-server har varit igång i %s. Den startade den %s."
msgstr "Denna MySQL-servern har varit igång i %1$s. Den startade den %2$s."
#: server_status.php:862
msgid ""
@ -9215,6 +9202,8 @@ msgid ""
"The number of connections that were aborted because the client died without "
"closing the connection properly."
msgstr ""
"Antalet anslutningar som avbröts eftersom klienten dog utan att stänga "
"anslutningen ordentligt."
#: server_status.php:1076
msgid "The number of failed attempts to connect to the MySQL server."
@ -9871,49 +9860,44 @@ msgid "The number of threads that are not sleeping."
msgstr "Antalet trådar som inte är vilande."
#: server_status.php:1320
#, fuzzy
#| msgid "Start row"
msgid "Start Monitor"
msgstr "Starta rad"
msgstr "Starta Monitor"
#: server_status.php:1328
msgid "Instructions/Setup"
msgstr ""
msgstr "Instruktioner/Setup"
#: server_status.php:1332
msgid "Done rearranging/editing charts"
msgstr ""
msgstr "Klar ändra/editera diagram"
#: server_status.php:1339
#, fuzzy
#| msgid "Add parameter"
msgid "Add chart"
msgstr "Lägg till parameter"
msgstr "Lägg till diagram"
#: server_status.php:1341
msgid "Rearrange/edit charts"
msgstr ""
msgstr "Ordna/editera diagram"
#: server_status.php:1343
msgid "Refresh rate:"
msgstr "Uppdateringsfrekvens:"
#: server_status.php:1346
#, fuzzy
#| msgid "Textarea columns"
msgid "Chart columns:"
msgstr "Textarea kolumner"
msgstr "Visa kolumner:"
#: server_status.php:1360
#, fuzzy
#| msgid "User for config auth"
msgid "Clear monitor config"
msgstr "Användare för config auth"
msgstr "Rensa monitor config"
#: server_status.php:1363
#, fuzzy
msgid "Monitor Instructions"
msgstr "Information"
msgstr "Övervaka instruktioner"
#: server_status.php:1364
msgid ""
@ -9923,6 +9907,11 @@ msgid ""
"enabled. Note however, that the general_log produces a lot of data and "
"increases server load by up to 15%"
msgstr ""
"phpMyAdmin Monitor hjälpa dig optimera server konfigurationen och spåra tid "
"intensivt \\ icke intensiva frågor. För de senare måste du ställa log_output "
"till \"TABLE\" och ha antingen slow_query_log eller general_log aktiverat. "
"Observera att general_log producerar mycket data och ökar lasten på servern "
"med upp till 15%"
#: server_status.php:1371
msgid ""
@ -9935,6 +9924,17 @@ msgid ""
"will load statistics from the logs helping you find what caused the activity "
"spike.</p>"
msgstr ""
"<b> Använda monitorn: </b><br/>\n"
" Ok, du är klar stt sätta igång! När du klickar på \"Start monitor\" kommer "
"webbläsaren uppdatera alla visade diagram \n"
" med jämna mellanrum. Du kan lägga till diagram och ändra "
"uppdateringsfrekvensen under \"Inställningar\", eller ta bort diagram \n"
" med tyngdpunkten ikonen på respektive diagram. \n"
" <p> När du får en plötslig topp i akviviteten, ävlj önskad tidsperiod på "
"önskadt diagram genom att hålla ner \n"
" vänster musknapp och panorera över diagrammet. Detta kommer ladda "
"statistik från loggarna vilka hjälper dig att hitta vad som orsakade \n"
" aktivitetstopp. </ p>"
#: server_status.php:1375
msgid ""
@ -9942,8 +9942,14 @@ msgid ""
"5-15%. Also be aware that generating statistics from the logs is a load "
"intensive task, so it is advisable to select only a small time span and to "
"disable the general_log and empty its table once monitoring is not required "
"any more."
"any more.\n"
msgstr ""
"<b>Observera:</b>\n"
" Att aktivera general_log kan öka belastningen på servern med 5-15%. Var "
"medveten om att generera statistik från loggarna är en \n"
"belastningsintensiv uppgift, så det är klokt att välja en kort tidsperiod "
"samt att inaktivera general_log och tömma tabellen när övervakningen inte "
"behövs längre. \n"
#: server_status.php:1385
#, fuzzy
@ -9953,7 +9959,7 @@ msgstr "Användning"
#: server_status.php:1388
msgid "Memory Usage"
msgstr ""
msgstr "Minnesanvändning"
#: server_status.php:1391
#, fuzzy
@ -9975,7 +9981,7 @@ msgstr "Välj tabeller"
#: server_status.php:1398
msgid "Commonly monitored"
msgstr ""
msgstr "Vanligen övervakade"
#: server_status.php:1413
#, fuzzy
@ -9985,15 +9991,15 @@ msgstr "Du måste ange ett rutinnamn"
#: server_status.php:1417
msgid "Display as differential value"
msgstr ""
msgstr "Visa som differensvärde"
#: server_status.php:1419
msgid "Apply a divisor"
msgstr ""
msgstr "Tillämpa en dividend"
#: server_status.php:1426
msgid "Append unit to data values"
msgstr ""
msgstr "Lägg till enhet till datavärdena"
#: server_status.php:1432
#, fuzzy
@ -10003,7 +10009,7 @@ msgstr "Lägg till en ny Trigger"
#: server_status.php:1434
msgid "Clear series"
msgstr ""
msgstr "Rensa serier"
#: server_status.php:1437
#, fuzzy
@ -10031,17 +10037,19 @@ msgstr "Välj sida"
#: server_status.php:1454
msgid "Only retrieve SELECT,INSERT,UPDATE and DELETE Statements"
msgstr ""
msgstr "Hämta endast SELECT, INSERT, UPDATE och DELETE kommandon"
#: server_status.php:1459
msgid "Remove variable data in INSERT statements for better grouping"
msgstr ""
msgstr "Ta bort variabeldata med INSERT kommandon för bättre gruppering"
#: server_status.php:1462
msgid ""
"<p>Choose from which log you want the statistics to be generated from.</p> "
"Results are grouped by query text."
msgstr ""
"<p>Välj den logg du vill att statistiken ska genereras från. </p>Resultaten "
"grupperas efter frågetexten."
#: server_status.php:1465
#, fuzzy

2
setup/lib/index.lib.php
View File

@ -170,7 +170,7 @@ function PMA_version_check()
/**
* Calculates numerical equivalent of phpMyAdmin version string
*
* @param string version
* @param string $version
* @return mixed false on failure, integer on success
*/
function version_to_int($version)