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

Merge remote branch 'origin/master'

Browse Source
This commit is contained in:
Pootle server
2010-12-02 14:40:25 +01:00
parent 33ae46a5c6 c71547ea35
commit 2081a44d23
6 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -1,8 +1,6 @@
phpMyAdmin - ChangeLog phpMyAdmin - ChangeLog
====================== ======================
3.5.0.0 (not yet released)
3.4.0.0 (not yet released) 3.4.0.0 (not yet released)
+ rfe #2890226 [view] Enable VIEW rename + rfe #2890226 [view] Enable VIEW rename
+ rfe #838637 [privileges] Export a user's privileges + rfe #838637 [privileges] Export a user's privileges

4
Documentation.html
View File

@@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
<link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="icon" href="./favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>phpMyAdmin 3.5.0-dev - Documentation</title> <title>phpMyAdmin 3.4.0-alpha3-dev - Documentation</title>
<link rel="stylesheet" type="text/css" href="docs.css" /> <link rel="stylesheet" type="text/css" href="docs.css" />
</head> </head>
@@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
<div id="header"> <div id="header">
<h1> <h1>
<a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a>
3.5.0-dev 3.4.0-alpha3-dev
Documentation Documentation
</h1> </h1>
</div> </div>

4
README
View File

@@ -3,8 +3,8 @@ phpMyAdmin - Readme
A set of PHP-scripts to manage MySQL over the web. A set of PHP-scripts to manage MySQL over the web.
Version 3.5.0-dev Version 3.4.0-alpha3-dev
----------------- ------------------------
http://www.phpmyadmin.net/ http://www.phpmyadmin.net/

2
libraries/Config.class.php
View File

@@ -96,7 +96,7 @@ class PMA_Config
*/ */
function checkSystem() function checkSystem()
{ {
$this->set('PMA_VERSION', '3.5.0-dev'); $this->set('PMA_VERSION', '3.4.0-alpha3-dev');
/** /**
* @deprecated * @deprecated
*/ */

2
po/sr@latin.po
View File

@@ -112,7 +112,7 @@ msgstr "Neuspelo otvaranje udaljene URL adrese"
#: db_create.php:58 #: db_create.php:58
#, php-format #, php-format
msgid "Database %1$s has been created." msgid "Database %1$s has been created."
msgstr "Baza %1$ je kreirana." msgstr "Baza %1$s je kreirana."
#: db_datadict.php:48 db_operations.php:360 #: db_datadict.php:48 db_operations.php:360
msgid "Database comment: " msgid "Database comment: "

4
translators.html
View File

@@ -10,7 +10,7 @@
<link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="icon" href="./favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>phpMyAdmin 3.5.0-dev - Official translators</title> <title>phpMyAdmin 3.4.0-alpha3-dev - Official translators</title>
<link rel="stylesheet" type="text/css" href="docs.css" /> <link rel="stylesheet" type="text/css" href="docs.css" />
</head> </head>
@@ -18,7 +18,7 @@
<div id="header"> <div id="header">
<h1> <h1>
<a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a>
3.5.0-dev 3.4.0-alpha3-dev
official translators list official translators list
</h1> </h1>
</div> </div>