Git
Threads by month
- ----- 2025 -----
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- 12 participants
- 38618 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14617-g3de028e
by Michal Čihař 12 Aug '11
by Michal Čihař 12 Aug '11
12 Aug '11
The branch, master has been updated
via 3de028e64269190255a2a75b7dec623d088711c3 (commit)
from dd36f8b4ca4e908b08df11de0f3e35e321a92a25 (commit)
- Log -----------------------------------------------------------------
commit 3de028e64269190255a2a75b7dec623d088711c3
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Aug 12 12:21:33 2011 +0200
Reintroduce accidentaly removed files from po/.gitignore
-----------------------------------------------------------------------
Summary of changes:
po/.gitignore | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/po/.gitignore b/po/.gitignore
index 37d0c90..62c25de 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -1 +1,5 @@
+# pootle cache
+.translation_index
+*.pending
+# generated file for advisory translations
advisory_rules.php
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14616-gdd36f8b
by Michal Čihař 12 Aug '11
by Michal Čihař 12 Aug '11
12 Aug '11
The branch, master has been updated
via dd36f8b4ca4e908b08df11de0f3e35e321a92a25 (commit)
via 56b8cae120578e4e7234dfe2767efd2d019331ea (commit)
from 7741ad728678aec6e97638df5a5252816f3cc845 (commit)
- Log -----------------------------------------------------------------
commit dd36f8b4ca4e908b08df11de0f3e35e321a92a25
Merge: 7741ad7 56b8cae
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Aug 12 12:19:38 2011 +0200
Merge remote-tracking branch 'pootle/master'
Conflicts:
po/ja.po
commit 56b8cae120578e4e7234dfe2767efd2d019331ea
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 12:16:25 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/ja.po | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/po/ja.po b/po/ja.po
index d3bb063..d59d83c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-08-11 09:15-0400\n"
-"PO-Revision-Date: 2011-08-12 11:48+0200\n"
+"PO-Revision-Date: 2011-08-12 12:16+0200\n"
"Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n"
"Language-Team: japanese <jp(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -10068,7 +10068,6 @@ msgid ""
msgstr ""
#: server_status.php:1454
-#, fuzzy
#| msgid ""
#| "<b>Using the monitor:</b><br/> Ok, you are good to go! Once you click "
#| "'Start monitor' your browser will refresh all displayed charts in a "
@@ -10088,13 +10087,11 @@ msgid ""
"confirmed, this will load a table of grouped queries, there you may click on "
"any occuring SELECT statements to further analyze them.</p>"
msgstr ""
-"<b>モニタの使い方:</b><br/>「モニタ開始」をクリックすると、ブラウザは一定間"
-"隔で表示されている全てのグラフを更新します。「設定」のところよりグラフを追加"
-"や再描画間隔の変更が行え、それぞれのグラフにある歯車のアイコンを通じて削除を"
-"行えます。<p>モニタリングしていてスパイク信号が見られることがあります。マウス"
-"の左ボタンを押したままグラフの上をドラッグするように移動させことで、グラフの"
-"任意の期間を選択できます。こうすることでログから統計の読み込みが行え、スパイ"
-"ク信号の原因を探ることができます。</p>"
+"<b>モニタの使い方:</b><br/>「モニタ開始」をクリックすると、ブラウザは一定間隔で表示されている全てのグラフを更新します。「設定」のところより"
+"グラフを追加や再描画間隔の変更が行え、それぞれのグラフにある歯車のアイコンを通じて削除を行えます。<p>ログからクエリ分析を行うには、グラフで該当期間を"
+"選択します。マウスの左ボタンを押したままグラフの上をドラッグするように移動させてください。こうすることで、グラフの任意の期間を選択できます。グループ毎に"
+"分類されたクエリが読み込まれ表示されますので、実行されたクエリを確認することができます。SELECT "
+"文の部分をクリックすることで、更なるクエリ解析が可能です。</p>"
#: server_status.php:1459
msgid ""
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14614-g7741ad7
by Michal Čihař 12 Aug '11
by Michal Čihař 12 Aug '11
12 Aug '11
The branch, master has been updated
via 7741ad728678aec6e97638df5a5252816f3cc845 (commit)
via 278c55eb8b218689ca7c522f6f8831ca9c424643 (commit)
via cac3e6aee5aa3a1c4d57551ccf0c0b1195c1be8b (commit)
via 772962d1b631bb66bd6ccff5330645cc05f46a4f (commit)
via a8f2d96baad8d6c99fbe8f74841bf57d10d6092b (commit)
via d94d681e7da478bdd12874010a2e7aec05238931 (commit)
via 6bfa452f8d04694021d211e0abd2dd5f080669e5 (commit)
via 1120bb597a1207074736a217a232de312af852df (commit)
via ca94b919ac6cae10e0a8b30a5b30508c9b3fa55a (commit)
via df0eca21e3da5389816ddd3150c58be9e7515f92 (commit)
via bfef230b91d6ab716c6d236b7c86e44c299b2098 (commit)
from ab4c24c30eb49f0a5ef1a8f96169091f834824d1 (commit)
- Log -----------------------------------------------------------------
commit 7741ad728678aec6e97638df5a5252816f3cc845
Merge: ab4c24c 278c55e
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Aug 12 12:15:50 2011 +0200
Merge remote-tracking branch 'tyron/master'
commit 278c55eb8b218689ca7c522f6f8831ca9c424643
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Thu Aug 11 19:38:25 2011 +0300
Fix: 2 typos
commit cac3e6aee5aa3a1c4d57551ccf0c0b1195c1be8b
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Thu Aug 11 19:37:04 2011 +0300
Fix: Error message not displayed
commit 772962d1b631bb66bd6ccff5330645cc05f46a4f
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Thu Aug 11 17:58:22 2011 +0300
Fix: NaN values in query cache efficiency chart
commit a8f2d96baad8d6c99fbe8f74841bf57d10d6092b
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Thu Aug 11 17:50:28 2011 +0300
removed debug logs
commit d94d681e7da478bdd12874010a2e7aec05238931
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Thu Aug 11 17:49:39 2011 +0300
Typo in Swap chart
commit 6bfa452f8d04694021d211e0abd2dd5f080669e5
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Thu Aug 11 17:36:55 2011 +0300
Fix: No "undefined" in add series and edit chart
commit 1120bb597a1207074736a217a232de312af852df
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Thu Aug 11 17:25:13 2011 +0300
Fix: Don't show 'reset to default' if there is no config in localstorage
commit ca94b919ac6cae10e0a8b30a5b30508c9b3fa55a
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Thu Aug 11 17:20:40 2011 +0300
Fix: don't show incompatible message if theres no localstorage config
commit df0eca21e3da5389816ddd3150c58be9e7515f92
Merge: bfef230 d585bba
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Thu Aug 11 17:11:39 2011 +0300
Merge remote-tracking branch 'origin/master'
commit bfef230b91d6ab716c6d236b7c86e44c299b2098
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Thu Aug 11 17:10:12 2011 +0300
- New feature: Charting over calculated values through presets. Currently available: query cache efficiency and query cache usage
- Fix sysinfo charts
-----------------------------------------------------------------------
Summary of changes:
js/messages.php | 7 +
js/server_status.js | 28 ++--
js/server_status_monitor.js | 331 ++++++++++++++++++++++++++++--------------
libraries/advisory_rules.txt | 4 +-
server_status.php | 157 ++++++++++++--------
5 files changed, 346 insertions(+), 181 deletions(-)
diff --git a/js/messages.php b/js/messages.php
index 62950be..e032af7 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -90,6 +90,13 @@ $js_messages['strChartIssuedQueriesTitle'] = __('Questions (executed statements
$js_messages['strChartQueryPie'] = __('Query statistics');
/* server status monitor */
+$js_messages['strIncompatibleMonitorConfig'] = __('Local monitor configuration icompatible');
+$js_messages['strIncompatibleMonitorConfigDescription'] = __('The chart arrangement configuration in your browsers local storage is not compatible anymore to the newer version of the monitor dialog. It is very likely that your current configuration will not work anymore. Please reset your configuration to default in the <i>Settings</i> menu.');
+
+$js_messages['strQueryCacheEfficiency'] = __('Query cache efficiency');
+$js_messages['strQueryCacheUsage'] = __('Query cache usage');
+$js_messages['strQueryCacheUsed'] = __('Query cache used');
+
$js_messages['strSystemCPUUsage'] = __('System CPU Usage');
$js_messages['strSystemMemory'] = __('System memory');
$js_messages['strSystemSwap'] = __('System swap');
diff --git a/js/server_status.js b/js/server_status.js
index c798bd3..870f9b1 100644
--- a/js/server_status.js
+++ b/js/server_status.js
@@ -662,17 +662,19 @@ $(function() {
return false;
});
+});
- function serverResponseError() {
- var btns = {};
- btns[PMA_messages['strReloadPage']] = function() {
- window.location.reload();
- };
- $('#emptyDialog').attr('title', PMA_messages['strRefreshFailed']);
- $('#emptyDialog').html(
- '<img class="icon ic_s_attention" src="themes/dot.gif" alt=""> ' +
- PMA_messages['strInvalidResponseExplanation']
- );
- $('#emptyDialog').dialog({ buttons: btns });
- }
-});
\ No newline at end of file
+
+// Needs to be global as server_status_monitor.js uses it too
+function serverResponseError() {
+ var btns = {};
+ btns[PMA_messages['strReloadPage']] = function() {
+ window.location.reload();
+ };
+ $('#emptyDialog').attr('title', PMA_messages['strRefreshFailed']);
+ $('#emptyDialog').html(
+ '<img class="icon ic_s_attention" src="themes/dot.gif" alt=""> ' +
+ PMA_messages['strInvalidResponseExplanation']
+ );
+ $('#emptyDialog').dialog({ buttons: btns });
+}
diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js
index cb01ca7..f8a179d 100644
--- a/js/server_status_monitor.js
+++ b/js/server_status_monitor.js
@@ -16,6 +16,11 @@ $(function() {
// Holds about to created chart
var newChart = null;
var chartSpacing;
+
+ // Whenever the monitor object (runtime.charts) or the settings object (monitorSettings)
+ // changes in a way incompatible to the previous version, increase this number
+ // It will reset the users monitor and settings object in his localStorage to the default configuration
+ var monitorProtocolVersion = '1.0';
// Runtime parameter of the monitor, is being fully set in initGrid()
var runtime = {
@@ -51,103 +56,158 @@ $(function() {
// Allows drag and drop rearrange and print/edit icons on charts
var editMode = false;
-
+
+ /* List of preconfigured charts that the user may select */
var presetCharts = {
- 'cpu-WINNT': {
- title: PMA_messages['strSystemCPUUsage'],
- nodes: [{ dataType: 'cpu', name: PMA_messages['strAverageLoad'], dataPoint: 'loadavg', unit: '%'}]
- },
- 'memory-WINNT': {
- title: PMA_messages['strSystemMemory'],
- nodes: [
- { dataType: 'memory', name: PMA_messages['strTotalMemory'], dataPoint: 'MemTotal', valueDivisor: 1024, unit: PMA_messages['strMiB'] },
- { dataType: 'memory', name: PMA_messages['strUsedMemory'], dataPoint: 'MemUsed', valueDivisor: 1024, unit: PMA_messages['strMiB'] }
- ]
- },
- 'swap-WINNT': {
- title: PMA_messages['strSystemSwap'],
- nodes: [
- { dataType: 'memory', name: PMA_messages['strTotalSwap'], dataPoint: 'SwapTotal', valueDivisor: 1024, unit: PMA_messages['strMiB'] },
- { dataType: 'memory', name: PMA_messages['strUsedSwap'], dataPoint: 'SwapUsed', valueDivisor: 1024, unit: PMA_messages['strMiB'] }
- ]
+ // Query cache efficiency
+ 'qce': {
+ title: PMA_messages['strQueryCacheEfficiency'],
+ nodes: [ {
+ name: PMA_messages['strQueryCacheEfficiency'],
+ dataPoints: [{type: 'statusvar', name: 'Qcache_hits'}, {type: 'statusvar', name: 'Com_select'}],
+ unit: '%',
+ transformFn: 'qce'
+ } ]
},
- 'cpu-Linux': {
- title: PMA_messages['strSystemCPUUsage'],
- nodes: [
- { dataType: 'cpu',
- name: PMA_messages['strAverageLoad'],
- unit: '%',
- transformFn: 'cpu-linux'
- }
- ]
- },
- 'memory-Linux': {
- title: PMA_messages['strSystemMemory'],
- nodes: [
- { dataType: 'memory', name: PMA_messages['strUsedMemory'], dataPoint: 'MemUsed', valueDivisor: 1024, unit: PMA_messages['strMiB'] },
- { dataType: 'memory', name: PMA_messages['strCachedMemory'], dataPoint: 'Cached', valueDivisor: 1024, unit: PMA_messages['strMiB'] },
- { dataType: 'memory', name: PMA_messages['strBufferedMemory'], dataPoint: 'Buffers', valueDivisor: 1024, unit: PMA_messages['strMiB'] },
- { dataType: 'memory', name: PMA_messages['strFreeMemory'], dataPoint: 'MemFree', valueDivisor: 1024, unit: PMA_messages['strMiB'] }
- ],
- settings: {
- chart: {
- type: 'area',
- animation: false
- },
- plotOptions: {
- area: {
- stacking: 'percent'
+ // Query cache usage
+ 'qcu': {
+ title: PMA_messages['strQueryCacheUsage'],
+ nodes: [ {
+ name: PMA_messages['strQueryCacheUsed'],
+ dataPoints: [{type: 'statusvar', name: 'Qcache_free_memory'}, {type: 'servervar', name: 'query_cache_size'}],
+ unit: '%',
+ transformFn: 'qcu'
+ } ]
+ }
+ };
+
+ /* Add OS specific system info charts to the preset chart list */
+ switch(server_os) {
+ case 'WINNT':
+ $.extend(presetCharts, {
+ 'cpu': {
+ title: PMA_messages['strSystemCPUUsage'],
+ nodes: [ {
+ name: PMA_messages['strAverageLoad'],
+ dataPoints: [{ type: 'cpu', name: 'loadavg'}],
+ unit: '%'
+ } ]
+ },
+
+ 'memory': {
+ title: PMA_messages['strSystemMemory'],
+ nodes: [ {
+ name: PMA_messages['strTotalMemory'],
+ dataPoints: [{ type: 'memory', name: 'MemTotal' }],
+ valueDivisor: 1024,
+ unit: PMA_messages['strMiB']
+ }, {
+ dataType: 'memory',
+ name: PMA_messages['strUsedMemory'],
+ dataPoints: [{ type: 'memory', name: 'MemUsed' }],
+ valueDivisor: 1024,
+ unit: PMA_messages['strMiB']
+ } ]
+ },
+
+ 'swap': {
+ title: PMA_messages['strSystemSwap'],
+ nodes: [ {
+ name: PMA_messages['strTotalSwap'],
+ dataPoints: [{ type: 'memory', name: 'SwapTotal' }],
+ valueDivisor: 1024,
+ unit: PMA_messages['strMiB']
+ }, {
+ name: PMA_messages['strUsedSwap'],
+ dataPoints: [{ type: 'memory', name: 'SwapUsed' }],
+ valueDivisor: 1024,
+ unit: PMA_messages['strMiB']
+ } ]
+ }
+ });
+ break;
+
+ case 'Linux':
+ $.extend(presetCharts, {
+ 'cpu': {
+ title: PMA_messages['strSystemCPUUsage'],
+ nodes: [ {
+ name: PMA_messages['strAverageLoad'],
+ dataPoints: [{ type: 'cpu', name: 'irrelevant' }],
+ unit: '%',
+ transformFn: 'cpu-linux'
+ } ]
+ },
+ 'memory': {
+ title: PMA_messages['strSystemMemory'],
+ nodes: [
+ { name: PMA_messages['strUsedMemory'], dataPoints: [{ type: 'memory', name: 'MemUsed' }], valueDivisor: 1024, unit: PMA_messages['strMiB'] },
+ { name: PMA_messages['strCachedMemory'], dataPoints: [{ type: 'memory', name: 'Cached' }], valueDivisor: 1024, unit: PMA_messages['strMiB'] },
+ { name: PMA_messages['strBufferedMemory'], dataPoints: [{ type: 'memory', name: 'Buffers' }], valueDivisor: 1024, unit: PMA_messages['strMiB'] },
+ { name: PMA_messages['strFreeMemory'], dataPoints: [{ type: 'memory', name: 'MemFree' }], valueDivisor: 1024, unit: PMA_messages['strMiB'] }
+ ],
+ settings: {
+ chart: {
+ type: 'area',
+ animation: false
+ },
+ plotOptions: {
+ area: {
+ stacking: 'percent'
+ }
}
}
- }
- },
- 'swap-Linux': {
- title: PMA_messages['strSystemSwap'],
- nodes: [
- { dataType: 'memory', name: PMA_messages['strTotalSwap'], dataPoint: 'SwapUsed', valueDivisor: 1024, unit: PMA_messages['strMiB'] },
- { dataType: 'memory', name: PMA_messages['strCachedSwap'], dataPoint: 'SwapCached', valueDivisor: 1024, unit: PMA_messages['strMiB'] },
- { dataType: 'memory', name: PMA_messages['strFreeSwap'], dataPoint: 'SwapFree', valueDivisor: 1024, unit: PMA_messages['strMiB'] }
- ],
- settings: {
- chart: {
- type: 'area',
- animation: false
- },
- plotOptions: {
- area: {
- stacking: 'percent'
+ },
+ 'swap': {
+ title: PMA_messages['strSystemSwap'],
+ nodes: [
+ { name: PMA_messages['strUsedSwap'], dataPoints: [{ type: 'memory', name: 'SwapUsed' }], valueDivisor: 1024, unit: PMA_messages['strMiB'] },
+ { name: PMA_messages['strCachedSwap'], dataPoints: [{ type: 'memory', name: 'SwapCached' }], valueDivisor: 1024, unit: PMA_messages['strMiB'] },
+ { name: PMA_messages['strFreeSwap'], dataPoints: [{ type: 'memory', name: 'SwapFree' }], valueDivisor: 1024, unit: PMA_messages['strMiB'] }
+ ],
+ settings: {
+ chart: {
+ type: 'area',
+ animation: false
+ },
+ plotOptions: {
+ area: {
+ stacking: 'percent'
+ }
}
}
}
- }
- };
+ });
+ break;
+ }
- // Default setting
+ // Default setting for the chart grid
defaultChartGrid = {
'c0': { title: PMA_messages['strQuestions'],
- nodes: [{ dataType: 'statusvar', name: PMA_messages['strQuestions'], dataPoint: 'Questions', display: 'differential' }]
+ nodes: [{name: PMA_messages['strQuestions'], dataPoints: [{ type: 'statusvar', name: 'Questions' }], display: 'differential' }]
},
'c1': {
title: PMA_messages['strChartConnectionsTitle'],
- nodes: [ { dataType: 'statusvar', name: PMA_messages['strConnections'], dataPoint: 'Connections', display: 'differential' },
- { dataType: 'proc', name: PMA_messages['strProcesses'], dataPoint: 'processes'} ]
+ nodes: [ { name: PMA_messages['strConnections'], dataPoints: [{ type: 'statusvar', name: 'Connections' }], display: 'differential' },
+ { name: PMA_messages['strProcesses'], dataPoints: [{ type: 'proc', name: 'processes' }] } ]
},
'c2': {
title: PMA_messages['strTraffic'],
nodes: [
- { dataType: 'statusvar', name: PMA_messages['strBytesSent'], dataPoint: 'Bytes_sent', display: 'differential', valueDivisor: 1024, unit: PMA_messages['strKiB'] },
- { dataType: 'statusvar', name: PMA_messages['strBytesReceived'], dataPoint: 'Bytes_received', display: 'differential', valueDivisor: 1024, unit: PMA_messages['strKiB'] }
+ { name: PMA_messages['strBytesSent'], dataPoints: [{ type: 'statusvar', name: 'Bytes_sent' }], display: 'differential', valueDivisor: 1024, unit: PMA_messages['strKiB'] },
+ { name: PMA_messages['strBytesReceived'], dataPoints: [{ type: 'statusvar', name: 'Bytes_received' }], display: 'differential', valueDivisor: 1024, unit: PMA_messages['strKiB'] }
]
}
};
- // Server is localhost => We can add cpu/memory/swap
+ // Server is localhost => We can add cpu/memory/swap to the default chart
if (server_db_isLocal) {
- defaultChartGrid['c3'] = presetCharts['cpu-' + server_os];
- defaultChartGrid['c4'] = presetCharts['memory-' + server_os];
- defaultChartGrid['c5'] = presetCharts['swap-' + server_os];
+ defaultChartGrid['c3'] = presetCharts['cpu'];
+ defaultChartGrid['c4'] = presetCharts['memory'];
+ defaultChartGrid['c5'] = presetCharts['swap'];
}
+ /* Buttons that are on the top right corner of each chart */
var gridbuttons = {
cogButton: {
//enabled: true,
@@ -368,9 +428,11 @@ $(function() {
dlgButtons[PMA_messages['strAddChart']] = function() {
var type = $('input[name="chartType"]:checked').val();
- if (type == 'cpu' || type == 'memory' || type == 'swap') {
- newChart = presetCharts[type + '-' + server_os];
+ if (type == 'preset') {
+ newChart = presetCharts[$('div#addChartDialog select[name="presetCharts"]').prop('value')];
} else {
+ // If user builds his own chart, it's being set/updated each time he adds a series
+ // So here we only warn if he didn't add a series yet
if (! newChart || ! newChart.nodes || newChart.nodes.length == 0) {
alert(PMA_messages['strAddOneSeriesWarning']);
return;
@@ -395,6 +457,17 @@ $(function() {
$(this).dialog("close");
};
+ var $presetList = $('div#addChartDialog select[name="presetCharts"]');
+ if ($presetList.html().length == 0) {
+ $.each(presetCharts, function(key, value) {
+ $presetList.append('<option value="' + key + '">' + value.title + '</option>');
+ });
+ $presetList.change(function() {
+ $('input#chartPreset').trigger('click');
+ $('input[name="chartTitle"]').attr('value', presetCharts[$(this).prop('value')].title);
+ });
+ }
+
$('div#addChartDialog').dialog({
width: 'auto',
height: 'auto',
@@ -500,6 +573,7 @@ $(function() {
$('a[href="#clearMonitorConfig"]').click(function() {
window.localStorage.removeItem('monitorCharts');
window.localStorage.removeItem('monitorSettings');
+ window.localStorage.removeItem('monitorVersion');
$(this).hide();
rebuildGrid();
});
@@ -712,8 +786,7 @@ $(function() {
}
var serie = {
- dataType: 'statusvar',
- dataPoint: $('input#variableInput').attr('value'),
+ dataPoints: [{ type: 'statusvar', name: $('input#variableInput').attr('value') }],
name: $('input#variableInput').attr('value'),
display: $('input[name="differentialValue"]').attr('checked') ? 'differential' : ''
};
@@ -733,7 +806,7 @@ $(function() {
var str = serie.display == 'differential' ? ', ' + PMA_messages['strDifferential'] : '';
str += serie.valueDivisor ? (', ' + $.sprintf(PMA_messages['strDividedBy'], serie.valueDivisor)) : '';
- $('#seriesPreview').append('- ' + serie.dataPoint + str + '<br>');
+ $('#seriesPreview').append('- ' + serie.name + str + '<br>');
newChart.nodes.push(serie);
@@ -769,6 +842,19 @@ $(function() {
}
$('a[href="#clearMonitorConfig"]').toggle(runtime.charts != null);
+
+ if (runtime.charts != null && monitorProtocolVersion != window.localStorage['monitorVersion']) {
+ $('div#emptyDialog').attr('title',PMA_messages['strIncompatibleMonitorConfig']);
+ $('div#emptyDialog').html(PMA_messages['strIncompatibleMonitorConfigDescription']);
+
+ var dlgBtns = {};
+ dlgBtns[PMA_messages['strClose']] = function() { $(this).dialog('close'); };
+
+ $('div#emptyDialog').dialog({
+ width: 400,
+ buttons: dlgBtns
+ });
+ }
}
if (runtime.charts == null) {
@@ -1033,7 +1119,7 @@ $(function() {
var htmlStr = '<p><b>Chart title: </b> <br/> <input type="text" size="35" name="chartTitle" value="' + chart.title + '" />';
htmlStr += '</p><p><b>Series:</b> </p><ol>';
for (var i = 0; i<chart.nodes.length; i++) {
- htmlStr += '<li><i>' + chart.nodes[i].dataPoint + ': </i><br/><input type="text" name="chartSerie-' + i + '" value=" ' + chart.nodes[i].name + '" /></li>';
+ htmlStr += '<li><i>' + chart.nodes[i].dataPoints[0].name + ': </i><br/><input type="text" name="chartSerie-' + i + '" value="' + chart.nodes[i].name + '" /></li>';
}
dlgBtns = {};
@@ -1114,10 +1200,8 @@ $(function() {
if (! chartData[key]) {
return;
}
- // Draw all points
+ // Draw all series
for (var j = 0; j < elem.nodes.length; j++) {
- value = chartData[key][j].y;
-
// Update x-axis
if (i == 0 && j == 0) {
if (oldChartData == null) {
@@ -1132,24 +1216,32 @@ $(function() {
elem.chart.xAxis[0].setExtremes(runtime.xmin, runtime.xmax, false);
- // Calculate y value
- if (elem.nodes[j].display == 'differential') {
- if (oldChartData == null || oldChartData[key] == null) {
- continue;
- }
- value -= oldChartData[key][j].y;
- }
-
- if (elem.nodes[j].valueDivisor) {
- value = value / elem.nodes[j].valueDivisor;
- }
-
+ /* Calculate y value */
+
+ // If transform function given, use it
if (elem.nodes[j].transformFn) {
value = chartValueTransform(
elem.nodes[j].transformFn,
chartData[key][j],
- (oldChartData == null ? null : oldChartData[key][j])
+ // Check if first iteration (oldChartData==null), or if newly added chart oldChartData[key]==null
+ (oldChartData == null || oldChartData[key] == null ? null : oldChartData[key][j])
);
+
+ // Otherwise use original value and apply differential and divisor if given,
+ // in this case we have only one data point per series - located at chartData[key][j][0]
+ } else {
+ value = parseFloat(chartData[key][j][0].value);
+
+ if (elem.nodes[j].display == 'differential') {
+ if (oldChartData == null || oldChartData[key] == null) {
+ continue;
+ }
+ value -= oldChartData[key][j][0].value;
+ }
+
+ if (elem.nodes[j].valueDivisor) {
+ value = value / elem.nodes[j].valueDivisor;
+ }
}
// Set y value, if defined
@@ -1177,28 +1269,54 @@ $(function() {
}
/* Function that supplies special value transform functions for chart values */
- function chartValueTransform(name, cur, prev) {
+ function chartValueTransform(name, cur, prev) {
switch(name) {
- case 'cpu-linux':
- if (prev == null) {
- return undefined;
- }
-
- var diff_total = cur.busy + cur.idle - (prev.busy + prev.idle);
- var diff_idle = cur.idle - prev.idle;
- return 100*(diff_total - diff_idle) / diff_total;
+ case 'cpu-linux':
+ if (prev == null) {
+ return undefined;
+ }
+ // cur and prev are datapoint arrays, but containing only 1 element for cpu-linux
+ cur = cur[0], prev = prev[0];
+
+ var diff_total = cur.busy + cur.idle - (prev.busy + prev.idle);
+ var diff_idle = cur.idle - prev.idle;
+ return 100 * (diff_total - diff_idle) / diff_total;
+
+ // Query cache efficiency (%)
+ case 'qce':
+ if (prev == null) {
+ return undefined;
+ }
+ // cur[0].value is Qcache_hits, cur[1].value is Com_select
+ var diffQHits = cur[0].value - prev[0].value;
+ // No NaN please :-)
+ if (cur[1].value - prev[1].value == 0) return 0;
+
+ return diffQHits / (cur[1].value - prev[1].value + diffQHits) * 100;
+
+ // Query cache usage (%)
+ case 'qcu':
+ if (cur[1].value == 0) return 0;
+ // cur[0].value is Qcache_free_memory, cur[1].value is query_cache_size
+ return 100 - cur[0].value / cur[1].value * 100;
+
}
return undefined;
}
- /* Build list of nodes that need to be retrieved from server */
+ /* Build list of nodes that need to be retrieved from server.
+ * It creates something like a stripped down version of the runtime.charts object.
+ */
function buildRequiredDataList() {
runtime.dataList = {};
// Store an own id, because the property name is subject of reordering,
// thus destroying our mapping with runtime.charts <=> runtime.dataList
var chartID = 0;
$.each(runtime.charts, function(key, chart) {
- runtime.dataList[chartID] = chart.nodes;
+ runtime.dataList[chartID] = [];
+ for(var i=0; i < chart.nodes.length; i++) {
+ runtime.dataList[chartID][i] = chart.nodes[i].dataPoints;
+ }
runtime.charts[key].chartID = chartID;
chartID++;
});
@@ -1746,6 +1864,7 @@ $(function() {
if (window.localStorage) {
window.localStorage['monitorCharts'] = $.toJSON(gridCopy);
window.localStorage['monitorSettings'] = $.toJSON(monitorSettings);
+ window.localStorage['monitorVersion'] = monitorProtocolVersion;
}
$('a[href="#clearMonitorConfig"]').show();
diff --git a/libraries/advisory_rules.txt b/libraries/advisory_rules.txt
index edbdb7b..90c0254 100644
--- a/libraries/advisory_rules.txt
+++ b/libraries/advisory_rules.txt
@@ -218,14 +218,14 @@ rule 'rate of reading fixed position'
Handler_read_rnd / Uptime
value * 60 * 60 > 1
The rate of reading data from a fixed position is high.
- This indicates many queries need to sort results and/or do a full table scan, including join queries that do not use indexes. Add indexes where applicable.
+ This indicates that many queries need to sort results and/or do a full table scan, including join queries that do not use indexes. Add indexes where applicable.
Rate of reading fixed position average: %s, this value should be less than 1 per hour | PMA_bytime(value,2)
rule 'rate of reading next table row'
Handler_read_rnd_next / Uptime
value * 60 * 60 > 1
The rate of reading the next table row is high.
- This indicates many queries are doing full table scans. Add indexes where applicable.
+ This indicates that many queries are doing full table scans. Add indexes where applicable.
Rate of reading next table row: %s, this value should be less than 1 per hour | PMA_bytime(value,2)
# temp tables
diff --git a/server_status.php b/server_status.php
index 7517362..cdbe9bb 100644
--- a/server_status.php
+++ b/server_status.php
@@ -31,6 +31,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
// real-time charting data
if (isset($_REQUEST['chart_data'])) {
switch($_REQUEST['type']) {
+ // Process and Connections realtime chart
case 'proc':
$c = PMA_DBI_fetch_result("SHOW GLOBAL STATUS WHERE Variable_name = 'Connections'", 0, 1);
$result = PMA_DBI_query('SHOW PROCESSLIST');
@@ -44,6 +45,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
exit(json_encode($ret));
+ // Query realtime chart
case 'queries':
$queries = PMA_DBI_fetch_result(
"SHOW GLOBAL STATUS
@@ -64,6 +66,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
exit(json_encode($ret));
+ // Traffic realtime chart
case 'traffic':
$traffic = PMA_DBI_fetch_result(
"SHOW GLOBAL STATUS
@@ -78,63 +81,105 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
exit(json_encode($ret));
+ // Data for the monitor
case 'chartgrid':
$ret = json_decode($_REQUEST['requiredData'], true);
$statusVars = array();
+ $serverVars = array();
$sysinfo = $cpuload = $memory = 0;
+ $pName = '';
+ /* Accumulate all required variables and data */
+ // For each chart
foreach ($ret as $chart_id => $chartNodes) {
- foreach ($chartNodes as $node_id => $node) {
- switch ($node['dataType']) {
- case 'statusvar':
- // Some white list filtering
- if (!preg_match('/[^a-zA-Z_]+/', $node['dataPoint']))
- $statusVars[] = $node['dataPoint'];
- break;
-
- case 'proc':
- $result = PMA_DBI_query('SHOW PROCESSLIST');
- $ret[$chart_id][$node_id]['y'] = PMA_DBI_num_rows($result);
- break;
-
- case 'cpu':
- if (!$sysinfo) {
- require_once('libraries/sysinfo.lib.php');
- $sysinfo = getSysInfo();
- }
- if (!$cpuload)
- $cpuload = $sysinfo->loadavg();
-
- if (PHP_OS == 'Linux') {
- $ret[$chart_id][$node_id]['idle'] = $cpuload['idle'];
- $ret[$chart_id][$node_id]['busy'] = $cpuload['busy'];
- } else
- $ret[$chart_id][$node_id]['y'] = $cpuload['loadavg'];
-
- break;
-
- case 'memory':
- if (!$sysinfo) {
- require_once('libraries/sysinfo.lib.php');
- $sysinfo = getSysInfo();
- }
- if (!$memory)
- $memory = $sysinfo->memory();
-
- $ret[$chart_id][$node_id]['y'] = $memory[$node['dataPoint']];
- break;
+ // For each data series
+ foreach ($chartNodes as $node_id => $nodeDataPoints) {
+ // For each data point in the series (usually just 1)
+ foreach ($nodeDataPoints as $point_id => $dataPoint) {
+ $pName = $dataPoint['name'];
+
+ switch ($dataPoint['type']) {
+ /* We only collect the status and server variables here to
+ * read them all in one query, and only afterwards assign them.
+ * Also do some white list filtering on the names
+ */
+ case 'servervar':
+ if (!preg_match('/[^a-zA-Z_]+/', $pName))
+ $serverVars[] = $pName;
+ break;
+
+ case 'statusvar':
+ if (!preg_match('/[^a-zA-Z_]+/', $pName))
+ $statusVars[] = $pName;
+ break;
+
+ case 'proc':
+ $result = PMA_DBI_query('SHOW PROCESSLIST');
+ $ret[$chart_id][$node_id][$point_id]['value'] = PMA_DBI_num_rows($result);
+ break;
+
+ case 'cpu':
+ if (!$sysinfo) {
+ require_once('libraries/sysinfo.lib.php');
+ $sysinfo = getSysInfo();
+ }
+ if (!$cpuload)
+ $cpuload = $sysinfo->loadavg();
+
+ if (PHP_OS == 'Linux') {
+ $ret[$chart_id][$node_id][$point_id]['idle'] = $cpuload['idle'];
+ $ret[$chart_id][$node_id][$point_id]['busy'] = $cpuload['busy'];
+ } else
+ $ret[$chart_id][$node_id][$point_id]['value'] = $cpuload['loadavg'];
+
+ break;
+
+ case 'memory':
+ if (!$sysinfo) {
+ require_once('libraries/sysinfo.lib.php');
+ $sysinfo = getSysInfo();
+ }
+ if (!$memory)
+ $memory = $sysinfo->memory();
+
+ $ret[$chart_id][$node_id][$point_id]['value'] = $memory[$pName];
+ break;
+ }
}
}
}
- $vars = PMA_DBI_fetch_result(
- "SHOW GLOBAL STATUS
- WHERE Variable_name='" . implode("' OR Variable_name='", $statusVars) . "'", 0, 1);
+ // Retrieve all required status variables
+ if (count($statusVars)) {
+ $statusVarValues = PMA_DBI_fetch_result(
+ "SHOW GLOBAL STATUS
+ WHERE Variable_name='" . implode("' OR Variable_name='", $statusVars) . "'", 0, 1);
+ } else {
+ $statusVarValues = array();
+ }
+
+ // Retrieve all required server variables
+ if (count($serverVars)) {
+ $serverVarValues = PMA_DBI_fetch_result(
+ "SHOW GLOBAL VARIABLES
+ WHERE Variable_name='" . implode("' OR Variable_name='", $serverVars) . "'", 0, 1);
+ } else {
+ $serverVarValues = array();
+ }
+ // ...and now assign them
foreach ($ret as $chart_id => $chartNodes) {
- foreach ($chartNodes as $node_id => $node) {
- if ($node['dataType'] == 'statusvar')
- $ret[$chart_id][$node_id]['y'] = $vars[$node['dataPoint']];
+ foreach ($chartNodes as $node_id => $nodeDataPoints) {
+ foreach ($nodeDataPoints as $point_id => $dataPoint) {
+ switch($dataPoint['type']) {
+ case 'statusvar':
+ $ret[$chart_id][$node_id][$point_id]['value'] = $statusVarValues[$dataPoint['name']];
+ break;
+ case 'servervar':
+ $ret[$chart_id][$node_id][$point_id]['value'] = $serverVarValues[$dataPoint['name']];
+ break;
+ }
+ }
}
}
@@ -594,12 +639,9 @@ if (isset($_REQUEST['show']) && isset($_REQUEST['ajax_request'])) {
}
}
-$server = 1;
-if (isset($_REQUEST['server']) && intval($_REQUEST['server'])) $server = intval($_REQUEST['server']);
-
-$server_db_isLocal = strtolower($cfg['Servers'][$server]['host']) == 'localhost'
- || $cfg['Servers'][$server]['host'] == '127.0.0.1'
- || $cfg['Servers'][$server]['host'] == '::1';
+$server_db_isLocal = strtolower($cfg['Server']['host']) == 'localhost'
+ || $cfg['Server']['host'] == '127.0.0.1'
+ || $cfg['Server']['host'] == '::1';
PMA_AddJSCode('pma_token = \'' . $_SESSION[' PMA_token '] . "';\n" .
'url_query = \'' . str_replace('&', '&', PMA_generate_common_url($db)) . "';\n" .
@@ -1466,16 +1508,11 @@ function printMonitor()
<div id="addChartDialog" title="Add chart" style="display:none;">
<div id="tabGridVariables">
<p><input type="text" name="chartTitle" value="<?php echo __('Chart Title'); ?>" /></p>
- <?php if ($server_db_isLocal) { ?>
- <input type="radio" name="chartType" value="cpu" id="chartCPU">
- <label for="chartCPU"><?php echo __('CPU Usage'); ?></label><br/>
-
- <input type="radio" name="chartType" value="memory" id="chartMemory">
- <label for="chartMemory"><?php echo __('Memory Usage'); ?></label><br/>
+
+ <input type="radio" name="chartType" value="preset" id="chartPreset">
+ <label for="chartPreset"><?php echo __('Preset chart'); ?></label>
+ <select name="presetCharts"></select><br/>
- <input type="radio" name="chartType" value="swap" id="chartSwap">
- <label for="chartSwap"><?php echo __('Swap Usage'); ?></label><br/>
- <?php } ?>
<input type="radio" name="chartType" value="variable" id="chartStatusVar" checked="checked">
<label for="chartStatusVar"><?php echo __('Status variable(s)'); ?></label><br/>
<div id="chartVariableSettings">
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14603-gab4c24c
by Michal Čihař 12 Aug '11
by Michal Čihař 12 Aug '11
12 Aug '11
The branch, master has been updated
via ab4c24c30eb49f0a5ef1a8f96169091f834824d1 (commit)
via 2afed039467fe16b40792bf3fd9d943090bd5dbe (commit)
via 1712f39a1bd1143d6d0d8b8581f0d16a5be2856f (commit)
via 1a5c28263d6d82c73ec9bb54d02332a95886df5e (commit)
via 41ad2df1ef2ae5f90447325d1ed15a21cf3aa688 (commit)
via 020f31b4e7541b69f7c64c13a05f1b714df6d8e4 (commit)
via 6ae22b18784e9f8c8faef04eb1addb1478e9a4df (commit)
via 61df1b182b007e40eb1e6e0abd480f138daee1f0 (commit)
via 18146b8278650bafc867e3deb7cb270e419929b0 (commit)
via 872d09ae5e768531717eca467f3f472cb39f8912 (commit)
via 7c76c4a8e35bdbf3fa261d136398dcbec7c2f975 (commit)
via 48c61ddfc50d233922fd4581b7b995f1cc7ec2a5 (commit)
via be3deed5f7b48f0442476b81580394db61ded6f6 (commit)
via 1ba7440d64eee92442a201115e2f36bfd8aabfea (commit)
via 38d208f1cc35203a211007105981cbfa3875da80 (commit)
via 1b3cf135de1e023d6c0dbdc1910cc6796fedc67a (commit)
via 5f8d90391170653b49cd9014cfcf668ed3b1bb4a (commit)
via cc368cbf5c138953c81cf09e7a81ebde9bd6d44c (commit)
via 7965a6b6a5ef5c8f6597fd7920dbc50318376903 (commit)
via a8a8c9f6d1a14ba435f4ac361d44aced28baaf9b (commit)
via 3948c4f224875dff9ad5fc6263a601e3354c1620 (commit)
via 4c566e6523383205891416814950d4aa1b17c177 (commit)
via 9815d56d4890e6e2db4062946550dec9e441608f (commit)
via bace39d3c40f26ce63e0ab93e4443ba5faded135 (commit)
via dea0df00633a71431f1cb7bbe70e77add7166f52 (commit)
via 7861a45a19a990b1edc43de3fdcca61b4dc7ebdf (commit)
via d3693ac9f6e6c03783e96f94972e49bcd17cb91e (commit)
via 093f20340e494a5aad504adcc52df4c232a1ec94 (commit)
via 00498c5023e51e7a516886abe28f1e4ea30c0d12 (commit)
via 4dd97962f324a5548ad3fc05d45e5215ae6d525b (commit)
via 572329f86a7a6873b3bae072449917f9564f1405 (commit)
via 5fadd56c239f7d54d3266dc06c3958c0470847b7 (commit)
via d1106189346532630d7cff17a3fb011ab83984a8 (commit)
via b191a13b39ca7183fd1946d7c2bcf8281c6c96c6 (commit)
via f0cd711b4b5fc2006bdee88b5be64bc02c5b82bb (commit)
via beead58d9984256aeba21ea188a94832a905c346 (commit)
via 0fdcf3d7ee1a642681eaf2b18f60a9e4c5a1ee76 (commit)
via 40580f75d9a21da1890225eb9da2def0fc4831df (commit)
via 40e26f5ef70c12baa8604188ba50bffe3149f70a (commit)
via cfbdb6f301a48996c0e6d0b5a9c6faf81841d640 (commit)
via d33bbb5472d90e542d774796203efd553015489c (commit)
via eca2dae78d91c30ed759c875a9f72fd857ce95d3 (commit)
via 05609558bac9adafe5adccf4aaa0283fdab60b6a (commit)
via 1ca2a327e49d7ade93e07a043920e9047fcfe86a (commit)
via 355941389f9709e3a5f620d4313a899a406b32c9 (commit)
via bf6fe57f2804cb71dc812d81fd363bd2254616b7 (commit)
via 7ad81da8b44ce9734b09e10e7345691186747374 (commit)
via d2abb9511de34474e18e4fdf465d6e4c51e121da (commit)
via c2dffbd167f212d6c084fdd9cfa1b94bce25130c (commit)
via c0d9753d2a956f42627def26337a96b59624e4e1 (commit)
via 3236248486adcfddce78bcb68988740180724e79 (commit)
via 8b72855cff5d257a7022f84baf16888f7402a948 (commit)
via ffd60dd5173b74158d74a88c818a3ce2151e15f7 (commit)
via 11dd3762ac8d37dca62201f5a62bb360a294e782 (commit)
via 0bff83ad07b200212e51ecb7a9bda0cf240b74f2 (commit)
via 3d4ff4c3451e80c5e24270e7ae41e489cc721771 (commit)
via 8825f4ff31462878a13e95db06623bfb161531f1 (commit)
via e8cf16c448ecb6272d2f039b56db5de187e2e608 (commit)
via c7de1a13d0f43db9c79438e33b0d6b449abb6b78 (commit)
via 22623c48f624cf3235006ba526432f5440a0a66d (commit)
via d818037d1365641b0c257386310239f595e12140 (commit)
via b7586fffbdfaebd41b371e7890efab5e77a64ffa (commit)
via 0dc4cc9e90154fa264ed4044cdf3cbe0fa8eb649 (commit)
via b61e30b4bdc6395199fa98c7b48d92f01f9b7015 (commit)
via a553c61d4a8f04c4897e3c1856ffc001341114a2 (commit)
via dce0a143c6c8e4d0d693f2ceeae0b9b8c57107ab (commit)
via 48a2181791dc87b6d71d700665ca8ea209df8ac0 (commit)
via 1936cd22bb3144613d6297f9b89be689233a89bd (commit)
via 6cd3a984b0f63d59765db3790c0178cae199d81d (commit)
via ad9ac7ae8887b9f4f7355bebcbaa6cbb5a447a81 (commit)
via f865423f885f2f9a5a9973b9bce4ebe8946fa793 (commit)
via 31994c8d93b6131d1a11017e3871c75669ad3883 (commit)
via 3d50b13dc048cd6b5c9637a03a5982b4d3d73896 (commit)
via b01a13804f94d156668815f215c9814d4326024e (commit)
via bb33a568f93bbbb95a35f37b5121f46977ddf966 (commit)
via 9956719e09ee035984af4ce047024840c6aa604e (commit)
via f3c37d39632b251ef57cd6851f8978220b82e300 (commit)
via 36e557518d3f63bae545ca859e9b0ad2799d1317 (commit)
via 518467918f5f4e4e3be723b96ea7b94429e43b2e (commit)
via b5f4738125801b488438eda4dc84fdfdfcfd7e9b (commit)
via e932eec17a813871424d5bc33e5f68bce0813965 (commit)
via be83ceea6bb620ac2c6ae3953479b8bbca5f6c58 (commit)
via 98efe7cc6d10b6402319ee43fd9ae62fe867ff9d (commit)
via b03e845ae34c7eb3f043a8eb7b274aa00fafdc94 (commit)
via e8d30e927ba0a4d19c38bf09d4dc2b37e7b7579a (commit)
via d049b559b210fc0301b0d7231a5d120b0067c6c2 (commit)
via a36d126af16756c897aa5916a7a20d01baf63145 (commit)
via f9ee896d7cd7832f0a10d2818ab20ba0b87215e6 (commit)
via 267e5a5449409546613df848601e688cdf5d1de6 (commit)
via 2155e80de0be9c026eea22e7cc8963000f787128 (commit)
via a20498860c6f3c888e22a714a4d30aff790b0d7d (commit)
via 3e319c0962ed4596a1e38870670fa045e011cb4c (commit)
via f6f3afba77f2c9eee87dbaba294585ad0994d203 (commit)
via e3d29c4f445f84483384506c9f81bf26f7fb6183 (commit)
via 7f35ba2ec206f535fcdefb1d249bc6e9fea7f2d4 (commit)
via 0b3e1e08737e1e5f4e906a3bdefdfa733f6221f0 (commit)
via 9adc330422525a69dffb189aa05f414e9cb950eb (commit)
via a5bb8ff82d7e17eff3ceb64d2e953737e4b899d3 (commit)
via 9a012864d1cf1c8bc6ca21922673d127dd532f85 (commit)
via bea2ebc2437d96eff9dfd420217aaf68ee27df8c (commit)
via fca059e9da84f5b9bf60155c043acfd0b4ddfaec (commit)
via b59fcce14bea9e1fd3c5f8f3a15cf2a0a3ffea96 (commit)
via caeaf95c95a0dee03558568315be53e935012638 (commit)
via 472f970be9835f611879f39a904fd056171f4f64 (commit)
via 68347c3da0ff44d2985b5ef40a5e74866f279d91 (commit)
via 2c4670f7270ce0ec581cd0e5bfb6c58a17b114bf (commit)
via 7884de79de68ff2e71ef48278c2c670e08d90a48 (commit)
via 1b087934cc903b86acfbefc43b498867458c8a97 (commit)
via f617ea08c5d25b7297aa1d7a6413932468de9832 (commit)
via ee9d10e0429b574367b1f037134844b613b44876 (commit)
via cbd812b012d2abe8c43d3f497e5ce1faf592909d (commit)
via 39c3edfa25ffc23885d461f5e8ad0c83ac5c3239 (commit)
via cae423b463f11b7d0c52db03c49526a1d413af64 (commit)
via 1df4efb3e63c7110d4dea3047a6b853398a5c1bc (commit)
via 290ffa5a644be138079936e09c2500a7f0644b33 (commit)
via 55aba3a5d3736cdba857e74ca11bb67b1ec987a2 (commit)
via 207a4211d9f64a4b009d8437e4f45fd8ab0e9083 (commit)
via 2634f931d9c5ffc4fea02c55597be721abda1d50 (commit)
via 975c8ef205f022ce2cfab2941071145e3a1c381a (commit)
via 6464c09ed8a7c5d182762ca4fa555c04d3553c50 (commit)
via da266aeeb39f5134ca3eb100ee7735dfe312da7d (commit)
via 7151bba7945bfae28ccc054d7ed2cda37444393f (commit)
via c0168cb3e555b77466a49559c95cbb50db9c0aac (commit)
via ba1a50db78c5531cfc477d7ee215467f03f30bb0 (commit)
via 24e07bfa19a896593a1d0b5f86edd0ce321cd743 (commit)
via 69c3180baa4f70634604bea41e2e59151a31f8ca (commit)
via 6bc62b9ab14d5cd46d9810aa8016af5300846b30 (commit)
via eddac30763e5da3bbabc04703103155ac6f939e6 (commit)
via 2f26fa6a03be2fcbcad9c918aeb26830ba6e5278 (commit)
via 12337776afa8198a870b4cc39aa48a9e8879f6c3 (commit)
via 41dbe710904760b82e6d9c760cc4a2dee6c667cc (commit)
via 2c143dae0058e6797219813fba6646218e60885f (commit)
via 4112594839357732664ba1b6d34955fdcf9aae56 (commit)
via a55a0c1b65f7bcbde639296e47745989f6999d92 (commit)
via c715666645bd9b809e38aef0bc67dacd5c96b1aa (commit)
via 0800f05ac23ef5ca2d06e74060cc2fdb3fadec3b (commit)
via fdcd934c2b85124c88233566e64fb7f6e81f94b9 (commit)
via 0da3a16ad564ad969f6f7104423c8122165ae615 (commit)
via 96db027e1971ab080c6e89d1d985d55aaa2315c6 (commit)
via 557ebc1b87efa201856978a1145917b24269e556 (commit)
via 6a93b0c4edbf311910bee8c3d78920a970f7ea1f (commit)
via b624de72f97c60812cb511c8edb94cfb9d6edabc (commit)
via bdab18a5b4eaeca0de398885572c7a71f8340f51 (commit)
via 3f0fb12a20235d54457aebe0df122a795dccdcc2 (commit)
via 1c85acac0e23a412379618394daba5bd606e5ff0 (commit)
via 6a15d1ddde3fa28a89e0aba40a9dfdec2874315d (commit)
via 18c330470148a285732ee6c52d4c27ce7b94cd67 (commit)
via 652d4308a72b9f6c92d565fa362f0e1ba0385d1b (commit)
via a5ed66beede75c75af473a3f8147584b713e93ef (commit)
via e6d429d62d8632b5a55a7bc4971a5ade9be21082 (commit)
via e9c786795a45b8ff9de6acd1111c0ed0df8bee34 (commit)
via 7dc43c9e5c59ae68f30b16610808bc2e91905dbb (commit)
via e1244e1c66de07143eda11897a3d32e05dd3322b (commit)
from 45aac8dbf4e87b12ba3c2809c49ce250161afabf (commit)
- Log -----------------------------------------------------------------
commit ab4c24c30eb49f0a5ef1a8f96169091f834824d1
Merge: 45aac8d 2afed03
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Aug 12 12:15:05 2011 +0200
Merge remote-tracking branch 'pootle/master'
Conflicts:
po/ja.po
po/sl.po
po/tr.po
commit 2afed039467fe16b40792bf3fd9d943090bd5dbe
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 11:48:15 2011 +0200
Translation update done using Pootle.
commit 1712f39a1bd1143d6d0d8b8581f0d16a5be2856f
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 11:44:32 2011 +0200
Translation update done using Pootle.
commit 1a5c28263d6d82c73ec9bb54d02332a95886df5e
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 11:43:46 2011 +0200
Translation update done using Pootle.
commit 41ad2df1ef2ae5f90447325d1ed15a21cf3aa688
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 11:42:30 2011 +0200
Translation update done using Pootle.
commit 020f31b4e7541b69f7c64c13a05f1b714df6d8e4
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 11:42:13 2011 +0200
Translation update done using Pootle.
commit 6ae22b18784e9f8c8faef04eb1addb1478e9a4df
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 11:40:37 2011 +0200
Translation update done using Pootle.
commit 61df1b182b007e40eb1e6e0abd480f138daee1f0
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 11:39:56 2011 +0200
Translation update done using Pootle.
commit 18146b8278650bafc867e3deb7cb270e419929b0
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 11:37:43 2011 +0200
Translation update done using Pootle.
commit 872d09ae5e768531717eca467f3f472cb39f8912
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 11:37:01 2011 +0200
Translation update done using Pootle.
commit 7c76c4a8e35bdbf3fa261d136398dcbec7c2f975
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 11:28:42 2011 +0200
Translation update done using Pootle.
commit 48c61ddfc50d233922fd4581b7b995f1cc7ec2a5
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 11:27:28 2011 +0200
Translation update done using Pootle.
commit be3deed5f7b48f0442476b81580394db61ded6f6
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 11:27:16 2011 +0200
Translation update done using Pootle.
commit 1ba7440d64eee92442a201115e2f36bfd8aabfea
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 22:58:37 2011 +0200
Translation update done using Pootle.
commit 38d208f1cc35203a211007105981cbfa3875da80
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 22:57:02 2011 +0200
Translation update done using Pootle.
commit 1b3cf135de1e023d6c0dbdc1910cc6796fedc67a
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 22:52:55 2011 +0200
Translation update done using Pootle.
commit 5f8d90391170653b49cd9014cfcf668ed3b1bb4a
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 20:50:09 2011 +0200
Translation update done using Pootle.
commit cc368cbf5c138953c81cf09e7a81ebde9bd6d44c
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 20:49:57 2011 +0200
Translation update done using Pootle.
commit 7965a6b6a5ef5c8f6597fd7920dbc50318376903
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 20:49:26 2011 +0200
Translation update done using Pootle.
commit a8a8c9f6d1a14ba435f4ac361d44aced28baaf9b
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 20:49:14 2011 +0200
Translation update done using Pootle.
commit 3948c4f224875dff9ad5fc6263a601e3354c1620
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 20:48:06 2011 +0200
Translation update done using Pootle.
commit 4c566e6523383205891416814950d4aa1b17c177
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 20:47:12 2011 +0200
Translation update done using Pootle.
commit 9815d56d4890e6e2db4062946550dec9e441608f
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:40:07 2011 +0200
Translation update done using Pootle.
commit bace39d3c40f26ce63e0ab93e4443ba5faded135
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 18:39:55 2011 +0200
Translation update done using Pootle.
commit dea0df00633a71431f1cb7bbe70e77add7166f52
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:39:55 2011 +0200
Translation update done using Pootle.
commit 7861a45a19a990b1edc43de3fdcca61b4dc7ebdf
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:39:38 2011 +0200
Translation update done using Pootle.
commit d3693ac9f6e6c03783e96f94972e49bcd17cb91e
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:38:41 2011 +0200
Translation update done using Pootle.
commit 093f20340e494a5aad504adcc52df4c232a1ec94
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:38:30 2011 +0200
Translation update done using Pootle.
commit 00498c5023e51e7a516886abe28f1e4ea30c0d12
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:38:18 2011 +0200
Translation update done using Pootle.
commit 4dd97962f324a5548ad3fc05d45e5215ae6d525b
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:38:10 2011 +0200
Translation update done using Pootle.
commit 572329f86a7a6873b3bae072449917f9564f1405
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:38:07 2011 +0200
Translation update done using Pootle.
commit 5fadd56c239f7d54d3266dc06c3958c0470847b7
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:37:50 2011 +0200
Translation update done using Pootle.
commit d1106189346532630d7cff17a3fb011ab83984a8
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:37:44 2011 +0200
Translation update done using Pootle.
commit b191a13b39ca7183fd1946d7c2bcf8281c6c96c6
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:37:38 2011 +0200
Translation update done using Pootle.
commit f0cd711b4b5fc2006bdee88b5be64bc02c5b82bb
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:37:14 2011 +0200
Translation update done using Pootle.
commit beead58d9984256aeba21ea188a94832a905c346
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:36:47 2011 +0200
Translation update done using Pootle.
commit 0fdcf3d7ee1a642681eaf2b18f60a9e4c5a1ee76
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:36:37 2011 +0200
Translation update done using Pootle.
commit 40580f75d9a21da1890225eb9da2def0fc4831df
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:36:31 2011 +0200
Translation update done using Pootle.
commit 40e26f5ef70c12baa8604188ba50bffe3149f70a
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:36:21 2011 +0200
Translation update done using Pootle.
commit cfbdb6f301a48996c0e6d0b5a9c6faf81841d640
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:35:55 2011 +0200
Translation update done using Pootle.
commit d33bbb5472d90e542d774796203efd553015489c
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:35:36 2011 +0200
Translation update done using Pootle.
commit eca2dae78d91c30ed759c875a9f72fd857ce95d3
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:35:23 2011 +0200
Translation update done using Pootle.
commit 05609558bac9adafe5adccf4aaa0283fdab60b6a
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:35:15 2011 +0200
Translation update done using Pootle.
commit 1ca2a327e49d7ade93e07a043920e9047fcfe86a
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:35:12 2011 +0200
Translation update done using Pootle.
commit 355941389f9709e3a5f620d4313a899a406b32c9
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:35:05 2011 +0200
Translation update done using Pootle.
commit bf6fe57f2804cb71dc812d81fd363bd2254616b7
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:34:45 2011 +0200
Translation update done using Pootle.
commit 7ad81da8b44ce9734b09e10e7345691186747374
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:33:51 2011 +0200
Translation update done using Pootle.
commit d2abb9511de34474e18e4fdf465d6e4c51e121da
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:33:43 2011 +0200
Translation update done using Pootle.
commit c2dffbd167f212d6c084fdd9cfa1b94bce25130c
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:33:32 2011 +0200
Translation update done using Pootle.
commit c0d9753d2a956f42627def26337a96b59624e4e1
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:31:49 2011 +0200
Translation update done using Pootle.
commit 3236248486adcfddce78bcb68988740180724e79
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:31:45 2011 +0200
Translation update done using Pootle.
commit 8b72855cff5d257a7022f84baf16888f7402a948
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 18:31:40 2011 +0200
Translation update done using Pootle.
commit ffd60dd5173b74158d74a88c818a3ce2151e15f7
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:31:32 2011 +0200
Translation update done using Pootle.
commit 11dd3762ac8d37dca62201f5a62bb360a294e782
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 18:30:51 2011 +0200
Translation update done using Pootle.
commit 0bff83ad07b200212e51ecb7a9bda0cf240b74f2
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:30:39 2011 +0200
Translation update done using Pootle.
commit 3d4ff4c3451e80c5e24270e7ae41e489cc721771
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:30:11 2011 +0200
Translation update done using Pootle.
commit 8825f4ff31462878a13e95db06623bfb161531f1
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:30:06 2011 +0200
Translation update done using Pootle.
commit e8cf16c448ecb6272d2f039b56db5de187e2e608
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 18:29:56 2011 +0200
Translation update done using Pootle.
commit c7de1a13d0f43db9c79438e33b0d6b449abb6b78
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:29:49 2011 +0200
Translation update done using Pootle.
commit 22623c48f624cf3235006ba526432f5440a0a66d
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:29:39 2011 +0200
Translation update done using Pootle.
commit d818037d1365641b0c257386310239f595e12140
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 18:29:30 2011 +0200
Translation update done using Pootle.
commit b7586fffbdfaebd41b371e7890efab5e77a64ffa
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:29:28 2011 +0200
Translation update done using Pootle.
commit 0dc4cc9e90154fa264ed4044cdf3cbe0fa8eb649
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 18:29:19 2011 +0200
Translation update done using Pootle.
commit b61e30b4bdc6395199fa98c7b48d92f01f9b7015
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 18:29:09 2011 +0200
Translation update done using Pootle.
commit a553c61d4a8f04c4897e3c1856ffc001341114a2
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:29:05 2011 +0200
Translation update done using Pootle.
commit dce0a143c6c8e4d0d693f2ceeae0b9b8c57107ab
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:28:59 2011 +0200
Translation update done using Pootle.
commit 48a2181791dc87b6d71d700665ca8ea209df8ac0
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:28:54 2011 +0200
Translation update done using Pootle.
commit 1936cd22bb3144613d6297f9b89be689233a89bd
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:28:49 2011 +0200
Translation update done using Pootle.
commit 6cd3a984b0f63d59765db3790c0178cae199d81d
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 18:28:47 2011 +0200
Translation update done using Pootle.
commit ad9ac7ae8887b9f4f7355bebcbaa6cbb5a447a81
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 18:28:08 2011 +0200
Translation update done using Pootle.
commit f865423f885f2f9a5a9973b9bce4ebe8946fa793
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:27:45 2011 +0200
Translation update done using Pootle.
commit 31994c8d93b6131d1a11017e3871c75669ad3883
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 18:27:45 2011 +0200
Translation update done using Pootle.
commit 3d50b13dc048cd6b5c9637a03a5982b4d3d73896
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:27:20 2011 +0200
Translation update done using Pootle.
commit b01a13804f94d156668815f215c9814d4326024e
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:27:01 2011 +0200
Translation update done using Pootle.
commit bb33a568f93bbbb95a35f37b5121f46977ddf966
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:26:53 2011 +0200
Translation update done using Pootle.
commit 9956719e09ee035984af4ce047024840c6aa604e
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 18:26:48 2011 +0200
Translation update done using Pootle.
commit f3c37d39632b251ef57cd6851f8978220b82e300
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:26:41 2011 +0200
Translation update done using Pootle.
commit 36e557518d3f63bae545ca859e9b0ad2799d1317
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:26:13 2011 +0200
Translation update done using Pootle.
commit 518467918f5f4e4e3be723b96ea7b94429e43b2e
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:26:07 2011 +0200
Translation update done using Pootle.
commit b5f4738125801b488438eda4dc84fdfdfcfd7e9b
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:25:55 2011 +0200
Translation update done using Pootle.
commit e932eec17a813871424d5bc33e5f68bce0813965
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 18:25:26 2011 +0200
Translation update done using Pootle.
commit be83ceea6bb620ac2c6ae3953479b8bbca5f6c58
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:25:25 2011 +0200
Translation update done using Pootle.
commit 98efe7cc6d10b6402319ee43fd9ae62fe867ff9d
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:25:08 2011 +0200
Translation update done using Pootle.
commit b03e845ae34c7eb3f043a8eb7b274aa00fafdc94
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:25:03 2011 +0200
Translation update done using Pootle.
commit e8d30e927ba0a4d19c38bf09d4dc2b37e7b7579a
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:24:09 2011 +0200
Translation update done using Pootle.
commit d049b559b210fc0301b0d7231a5d120b0067c6c2
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 18:24:01 2011 +0200
Translation update done using Pootle.
commit a36d126af16756c897aa5916a7a20d01baf63145
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:23:58 2011 +0200
Translation update done using Pootle.
commit f9ee896d7cd7832f0a10d2818ab20ba0b87215e6
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 18:23:45 2011 +0200
Translation update done using Pootle.
commit 267e5a5449409546613df848601e688cdf5d1de6
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:22:13 2011 +0200
Translation update done using Pootle.
commit 2155e80de0be9c026eea22e7cc8963000f787128
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:22:00 2011 +0200
Translation update done using Pootle.
commit a20498860c6f3c888e22a714a4d30aff790b0d7d
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:21:54 2011 +0200
Translation update done using Pootle.
commit 3e319c0962ed4596a1e38870670fa045e011cb4c
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:21:48 2011 +0200
Translation update done using Pootle.
commit f6f3afba77f2c9eee87dbaba294585ad0994d203
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:21:42 2011 +0200
Translation update done using Pootle.
commit e3d29c4f445f84483384506c9f81bf26f7fb6183
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:21:36 2011 +0200
Translation update done using Pootle.
commit 7f35ba2ec206f535fcdefb1d249bc6e9fea7f2d4
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:21:29 2011 +0200
Translation update done using Pootle.
commit 0b3e1e08737e1e5f4e906a3bdefdfa733f6221f0
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:18:10 2011 +0200
Translation update done using Pootle.
commit 9adc330422525a69dffb189aa05f414e9cb950eb
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:18:04 2011 +0200
Translation update done using Pootle.
commit a5bb8ff82d7e17eff3ceb64d2e953737e4b899d3
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:18:00 2011 +0200
Translation update done using Pootle.
commit 9a012864d1cf1c8bc6ca21922673d127dd532f85
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:17:54 2011 +0200
Translation update done using Pootle.
commit bea2ebc2437d96eff9dfd420217aaf68ee27df8c
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:17:19 2011 +0200
Translation update done using Pootle.
commit fca059e9da84f5b9bf60155c043acfd0b4ddfaec
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:17:13 2011 +0200
Translation update done using Pootle.
commit b59fcce14bea9e1fd3c5f8f3a15cf2a0a3ffea96
Author: Domen <dbc334(a)gmail.com>
Date: Thu Aug 11 18:16:59 2011 +0200
Translation update done using Pootle.
commit caeaf95c95a0dee03558568315be53e935012638
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 18:13:18 2011 +0200
Translation update done using Pootle.
commit 472f970be9835f611879f39a904fd056171f4f64
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 18:09:47 2011 +0200
Translation update done using Pootle.
commit 68347c3da0ff44d2985b5ef40a5e74866f279d91
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:58:16 2011 +0200
Translation update done using Pootle.
commit 2c4670f7270ce0ec581cd0e5bfb6c58a17b114bf
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:57:56 2011 +0200
Translation update done using Pootle.
commit 7884de79de68ff2e71ef48278c2c670e08d90a48
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:57:04 2011 +0200
Translation update done using Pootle.
commit 1b087934cc903b86acfbefc43b498867458c8a97
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:56:41 2011 +0200
Translation update done using Pootle.
commit f617ea08c5d25b7297aa1d7a6413932468de9832
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:56:17 2011 +0200
Translation update done using Pootle.
commit ee9d10e0429b574367b1f037134844b613b44876
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:55:58 2011 +0200
Translation update done using Pootle.
commit cbd812b012d2abe8c43d3f497e5ce1faf592909d
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:55:32 2011 +0200
Translation update done using Pootle.
commit 39c3edfa25ffc23885d461f5e8ad0c83ac5c3239
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:55:05 2011 +0200
Translation update done using Pootle.
commit cae423b463f11b7d0c52db03c49526a1d413af64
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:54:07 2011 +0200
Translation update done using Pootle.
commit 1df4efb3e63c7110d4dea3047a6b853398a5c1bc
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:53:08 2011 +0200
Translation update done using Pootle.
commit 290ffa5a644be138079936e09c2500a7f0644b33
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:52:44 2011 +0200
Translation update done using Pootle.
commit 55aba3a5d3736cdba857e74ca11bb67b1ec987a2
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:49:42 2011 +0200
Translation update done using Pootle.
commit 207a4211d9f64a4b009d8437e4f45fd8ab0e9083
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:48:03 2011 +0200
Translation update done using Pootle.
commit 2634f931d9c5ffc4fea02c55597be721abda1d50
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:45:49 2011 +0200
Translation update done using Pootle.
commit 975c8ef205f022ce2cfab2941071145e3a1c381a
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:45:26 2011 +0200
Translation update done using Pootle.
commit 6464c09ed8a7c5d182762ca4fa555c04d3553c50
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:44:57 2011 +0200
Translation update done using Pootle.
commit da266aeeb39f5134ca3eb100ee7735dfe312da7d
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:18:59 2011 +0200
Translation update done using Pootle.
commit 7151bba7945bfae28ccc054d7ed2cda37444393f
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:18:33 2011 +0200
Translation update done using Pootle.
commit c0168cb3e555b77466a49559c95cbb50db9c0aac
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:18:14 2011 +0200
Translation update done using Pootle.
commit ba1a50db78c5531cfc477d7ee215467f03f30bb0
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:17:39 2011 +0200
Translation update done using Pootle.
commit 24e07bfa19a896593a1d0b5f86edd0ce321cd743
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:16:51 2011 +0200
Translation update done using Pootle.
commit 69c3180baa4f70634604bea41e2e59151a31f8ca
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:16:27 2011 +0200
Translation update done using Pootle.
commit 6bc62b9ab14d5cd46d9810aa8016af5300846b30
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:16:06 2011 +0200
Translation update done using Pootle.
commit eddac30763e5da3bbabc04703103155ac6f939e6
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:15:56 2011 +0200
Translation update done using Pootle.
commit 2f26fa6a03be2fcbcad9c918aeb26830ba6e5278
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:14:35 2011 +0200
Translation update done using Pootle.
commit 12337776afa8198a870b4cc39aa48a9e8879f6c3
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:13:50 2011 +0200
Translation update done using Pootle.
commit 41dbe710904760b82e6d9c760cc4a2dee6c667cc
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:13:28 2011 +0200
Translation update done using Pootle.
commit 2c143dae0058e6797219813fba6646218e60885f
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:13:11 2011 +0200
Translation update done using Pootle.
commit 4112594839357732664ba1b6d34955fdcf9aae56
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:11:50 2011 +0200
Translation update done using Pootle.
commit a55a0c1b65f7bcbde639296e47745989f6999d92
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:11:24 2011 +0200
Translation update done using Pootle.
commit c715666645bd9b809e38aef0bc67dacd5c96b1aa
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:10:22 2011 +0200
Translation update done using Pootle.
commit 0800f05ac23ef5ca2d06e74060cc2fdb3fadec3b
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:10:00 2011 +0200
Translation update done using Pootle.
commit fdcd934c2b85124c88233566e64fb7f6e81f94b9
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:09:42 2011 +0200
Translation update done using Pootle.
commit 0da3a16ad564ad969f6f7104423c8122165ae615
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:09:15 2011 +0200
Translation update done using Pootle.
commit 96db027e1971ab080c6e89d1d985d55aaa2315c6
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:08:43 2011 +0200
Translation update done using Pootle.
commit 557ebc1b87efa201856978a1145917b24269e556
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:03:50 2011 +0200
Translation update done using Pootle.
commit 6a93b0c4edbf311910bee8c3d78920a970f7ea1f
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:03:33 2011 +0200
Translation update done using Pootle.
commit b624de72f97c60812cb511c8edb94cfb9d6edabc
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:03:07 2011 +0200
Translation update done using Pootle.
commit bdab18a5b4eaeca0de398885572c7a71f8340f51
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:02:57 2011 +0200
Translation update done using Pootle.
commit 3f0fb12a20235d54457aebe0df122a795dccdcc2
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:01:58 2011 +0200
Translation update done using Pootle.
commit 1c85acac0e23a412379618394daba5bd606e5ff0
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:01:49 2011 +0200
Translation update done using Pootle.
commit 6a15d1ddde3fa28a89e0aba40a9dfdec2874315d
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:01:14 2011 +0200
Translation update done using Pootle.
commit 18c330470148a285732ee6c52d4c27ce7b94cd67
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Aug 11 17:00:53 2011 +0200
Translation update done using Pootle.
commit 652d4308a72b9f6c92d565fa362f0e1ba0385d1b
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Aug 11 16:19:55 2011 +0200
Translation update done using Pootle.
commit a5ed66beede75c75af473a3f8147584b713e93ef
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Aug 11 16:17:44 2011 +0200
Translation update done using Pootle.
commit e6d429d62d8632b5a55a7bc4971a5ade9be21082
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Aug 11 16:17:37 2011 +0200
Translation update done using Pootle.
commit e9c786795a45b8ff9de6acd1111c0ed0df8bee34
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Aug 11 16:17:28 2011 +0200
Translation update done using Pootle.
commit 7dc43c9e5c59ae68f30b16610808bc2e91905dbb
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Aug 11 16:17:16 2011 +0200
Translation update done using Pootle.
commit e1244e1c66de07143eda11897a3d32e05dd3322b
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Aug 11 16:16:18 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/ja.po | 37 +++--------
po/sl.po | 170 ++++++++++++++++++--------------------------------
po/tr.po | 208 ++++++++++++++++++++++++++------------------------------------
3 files changed, 159 insertions(+), 256 deletions(-)
diff --git a/po/ja.po b/po/ja.po
index db847cc..d3bb063 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-08-11 09:15-0400\n"
-"PO-Revision-Date: 2011-08-06 12:16+0200\n"
+"PO-Revision-Date: 2011-08-12 11:48+0200\n"
"Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n"
"Language-Team: japanese <jp(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -1752,18 +1752,16 @@ msgid "Done"
msgstr "決定"
#: js/messages.php:315
-#, fuzzy
#| msgid "Prev"
msgctxt "Previous month"
msgid "Prev"
-msgstr "前へ"
+msgstr "前月"
#: js/messages.php:320
-#, fuzzy
#| msgid "Next"
msgctxt "Next month"
msgid "Next"
-msgstr "次へ"
+msgstr "翌月"
#. l10n: Display text for current month link in calendar
#: js/messages.php:323
@@ -1909,7 +1907,6 @@ msgstr "土"
#. l10n: Short week day name
#: js/messages.php:376
-#, fuzzy
#| msgctxt "Short week day name"
#| msgid "Sun"
msgid "Sun"
@@ -2630,7 +2627,6 @@ msgstr "パラメータがありません:"
#: libraries/common.lib.php:2267 libraries/common.lib.php:2270
#: libraries/display_tbl.lib.php:306
-#, fuzzy
#| msgid "Begin"
msgctxt "First page"
msgid "Begin"
@@ -2639,7 +2635,6 @@ msgstr "先頭"
#: libraries/common.lib.php:2268 libraries/common.lib.php:2271
#: libraries/display_tbl.lib.php:307 server_binlog.php:135
#: server_binlog.php:137
-#, fuzzy
#| msgid "Previous"
msgctxt "Previous page"
msgid "Previous"
@@ -2648,7 +2643,6 @@ msgstr "前へ"
#: libraries/common.lib.php:2297 libraries/common.lib.php:2300
#: libraries/display_tbl.lib.php:370 server_binlog.php:170
#: server_binlog.php:172
-#, fuzzy
#| msgid "Next"
msgctxt "Next page"
msgid "Next"
@@ -2656,7 +2650,6 @@ msgstr "次へ"
#: libraries/common.lib.php:2298 libraries/common.lib.php:2301
#: libraries/display_tbl.lib.php:385
-#, fuzzy
#| msgid "End"
msgctxt "Last page"
msgid "End"
@@ -4023,10 +4016,9 @@ msgid "Memory limit"
msgstr "メモリ制限"
#: libraries/config/messages.inc.php:319
-#, fuzzy
#| msgid "These are Edit, Inline edit, Copy and Delete links"
msgid "These are Edit, Copy and Delete links"
-msgstr "編集、インライン編集、コピー、削除のリンクことです。"
+msgstr "編集、コピー、削除のリンクことです。"
#: libraries/config/messages.inc.php:320
msgid "Where to show the table row links"
@@ -4711,16 +4703,14 @@ msgid "Show function fields"
msgstr "関数フィールドの表示"
#: libraries/config/messages.inc.php:460
-#, fuzzy
#| msgid "Where to show the table row links"
msgid "Whether to show hint or not"
-msgstr "テーブルの行リンクを表示する場所"
+msgstr "操作ヒントを表示するかどうか。"
#: libraries/config/messages.inc.php:461
-#, fuzzy
#| msgid "Show indexes"
msgid "Show hint"
-msgstr "インデックスを表示する"
+msgstr "操作ヒントを表示する"
#: libraries/config/messages.inc.php:462
msgid ""
@@ -6306,7 +6296,7 @@ msgstr ""
#: libraries/export/sql.php:329 libraries/export/xml.php:44
msgid "Procedures"
-msgstr "プロシジャ"
+msgstr "プロシージャ"
#: libraries/export/sql.php:346 libraries/export/xml.php:39
msgid "Functions"
@@ -6386,7 +6376,6 @@ msgid ""
msgstr "下に示す構成が、作成もしくは変更されました。ここで次のことが行えます。"
#: libraries/import.lib.php:1077
-#, fuzzy
#| msgid "View a structure`s contents by clicking on its name"
msgid "View a structure's contents by clicking on its name"
msgstr "名前をクリックすることで構造内容を表示します。"
@@ -6398,7 +6387,6 @@ msgstr ""
"「オプション」のリンクをクリックすることで対応する設定の変更が行えます。"
#: libraries/import.lib.php:1079
-#, fuzzy
#| msgid "Edit its structure by following the \"Structure\" link"
msgid "Edit structure by following the \"Structure\" link"
msgstr "名前の後ろにある「構造」のリンクより構造の編集が行えます。"
@@ -7017,18 +7005,16 @@ msgid "Execute every"
msgstr "実行間隔"
#: libraries/rte/rte_events.lib.php:449
-#, fuzzy
#| msgid "Start"
msgctxt "Start of recurring event"
msgid "Start"
msgstr "開始"
#: libraries/rte/rte_events.lib.php:457
-#, fuzzy
#| msgid "End"
msgctxt "End of recurring event"
msgid "End"
-msgstr "最後"
+msgstr "終了"
#: libraries/rte/rte_events.lib.php:465 libraries/rte/rte_routines.lib.php:912
#: libraries/rte/rte_triggers.lib.php:354
@@ -8155,7 +8141,6 @@ msgid "No databases"
msgstr "データベースが存在しません"
#: navigation.php:270
-#, fuzzy
#| msgid "filter tables by name"
msgid "Filter tables by name"
msgstr "名前でテーブルをフィルタする"
@@ -9205,10 +9190,9 @@ msgid "Monitor"
msgstr "モニタ"
#: server_status.php:648
-#, fuzzy
#| msgid "Apply a divisor"
msgid "Advisor"
-msgstr "除数を適用する"
+msgstr "アドバイザ"
#: server_status.php:658 server_status.php:680
msgid "Refresh rate: "
@@ -10053,10 +10037,9 @@ msgid ""
msgstr ""
#: server_status.php:1432
-#, fuzzy
#| msgid "Restore default value"
msgid "Reset to default"
-msgstr "デフォルト値に戻す"
+msgstr "デフォルトに戻す"
#: server_status.php:1436
msgid "Monitor Instructions"
diff --git a/po/sl.po b/po/sl.po
index 6a2e65d..e78085e 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-08-11 09:15-0400\n"
-"PO-Revision-Date: 2011-07-22 11:14+0200\n"
+"PO-Revision-Date: 2011-08-11 18:40+0200\n"
"Last-Translator: Domen <dbc334(a)gmail.com>\n"
"Language-Team: slovenian <sl(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -416,10 +416,10 @@ msgid "You have to choose at least one column to display"
msgstr "Za prikaz morate izbrati morate vsaj en stolpec"
#: db_qbe.php:186
-#, fuzzy, php-format
+#, php-format
#| msgid "visual builder"
msgid "Switch to %svisual builder%s"
-msgstr "vidni graditelj"
+msgstr "Preklopi na %svidni graditelj%s"
#: db_qbe.php:222 libraries/db_structure.lib.php:90
#: libraries/display_tbl.lib.php:955
@@ -1155,64 +1155,56 @@ msgid "Average load"
msgstr "Povprečna obremenitev"
#: js/messages.php:100
-#, fuzzy
#| msgid "System memory"
msgid "Total memory"
-msgstr "Sistemski pomnilnik"
+msgstr "Skupni pomnilnik"
#: js/messages.php:101
-#, fuzzy
#| msgid "System memory"
msgid "Cached memory"
-msgstr "Sistemski pomnilnik"
+msgstr "Predpomnjen pomnilnik"
#: js/messages.php:102
-#, fuzzy
#| msgid "Buffer Pool"
msgid "Buffered memory"
-msgstr "Zaloga medpomnilnika"
+msgstr "Medpomnjen pomnilnik"
#: js/messages.php:103
-#, fuzzy
#| msgid "System memory"
msgid "Free memory"
-msgstr "Sistemski pomnilnik"
+msgstr "Prost pomnilnik"
#: js/messages.php:104
-#, fuzzy
#| msgid "System memory"
msgid "Used memory"
-msgstr "Sistemski pomnilnik"
+msgstr "Uporabljen pomnilnik"
#: js/messages.php:106
-#, fuzzy
#| msgid "Total"
msgid "Total Swap"
-msgstr "Skupaj"
+msgstr "Skupna izmenjava"
#: js/messages.php:107
msgid "Cached Swap"
-msgstr ""
+msgstr "Predpomnjena izmenjava"
#: js/messages.php:108
msgid "Used Swap"
-msgstr ""
+msgstr "Medpomnjena izmenjava"
#: js/messages.php:109
-#, fuzzy
#| msgid "Free pages"
msgid "Free Swap"
-msgstr "Proste strani"
+msgstr "Prosta izmenjava"
#: js/messages.php:111
msgid "Bytes sent"
-msgstr ""
+msgstr "Poslanih bajtov"
#: js/messages.php:112
-#, fuzzy
#| msgid "Received"
msgid "Bytes received"
-msgstr "Prejeto"
+msgstr "Prejetih bajtov"
#: js/messages.php:113 server_status.php:987
msgid "Connections"
@@ -1237,10 +1229,9 @@ msgid "Remove chart"
msgstr "Odstrani grafikon"
#: js/messages.php:121
-#, fuzzy
#| msgid "Edit labels and series"
msgid "Edit title and labels"
-msgstr "Uredi oznake in serije"
+msgstr "Uredi naslov in oznake"
#: js/messages.php:122
msgid "Add chart to grid"
@@ -1266,7 +1257,6 @@ msgid "Pause monitor"
msgstr "Postoj nadziranje"
#: js/messages.php:129
-#, fuzzy
#| msgid "general_log and slow_query_log is enabled."
msgid "general_log and slow_query_log are enabled."
msgstr "general_log in slow_query_log sta omogočena."
@@ -1280,7 +1270,6 @@ msgid "slow_query_log is enabled."
msgstr "slow_query_log je omogočen."
#: js/messages.php:132
-#, fuzzy
#| msgid "slow_query_log and general_log is disabled."
msgid "slow_query_log and general_log are disabled."
msgstr "slow_query_log in general_log sta onemogočena."
@@ -1417,7 +1406,6 @@ msgid "Jump to Log table"
msgstr "Pojdi v dnevniško tabelo"
#: js/messages.php:163
-#, fuzzy
#| msgid "Log analysed, but not data found in this time span."
msgid "Log analysed, but no data found in this time span."
msgstr ""
@@ -1425,10 +1413,9 @@ msgstr ""
#. l10n: A collection of available filters
#: js/messages.php:166
-#, fuzzy
#| msgid "Filter"
msgid "Filters"
-msgstr "Filtriranje"
+msgstr "Filtri"
#. l10n: Filter as in "Start Filtering"
#: js/messages.php:168
@@ -1437,23 +1424,21 @@ msgstr "Filtriranje"
#: js/messages.php:169
msgid "Filter queries by word/regexp:"
-msgstr ""
+msgstr "Filtriraj poizvedbe po besedi/regexp:"
#: js/messages.php:170
msgid "Group queries, ignoring variable data in WHERE clauses"
-msgstr ""
+msgstr "Združi poizvedbe, neupoštevajoč spremenljive podatke v stavkih WHERE"
#: js/messages.php:171
-#, fuzzy
#| msgid "Number of inserted rows"
msgid "Sum of grouped rows:"
-msgstr "Število vstavljenih vrstic"
+msgstr "Seštevek združenih vrstic:"
#: js/messages.php:172
-#, fuzzy
#| msgid "Total"
msgid "Total:"
-msgstr "Skupaj"
+msgstr "Skupaj:"
#: js/messages.php:174
msgid "Loading logs"
@@ -1461,7 +1446,7 @@ msgstr "Dnevniki nalaganja"
#: js/messages.php:175
msgid "Monitor refresh failed"
-msgstr ""
+msgstr "Osvežitev nadziranja je spodletela"
#: js/messages.php:176
msgid ""
@@ -1471,14 +1456,13 @@ msgid ""
msgstr ""
#: js/messages.php:177
-#, fuzzy
#| msgid "Reload"
msgid "Reload page"
-msgstr "Osveži"
+msgstr "Ponovno naloži stran"
#: js/messages.php:179
msgid "Affected rows:"
-msgstr ""
+msgstr "Spremenjene vrstice:"
#: js/messages.php:181
msgid "Failed parsing config file. It doesn't seem to be valid JSON code"
@@ -1498,50 +1482,45 @@ msgid "Import"
msgstr "Uvozi"
#: js/messages.php:185
-#, fuzzy
#| msgid "Update Query"
msgid "Analyse Query"
-msgstr "Osveži poizvedbo"
+msgstr "Analiziraj poizvedbo"
#: js/messages.php:189
-#, fuzzy
#| msgid "Apply a divisor"
msgid "Advisor system"
-msgstr "Uporabi delitelja"
+msgstr "Svetovalni sistem"
#: js/messages.php:190
msgid "Possible performance issues"
-msgstr ""
+msgstr "Morebitni spori zmogljivosti"
#: js/messages.php:191
msgid "Issue"
-msgstr ""
+msgstr "Spor"
#: js/messages.php:192
-#, fuzzy
#| msgid "Documentation"
msgid "Recommendation"
-msgstr "Dokumentacija"
+msgstr "Priporočilo"
#: js/messages.php:193
-#, fuzzy
#| msgid "Details"
msgid "Rule details"
-msgstr "Podrobnosti"
+msgstr "Podrobnosti pravila"
#: js/messages.php:194
-#, fuzzy
#| msgid "Authentication"
msgid "Justification"
-msgstr "Overovitev"
+msgstr "Utemeljitev"
#: js/messages.php:195
msgid "Used variable / formula"
-msgstr ""
+msgstr "Uporabljena spremenljivka/formula"
#: js/messages.php:196
msgid "Test"
-msgstr ""
+msgstr "Preizkus"
#: js/messages.php:201 libraries/tbl_properties.inc.php:763
#: pmd_general.php:388 pmd_general.php:425 pmd_general.php:545
@@ -1661,10 +1640,9 @@ msgid "Change"
msgstr "Spremeni"
#: js/messages.php:245
-#, fuzzy
#| msgid "Maximum execution time"
msgid "Query execution time"
-msgstr "Najdaljši čas izvajanja"
+msgstr "Čas izvajanja poizvedbe"
#: js/messages.php:248 libraries/config/FormDisplay.tpl.php:323
#: libraries/schema/User_Schema.class.php:313
@@ -1688,10 +1666,9 @@ msgid "Ignore"
msgstr "Prezri"
#: js/messages.php:258
-#, fuzzy
#| msgid "Add column"
msgid "Add columns"
-msgstr "Dodaj stolpec"
+msgstr "Dodaj stolpce"
#: js/messages.php:261
msgid "Select referenced key"
@@ -1723,13 +1700,15 @@ msgstr "Dodaj možnost za stolpec "
#: js/messages.php:271
msgid "Press escape to cancel editing"
-msgstr ""
+msgstr "Pritisnite ubežnico (escape) za prekinitev urejanja"
#: js/messages.php:272
msgid ""
"You have edited some data and they have not been saved. Are you sure you "
"want to leave this page before saving the data?"
msgstr ""
+"Uredili ste nekatere podatke, vendar jih niste shranili. Ste prepričani, da "
+"želite zapustiti stran, preden shranite podatke?"
#: js/messages.php:273
msgid "Drag to reorder"
@@ -1793,18 +1772,16 @@ msgid "Done"
msgstr "Končano"
#: js/messages.php:315
-#, fuzzy
#| msgid "Prev"
msgctxt "Previous month"
msgid "Prev"
-msgstr "Prejšnji"
+msgstr "Prej"
#: js/messages.php:320
-#, fuzzy
#| msgid "Next"
msgctxt "Next month"
msgid "Next"
-msgstr "Naslednji"
+msgstr "Nasl"
#. l10n: Display text for current month link in calendar
#: js/messages.php:323
@@ -1950,7 +1927,6 @@ msgstr "sobota"
#. l10n: Short week day name
#: js/messages.php:376
-#, fuzzy
#| msgctxt "Short week day name"
#| msgid "Sun"
msgid "Sun"
@@ -2186,10 +2162,9 @@ msgstr[2] "Vstavljene so %1$d vrstice."
msgstr[3] "Vstavljenih je %1$d vrstic."
#: libraries/PDF.class.php:81
-#, fuzzy
#| msgid "Allows reading data."
msgid "Error while creating PDF:"
-msgstr "Omogoča branje podatkov."
+msgstr "Napaka med ustvarjanjem PDF:"
#: libraries/RecentTable.class.php:107
msgid "Could not save recent table"
@@ -2225,10 +2200,9 @@ msgid "This MySQL server does not support the %s storage engine."
msgstr "Ta strežnik MySQL ne podpira skladiščnega pogona %s."
#: libraries/Table.class.php:303
-#, fuzzy
#| msgid "Show slave status"
msgid "unknown table status: "
-msgstr "Prikaži stanje podrejencev"
+msgstr "neznano stanje tabele: "
#: libraries/Table.class.php:1034
msgid "Invalid database"
@@ -2408,10 +2382,9 @@ msgid "PBMS get BLOB info failed:"
msgstr "Pridobivanje informacij BLOB PBMS je spodletelo:"
#: libraries/blobstreaming.lib.php:332
-#, fuzzy
#| msgid "get BLOB Content-Type failed"
msgid "PBMS get BLOB Content-Type failed"
-msgstr "pridobivanje Content-Type BLOB je spodletelo"
+msgstr "Pridobivanje Content-Type BLOB PBMS je spodletelo"
#: libraries/blobstreaming.lib.php:358
msgid "View image"
@@ -2681,7 +2654,6 @@ msgstr "Manjkajoč parameter:"
#: libraries/common.lib.php:2267 libraries/common.lib.php:2270
#: libraries/display_tbl.lib.php:306
-#, fuzzy
#| msgid "Begin"
msgctxt "First page"
msgid "Begin"
@@ -2690,24 +2662,21 @@ msgstr "Začetek"
#: libraries/common.lib.php:2268 libraries/common.lib.php:2271
#: libraries/display_tbl.lib.php:307 server_binlog.php:135
#: server_binlog.php:137
-#, fuzzy
#| msgid "Previous"
msgctxt "Previous page"
msgid "Previous"
-msgstr "Prejšnji"
+msgstr "Prejšnja"
#: libraries/common.lib.php:2297 libraries/common.lib.php:2300
#: libraries/display_tbl.lib.php:370 server_binlog.php:170
#: server_binlog.php:172
-#, fuzzy
#| msgid "Next"
msgctxt "Next page"
msgid "Next"
-msgstr "Naslednji"
+msgstr "Naslednja"
#: libraries/common.lib.php:2298 libraries/common.lib.php:2301
#: libraries/display_tbl.lib.php:385
-#, fuzzy
#| msgid "End"
msgctxt "Last page"
msgid "End"
@@ -4085,10 +4054,9 @@ msgid "Memory limit"
msgstr "Omejitev spomina"
#: libraries/config/messages.inc.php:319
-#, fuzzy
#| msgid "These are Edit, Inline edit, Copy and Delete links"
msgid "These are Edit, Copy and Delete links"
-msgstr "To so povezave Uredi, Uredi v vrstici, Kopiraj in Izbriši"
+msgstr "To so povezave Uredi, Kopiraj in Izbriši"
#: libraries/config/messages.inc.php:320
msgid "Where to show the table row links"
@@ -4244,7 +4212,7 @@ msgstr "Prikaži gumb za pomoč"
#: libraries/config/messages.inc.php:357
msgid "Save all edited cells at once"
-msgstr ""
+msgstr "Shrani vse urejene celice naenkrat"
#: libraries/config/messages.inc.php:358
msgid "Directory where exports can be saved on server"
@@ -4771,16 +4739,14 @@ msgid "Show function fields"
msgstr "Prikaži polja funkcij"
#: libraries/config/messages.inc.php:460
-#, fuzzy
#| msgid "Where to show the table row links"
msgid "Whether to show hint or not"
-msgstr "Kje naj prikažem povezave vrstic tabel"
+msgstr "Naj prikažem namig ali ne"
#: libraries/config/messages.inc.php:461
-#, fuzzy
#| msgid "Show indexes"
msgid "Show hint"
-msgstr "Pokaži indekse"
+msgstr "Prikaži namig"
#: libraries/config/messages.inc.php:462
msgid ""
@@ -5511,10 +5477,9 @@ msgid "Language"
msgstr "Jezik"
#: libraries/display_tbl.lib.php:401
-#, fuzzy
#| msgid "Save directory"
msgid "Save edited data"
-msgstr "Mapa za shranjevanje"
+msgstr "Shrani urejene podatke"
#: libraries/display_tbl.lib.php:407
msgid "Restore column order"
@@ -6414,10 +6379,9 @@ msgid "Stand-in structure for view"
msgstr "Nadomestna struktura pogleda"
#: libraries/export/sql.php:1071
-#, fuzzy
#| msgid "Allows reading data."
msgid "Error reading data:"
-msgstr "Omogoča branje podatkov."
+msgstr "Napaka med branjem podatkov:"
#: libraries/export/xml.php:19 libraries/import/xml.php:21
msgid "XML"
@@ -6464,10 +6428,9 @@ msgstr ""
"Naslednje strukture so bile ali ustvarjene ali spremenjene: Tukaj lahko:"
#: libraries/import.lib.php:1077
-#, fuzzy
#| msgid "View a structure`s contents by clicking on its name"
msgid "View a structure's contents by clicking on its name"
-msgstr "Oglejte si vsebino strukture s klikom na njeno ime"
+msgstr "Oglejte si vsebine strukture s klikom na njeno ime"
#: libraries/import.lib.php:1078
msgid ""
@@ -6477,30 +6440,29 @@ msgstr ""
"\"Možnosti\""
#: libraries/import.lib.php:1079
-#, fuzzy
#| msgid "Edit its structure by following the \"Structure\" link"
msgid "Edit structure by following the \"Structure\" link"
-msgstr "Uredite njeno strukturo s sledenjem povezavi \"Struktura\""
+msgstr "Uredite strukturo s sledenjem povezavi \"Struktura\""
#: libraries/import.lib.php:1082
msgid "Go to database"
msgstr "Pojdi v zbirko podatkov"
#: libraries/import.lib.php:1085 libraries/import.lib.php:1109
-#, fuzzy, php-format
+#, php-format
#| msgid "Missing data for %s"
msgid "Edit settings for %s"
-msgstr "Manjkajoči podatki za %s"
+msgstr "Uredi nastavitve za %s"
#: libraries/import.lib.php:1104
msgid "Go to table"
msgstr "Pojdi v tabelo"
#: libraries/import.lib.php:1107
-#, fuzzy, php-format
+#, php-format
#| msgid "Structure only"
msgid "Structure of %s"
-msgstr "Samo struktura"
+msgstr "Struktura %s"
#: libraries/import.lib.php:1113
msgid "Go to view"
@@ -7099,14 +7061,12 @@ msgid "Execute every"
msgstr "Izvedi vsakih"
#: libraries/rte/rte_events.lib.php:449
-#, fuzzy
#| msgid "Start"
msgctxt "Start of recurring event"
msgid "Start"
msgstr "Začetek"
#: libraries/rte/rte_events.lib.php:457
-#, fuzzy
#| msgid "End"
msgctxt "End of recurring event"
msgid "End"
@@ -8233,10 +8193,9 @@ msgid "No databases"
msgstr "Brez zbirk podatkov"
#: navigation.php:270
-#, fuzzy
#| msgid "filter tables by name"
msgid "Filter tables by name"
-msgstr "filtriraj tabele po imenu"
+msgstr "Filtriraj tabele po imenu"
#: navigation.php:303 navigation.php:304
msgctxt "short form"
@@ -9290,10 +9249,9 @@ msgid "Monitor"
msgstr "Nadziranje"
#: server_status.php:648
-#, fuzzy
#| msgid "Apply a divisor"
msgid "Advisor"
-msgstr "Uporabi delitelja"
+msgstr "Svetovalec"
#: server_status.php:658 server_status.php:680
msgid "Refresh rate: "
@@ -9312,26 +9270,23 @@ msgid "Filter by category..."
msgstr "Filtriraj po kategoriji ..."
#: server_status.php:723
-#, fuzzy
#| msgid "Show only alert values"
msgid "Show unformatted values"
-msgstr "Prikaži samo opozorilne vrednosti"
+msgstr "Prikaži neoblikovane vrednosti"
#: server_status.php:727
msgid "Related links:"
msgstr "Sorodne povezave:"
#: server_status.php:758
-#, fuzzy
#| msgid "Query type"
msgid "Run analyzer"
-msgstr "Vrsta poizvedbe"
+msgstr "Zaženi analitik"
#: server_status.php:759
-#, fuzzy
#| msgid "Introduction"
msgid "Instructions"
-msgstr "Uvod"
+msgstr "Navodila"
#: server_status.php:764
msgid ""
@@ -10141,10 +10096,9 @@ msgid "Refresh rate"
msgstr "Hitrost osveževanja"
#: server_status.php:1415
-#, fuzzy
#| msgid "Chart columns:"
msgid "Chart columns"
-msgstr "Stolpci grafikona:"
+msgstr "Stolpci grafikona"
#: server_status.php:1431
#, fuzzy
diff --git a/po/tr.po b/po/tr.po
index f3459fd..c407297 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-08-11 09:15-0400\n"
-"PO-Revision-Date: 2011-08-10 21:18+0200\n"
+"PO-Revision-Date: 2011-08-11 22:58+0200\n"
"Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n"
"Language-Team: turkish <tr(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -1458,50 +1458,45 @@ msgid "Import"
msgstr "İçe Aktar"
#: js/messages.php:185
-#, fuzzy
#| msgid "Update Query"
msgid "Analyse Query"
-msgstr "Sorguyu Güncelle"
+msgstr "Sorguyu Çözümle"
#: js/messages.php:189
-#, fuzzy
#| msgid "Advisor"
msgid "Advisor system"
-msgstr "Danışman"
+msgstr "Danışman sistemi"
#: js/messages.php:190
msgid "Possible performance issues"
-msgstr ""
+msgstr "Olası performans sorunları"
#: js/messages.php:191
msgid "Issue"
-msgstr ""
+msgstr "Sorun"
#: js/messages.php:192
-#, fuzzy
#| msgid "Documentation"
msgid "Recommendation"
-msgstr "Belgeler"
+msgstr "Tavsiye"
#: js/messages.php:193
-#, fuzzy
#| msgid "Details"
msgid "Rule details"
-msgstr "Ayrıntılar"
+msgstr "Kural ayrıntıları"
#: js/messages.php:194
-#, fuzzy
#| msgid "Authentication"
msgid "Justification"
-msgstr "Kimlik doğrulama"
+msgstr "Gerekçe"
#: js/messages.php:195
msgid "Used variable / formula"
-msgstr ""
+msgstr "Kullanılan değişken / formül"
#: js/messages.php:196
msgid "Test"
-msgstr ""
+msgstr "Sınama"
#: js/messages.php:201 libraries/tbl_properties.inc.php:763
#: pmd_general.php:388 pmd_general.php:425 pmd_general.php:545
@@ -8174,10 +8169,9 @@ msgid "No databases"
msgstr "Veritabanı yok"
#: navigation.php:270
-#, fuzzy
#| msgid "filter tables by name"
msgid "Filter tables by name"
-msgstr "tabloları adına göre süz"
+msgstr "Tabloları adına göre süz"
#: navigation.php:303 navigation.php:304
msgctxt "short form"
@@ -8573,7 +8567,7 @@ msgstr "Yeni tabloların oluşturulmasına izin verir."
#: server_privileges.php:38 server_privileges.php:253
#: server_privileges.php:619
msgid "Allows creating temporary tables."
-msgstr "Geçici tablolara oluşturulmasına izin verir."
+msgstr "Geçici tablolar oluşturulmasına izin verir."
#: server_privileges.php:39 server_privileges.php:303
#: server_privileges.php:655
@@ -9255,16 +9249,14 @@ msgid "Related links:"
msgstr "İlgili bağlantılar:"
#: server_status.php:758
-#, fuzzy
#| msgid "Query analyzer"
msgid "Run analyzer"
-msgstr "Sorgu çözümleyici"
+msgstr "Çözümleyiciyi çalıştır"
#: server_status.php:759
-#, fuzzy
#| msgid "Introduction"
msgid "Instructions"
-msgstr "Başlangıç"
+msgstr "Talimatlar"
#: server_status.php:764
msgid ""
@@ -9279,6 +9271,16 @@ msgid ""
"database, and undo the change if there was no clearly measurable improvement."
"</p>"
msgstr ""
+"Danışman sistemi sunucu durumu değişkenlerini çözümleyerek sunucu "
+"değişkenleri üzerinde tavsiyelerde bulunabilir. <p>Not alın ancak bu sistem "
+"basit hesaplamalara dayanarak ve sisteminize muhakkak uygulanamayan başlıca "
+"kurallar tarafından tavsiyelerde bulunur.</p> <p>Yapılandırmanın herhangi "
+"bir değişiminden önce, neyi değiştirdiğinizi (belgeyi okuyarak) "
+"bildiğinizden ve değişikliği nasıl geri alıcağınızdan emin olun. Yanlış "
+"ayarlamalar performans üzerinde çok olumsuz etkiler yapabilir.</p> "
+"<p>Sisteminizi ayarlamanın en iyi yolu bir seferde sadece bir ayar "
+"değiştirmek, gözlemlemek veya veritabanınızı kıyaslamak ve eğer açıkça "
+"ölçülebilir bir iyileşme yoksa, değişikliği geri almak.</p>"
#. l10n: Questions is the name of a MySQL Status variable
#: server_status.php:784
@@ -11437,11 +11439,11 @@ msgstr "Görünümü yeniden şuna adlandır"
#: po/advisory_rules.php:5
msgid "Uptime below one day"
-msgstr ""
+msgstr "Bir günün altındaki çalışma zamanı"
#: po/advisory_rules.php:6
msgid "Uptime is less than 1 day, performance tuning may not be accurate."
-msgstr ""
+msgstr "Çalışma zamanı 1 günden az, performans ayarlaması kesin olmayabilir."
#: po/advisory_rules.php:7
msgid ""
@@ -11455,10 +11457,9 @@ msgid "The uptime is only %s"
msgstr ""
#: po/advisory_rules.php:10
-#, fuzzy
#| msgid "Questions"
msgid "Questions below 1,000"
-msgstr "Sorular"
+msgstr "1,000'in altındaki sorular"
#: po/advisory_rules.php:11
msgid ""
@@ -11473,16 +11474,16 @@ msgid ""
msgstr ""
#: po/advisory_rules.php:13
-#, fuzzy, php-format
+#, php-format
#| msgid "Current connection"
msgid "Current amount of Questions: %s"
-msgstr "Şu anki bağlantı"
+msgstr "Şu anki Soru miktarı: %s"
#: po/advisory_rules.php:15
-#, fuzzy, php-format
+#, php-format
#| msgid "Show SQL queries"
msgid "% slow queries"
-msgstr "SQL sorgularını göster"
+msgstr "% yavaş sorgular"
#: po/advisory_rules.php:16
msgid ""
@@ -11501,10 +11502,9 @@ msgid "The slow query rate should be below 5%%, your value is %s%%."
msgstr ""
#: po/advisory_rules.php:20
-#, fuzzy
#| msgid "Flush query cache"
msgid "slow query rate"
-msgstr "Sorgu önbelleğini temizle"
+msgstr "yavaş sorgu oranı"
#: po/advisory_rules.php:21
msgid ""
@@ -11519,10 +11519,9 @@ msgid ""
msgstr ""
#: po/advisory_rules.php:25
-#, fuzzy
#| msgid "SQL queries"
msgid "Long query time"
-msgstr "SQL sorguları"
+msgstr "Uzun sorgu süresi"
#: po/advisory_rules.php:26
msgid ""
@@ -11537,22 +11536,20 @@ msgid ""
msgstr ""
#: po/advisory_rules.php:28
-#, fuzzy, php-format
+#, php-format
#| msgid "long_query_time is set to %d second(s)."
msgid "long_query_time is currently set to %ds."
-msgstr "long_query_time %d saniyeye ayarlı."
+msgstr "long_query_time şimdilik %ds'ye ayarlı."
#: po/advisory_rules.php:30
-#, fuzzy
#| msgid "Show query box"
msgid "Slow query logging"
-msgstr "Sorgu kutusunu göster"
+msgstr "Yavaş sorgu günlükleme"
#: po/advisory_rules.php:31
-#, fuzzy
#| msgid "slow_query_log is enabled."
msgid "The slow query log is disabled."
-msgstr "slow_query_log etkinleştirildi."
+msgstr "Yavaş sorgu günlüğü etkisizleştirildi."
#: po/advisory_rules.php:32
msgid ""
@@ -11565,10 +11562,9 @@ msgid "log_slow_queries is set to 'OFF'"
msgstr ""
#: po/advisory_rules.php:35
-#, fuzzy
#| msgid "Clear series"
msgid "Release Series"
-msgstr "Diziyi temizle"
+msgstr "Diziyi Yayımla"
#: po/advisory_rules.php:36
msgid "The MySQL server version less then 5.1."
@@ -11581,16 +11577,15 @@ msgid ""
msgstr ""
#: po/advisory_rules.php:38 po/advisory_rules.php:43 po/advisory_rules.php:48
-#, fuzzy, php-format
+#, php-format
#| msgid "Create version"
msgid "Current version: %s"
-msgstr "Sürüm oluştur"
+msgstr "Şu anki sürüm: %s"
#: po/advisory_rules.php:40 po/advisory_rules.php:45
-#, fuzzy
#| msgid "Version"
msgid "Minor Version"
-msgstr "Sürüm"
+msgstr "İkincil Sürüm"
#: po/advisory_rules.php:41
msgid "Version less than 5.1.30 (the first GA release of 5.1)."
@@ -11607,16 +11602,14 @@ msgid "Version less than 5.5.8 (the first GA release of 5.5)."
msgstr ""
#: po/advisory_rules.php:47
-#, fuzzy
#| msgid "You should upgrade to %s %s or later."
msgid "You should upgrade, to a stable version of MySQL 5.5"
-msgstr "%s %s veya sonrasına yükseltmelisiniz."
+msgstr "MySQL 5.5'in sağlam sürümüne yükseltmelisiniz"
#: po/advisory_rules.php:50 po/advisory_rules.php:55
-#, fuzzy
#| msgid "Description"
msgid "Distribution"
-msgstr "Açıklama"
+msgstr "Dağıtım"
#: po/advisory_rules.php:51
msgid "Version is compiled from source, not a MySQL official binary."
@@ -11646,10 +11639,9 @@ msgid "'percona' found in version_comment"
msgstr ""
#: po/advisory_rules.php:60
-#, fuzzy
#| msgid "MySQL charset"
msgid "MySQL Architecture"
-msgstr "MySQL karakter grubu"
+msgstr "MySQL Yapısı"
#: po/advisory_rules.php:61
msgid "MySQL is not compiled as a 64-bit package."
@@ -11668,16 +11660,14 @@ msgid "Available memory on this host: %s"
msgstr ""
#: po/advisory_rules.php:65
-#, fuzzy
#| msgid "Query cache"
msgid "Query cache disabled"
-msgstr "Sorgu önbelleği"
+msgstr "Sorgu önbelleği etkisizleştirildi"
#: po/advisory_rules.php:66
-#, fuzzy
#| msgid "The server is not responding"
msgid "The query cache is not enabled."
-msgstr "Sunucu yanıt vermiyor"
+msgstr "Sorgu önbelleği etkinleştirilmedi."
#: po/advisory_rules.php:67
msgid ""
@@ -11692,10 +11682,9 @@ msgid "query_cache_size is set to 0 or query_cache_type is set to 'OFF'"
msgstr ""
#: po/advisory_rules.php:70
-#, fuzzy
#| msgid "Space usage"
msgid "memcached usage"
-msgstr "Alan kullanımı"
+msgstr "bellek önbelleklemesi kullanımı"
#: po/advisory_rules.php:71
msgid "Suboptimal caching method."
@@ -11734,10 +11723,9 @@ msgid "The current query cache hit rate of %s%% is below 20%%"
msgstr ""
#: po/advisory_rules.php:80
-#, fuzzy
#| msgid "Query cache"
msgid "Query Cache usage"
-msgstr "Sorgu önbelleği"
+msgstr "Sorgu Önbelleği kullanımı"
#: po/advisory_rules.php:81
#, php-format
@@ -11758,10 +11746,9 @@ msgid ""
msgstr ""
#: po/advisory_rules.php:85
-#, fuzzy
#| msgid "Query cache"
msgid "Query cache fragmentation"
-msgstr "Sorgu önbelleği"
+msgstr "Sorgu önbelleği parçalama"
#: po/advisory_rules.php:86
msgid "The query cache is considerably fragmented."
@@ -11792,12 +11779,13 @@ msgid "Query cache low memory prunes"
msgstr ""
#: po/advisory_rules.php:91
-#, fuzzy
#| msgid "The amount of free memory for query cache."
msgid ""
"Cached queries are removed due to low query cache memory from the query "
"cache."
-msgstr "Sorgu önbelleği için boş bellek miktarıdır."
+msgstr ""
+"Önbelleklenen sorgular, sorgu önbellek belleğinin sorgu önbelleğinden düşük "
+"olmasından dolayı kaldırıldı."
#: po/advisory_rules.php:92
msgid ""
@@ -11813,10 +11801,9 @@ msgid ""
msgstr ""
#: po/advisory_rules.php:95
-#, fuzzy
#| msgid "Query cache"
msgid "Query cache max size"
-msgstr "Sorgu önbelleği"
+msgstr "Sorgu önbelleği en fazla boyutu"
#: po/advisory_rules.php:96
msgid ""
@@ -11836,10 +11823,9 @@ msgid "Current query cache size: %s"
msgstr ""
#: po/advisory_rules.php:100
-#, fuzzy
#| msgid "Query results"
msgid "Query cache min result size"
-msgstr "Sorgu sonuçları"
+msgstr "Sorgu önbelleği en az sonuç boyutu"
#: po/advisory_rules.php:101
msgid ""
@@ -11863,16 +11849,15 @@ msgid "query_cache_limit is set to 1 MiB"
msgstr ""
#: po/advisory_rules.php:105
-#, fuzzy, php-format
+#, php-format
#| msgid "Allows creating temporary tables."
msgid "% sorts that cause temporary tales"
-msgstr "Geçici tablolara oluşturulmasına izin verir."
+msgstr "%, geçici tablolara sebep olanı sıralar"
#: po/advisory_rules.php:106 po/advisory_rules.php:111
-#, fuzzy
#| msgid "Allows creating temporary tables."
msgid "Too many sorts are causing temporary tables."
-msgstr "Geçici tablolara oluşturulmasına izin verir."
+msgstr "Çok fazla sıralama geçici tablolara sebep olur."
#: po/advisory_rules.php:107 po/advisory_rules.php:112
msgid ""
@@ -11898,10 +11883,9 @@ msgid ""
msgstr ""
#: po/advisory_rules.php:115
-#, fuzzy
#| msgid "Start row"
msgid "Sort rows"
-msgstr "Başlangıç satırı"
+msgstr "Satırları sırala"
#: po/advisory_rules.php:116
msgid "There are lots of rows being sorted."
@@ -11925,10 +11909,9 @@ msgid "rate of joins without indexes"
msgstr ""
#: po/advisory_rules.php:121
-#, fuzzy
#| msgid "There are no routines to display."
msgid "There are too many joins without indexes."
-msgstr "Görüntülemek için yordamlar yok."
+msgstr "İndeksler olmadan çok fazla katılım var."
#: po/advisory_rules.php:122
msgid ""
@@ -11991,10 +11974,9 @@ msgid "rate of reading next table row"
msgstr ""
#: po/advisory_rules.php:136
-#, fuzzy
#| msgid "Where to show the table row links"
msgid "The rate of reading the next table row is high."
-msgstr "Tablo satır bağlantılarının nerede gösterileceği"
+msgstr "Sonraki tablo satırını okuma oranı yüksek."
#: po/advisory_rules.php:137
msgid ""
@@ -12030,11 +12012,10 @@ msgid "Current values are tmp_table_size: %s, max_heap_table_size: %s"
msgstr ""
#: po/advisory_rules.php:145
-#, fuzzy
#| msgid "%s table"
#| msgid_plural "%s tables"
msgid "% temp disk tables"
-msgstr "%s tablo"
+msgstr "% geçici disk tabloları"
#: po/advisory_rules.php:146 po/advisory_rules.php:151
msgid ""
@@ -12083,10 +12064,9 @@ msgid ""
msgstr ""
#: po/advisory_rules.php:155
-#, fuzzy
#| msgid "Sort buffer size"
msgid "MyISAM key buffer size"
-msgstr "Arabellek boyutunu sırala"
+msgstr "MyISAM anahtar arabellek boyutu"
#: po/advisory_rules.php:156
msgid "Key buffer is not initialized. No MyISAM indexes will be cached."
@@ -12151,16 +12131,14 @@ msgid "Index reads from memory: %s%%, this value should be above 95%%"
msgstr ""
#: po/advisory_rules.php:175
-#, fuzzy
#| msgid "Create table"
msgid "rate of table open"
-msgstr "Tablo oluştur"
+msgstr "açık tablo oranı"
#: po/advisory_rules.php:176
-#, fuzzy
#| msgid "The current number of pending writes."
msgid "The rate of opening tables is high."
-msgstr "Şu anki bekleyen yazma sayısıdır."
+msgstr "Açılan tabloların oranı yüksek."
#: po/advisory_rules.php:177
msgid ""
@@ -12174,10 +12152,10 @@ msgid "Opened table rate: %s, this value should be less than 10 per hour"
msgstr ""
#: po/advisory_rules.php:180
-#, fuzzy, php-format
+#, php-format
#| msgid "Show open tables"
msgid "% open files"
-msgstr "Açık tabloları göster"
+msgstr "% açık dosyalar"
#: po/advisory_rules.php:181
msgid ""
@@ -12198,16 +12176,14 @@ msgid ""
msgstr ""
#: po/advisory_rules.php:185
-#, fuzzy
#| msgid "Format of imported file"
msgid "rate of open files"
-msgstr "İçe aktarılmış dosyanın biçimi"
+msgstr "açık dosyaların oranı"
#: po/advisory_rules.php:186
-#, fuzzy
#| msgid "The number of pending log file fsyncs."
msgid "The rate of opening files is high."
-msgstr "Bekleyen günlük dosyası fsyncs sayısıdır."
+msgstr "Açılan dosyaların oranı yüksek."
#: po/advisory_rules.php:188
#, php-format
@@ -12215,16 +12191,14 @@ msgid "Opened files rate: %s, this value should be less than 5 per hour"
msgstr ""
#: po/advisory_rules.php:190
-#, fuzzy
#| msgid "Create table on database %s"
msgid "Immediate table locks %"
-msgstr "%s veritabanında yeni tablo oluştur"
+msgstr "Acil tablo kilitleri %"
#: po/advisory_rules.php:191 po/advisory_rules.php:196
-#, fuzzy
#| msgid "The number of times that a table lock was acquired immediately."
msgid "Too many table locks were not granted immediately."
-msgstr "Tablo kilidinin hemen tanındığı süre sayısıdır."
+msgstr "Çok fazla tablo kilidi acilen onaylanmadı."
#: po/advisory_rules.php:192 po/advisory_rules.php:197
msgid "Optimize queries and/or use InnoDB to reduce lock wait."
@@ -12245,10 +12219,9 @@ msgid "Table lock wait rate: %s, this value should be less than 1 per hour"
msgstr ""
#: po/advisory_rules.php:200
-#, fuzzy
#| msgid "Key cache"
msgid "thread cache"
-msgstr "Anahtar önbelleği"
+msgstr "işlem önbelleği"
#: po/advisory_rules.php:201
msgid ""
@@ -12269,10 +12242,9 @@ msgid "thread cache hit rate %"
msgstr ""
#: po/advisory_rules.php:206
-#, fuzzy
#| msgid "Tracking is not active."
msgid "Thread cache is not efficient."
-msgstr "İzleme aktif değil."
+msgstr "İşlem önbelleği etkin değil."
#: po/advisory_rules.php:207
msgid "Increase {thread_cache_size}."
@@ -12288,10 +12260,9 @@ msgid "Threads that are slow to launch"
msgstr ""
#: po/advisory_rules.php:211
-#, fuzzy
#| msgid "The number of threads that are not sleeping."
msgid "There are too many threads that are slow to launch."
-msgstr "Hala faaliyette olan işlemler sayısıdır."
+msgstr "Çalıştırmak için yavaş olan çok fazla işlem var."
#: po/advisory_rules.php:212
msgid ""
@@ -12319,16 +12290,16 @@ msgid ""
msgstr ""
#: po/advisory_rules.php:218
-#, fuzzy, php-format
+#, php-format
#| msgid "long_query_time is set to %d second(s)."
msgid "slow_launch_time is set to %s"
-msgstr "long_query_time %d saniyeye ayarlı."
+msgstr "slow_launch_time %d'e ayarlı"
#: po/advisory_rules.php:220
-#, fuzzy, php-format
+#, php-format
#| msgid "Connections"
msgid "% connections used"
-msgstr "Bağlantılar"
+msgstr "% bağlantı kullanıldı"
#: po/advisory_rules.php:221
msgid ""
@@ -12350,10 +12321,9 @@ msgid ""
msgstr ""
#: po/advisory_rules.php:225
-#, fuzzy
#| msgid "Compress connection"
msgid "% aborted connections"
-msgstr "Bağlantıyı sıkıştır"
+msgstr "% durdurulan bağlantılar"
#: po/advisory_rules.php:226
msgid "Too many connections are aborted."
@@ -12373,14 +12343,13 @@ msgid "%s%% of all connections are aborted. This value should be below 1%%"
msgstr ""
#: po/advisory_rules.php:230
-#, fuzzy
#| msgid "Persistent connections"
msgid "rate of aborted connections"
-msgstr "Sürekli bağlantılar"
+msgstr "durdurulan bağlantıların oranı"
#: po/advisory_rules.php:231
msgid "Too many connections are aborted"
-msgstr ""
+msgstr "Çok fazla bağlantı durduruldu"
#: po/advisory_rules.php:233
#, php-format
@@ -12409,10 +12378,9 @@ msgid "%s%% of all clients are aborted. This value should be below 2%%"
msgstr ""
#: po/advisory_rules.php:240
-#, fuzzy
#| msgid "Format of imported file"
msgid "rate of aborted clients"
-msgstr "İçe aktarılmış dosyanın biçimi"
+msgstr "durdurulan istemcilerin oranı"
#: po/advisory_rules.php:243
#, php-format
@@ -12424,10 +12392,9 @@ msgid "Is InnoDB disabled?"
msgstr ""
#: po/advisory_rules.php:246
-#, fuzzy
#| msgid "Could not save recent table"
msgid "You do not have InnoDB enabled."
-msgstr "Son tablo kaydedilemedi"
+msgstr "Etkinleştirilmiş InnoDB'ye sahip değilsiniz."
#: po/advisory_rules.php:247
msgid "InnoDB is usually the better choice for table engines."
@@ -12442,12 +12409,13 @@ msgid "% InnoDB log size"
msgstr ""
#: po/advisory_rules.php:251
-#, fuzzy
#| msgid "The number writes done to the InnoDB buffer pool."
msgid ""
"The InnoDB log file size is not an appropriate size, in relation to the "
"InnoDB buffer pool."
-msgstr "InnoDB arabellek havuzuna bitti yazma sayısıdır."
+msgstr ""
+"InnoDB arabellek havuzu ile ilgili olarak InnoDB günlük dosyası boyutu uygun "
+"bir boyut değil."
#: po/advisory_rules.php:252
#, php-format
@@ -12498,10 +12466,9 @@ msgid "Your absolute InnoD log size is %s MiB"
msgstr ""
#: po/advisory_rules.php:260
-#, fuzzy
#| msgid "Buffer pool size"
msgid "InnoDB buffer pool size"
-msgstr "Arabellek havuzu boyutu"
+msgstr "InnoDB arabellek havuzu boyutu"
#: po/advisory_rules.php:261
msgid "Your InnoDB buffer pool is fairly small."
@@ -12531,10 +12498,9 @@ msgid ""
msgstr ""
#: po/advisory_rules.php:265
-#, fuzzy
#| msgid "max. concurrent connections"
msgid "MyISAM concurrent inserts"
-msgstr "En fazla eşzamanlı bağlantı"
+msgstr "MyISAM eşzamanlı eklemeler"
#: po/advisory_rules.php:266
msgid "Enable concurrent_insert by setting it to 1"
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14450-g45aac8d
by Dieter Adriaenssens 11 Aug '11
by Dieter Adriaenssens 11 Aug '11
11 Aug '11
The branch, master has been updated
via 45aac8dbf4e87b12ba3c2809c49ce250161afabf (commit)
from b48b13d20fb89b511348bef723bac05755d12fee (commit)
- Log -----------------------------------------------------------------
commit 45aac8dbf4e87b12ba3c2809c49ce250161afabf
Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net>
Date: Thu Aug 11 21:37:36 2011 +0200
coding style
-----------------------------------------------------------------------
Summary of changes:
import.php | 2 +-
libraries/advisor.class.php | 70 ++++++++++++++++++++++++----------------
libraries/engines/pbxt.lib.php | 2 +-
libraries/export/xml.php | 26 ++++++++-------
libraries/import.lib.php | 7 +---
libraries/import/xml.php | 3 +-
libraries/sqlparser.lib.php | 2 +-
libraries/sqlvalidator.lib.php | 2 +-
sql.php | 8 ++---
9 files changed, 66 insertions(+), 56 deletions(-)
diff --git a/import.php b/import.php
index b9b7d15..56732ae 100644
--- a/import.php
+++ b/import.php
@@ -237,7 +237,7 @@ if (!empty($local_import_file) && !empty($cfg['UploadDir'])) {
$local_import_file = PMA_securePath($local_import_file);
$import_file = PMA_userDir($cfg['UploadDir']) . $local_import_file;
-} elseif (empty($import_file) || !is_uploaded_file($import_file)) {
+} elseif (empty($import_file) || !is_uploaded_file($import_file)) {
$import_file = 'none';
}
diff --git a/libraries/advisor.class.php b/libraries/advisor.class.php
index 11e0119..75c8a8d 100644
--- a/libraries/advisor.class.php
+++ b/libraries/advisor.class.php
@@ -43,11 +43,11 @@ class Advisor
'errors' => array()
);
- foreach($this->parseResult['rules'] as $rule) {
+ foreach ($this->parseResult['rules'] as $rule) {
$this->variables['value'] = 0;
$precond = true;
- if(isset($rule['precondition'])) {
+ if (isset($rule['precondition'])) {
try {
$precond = $this->ruleExprEvaluate($rule['precondition']);
} catch (Exception $e) {
@@ -56,9 +56,9 @@ class Advisor
}
}
- if(! $precond)
+ if (! $precond) {
$this->addRule('unchecked', $rule);
- else {
+ } else {
try {
$value = $this->ruleExprEvaluate($rule['formula']);
} catch(Exception $e) {
@@ -87,7 +87,7 @@ class Advisor
function splitJustification($rule)
{
$jst = preg_split('/\s*\|\s*/', $rule['justification'], 2);
- if(count($jst) > 1) {
+ if (count($jst) > 1) {
$jst[0] = preg_replace('/%( |,|\.|$)/','%%\1',$jst[0]);
return array($jst[0], $jst[1]);
}
@@ -95,12 +95,13 @@ class Advisor
}
// Adds a rule to the result list
- function addRule($type, $rule) {
+ function addRule($type, $rule)
+ {
switch($type) {
case 'notfired':
case 'fired':
$jst = Advisor::splitJustification($rule);
- if(count($jst) > 1) {
+ if (count($jst) > 1) {
try {
/* Translate */
$jst[0] = _gettext($jst[0]);
@@ -133,14 +134,15 @@ class Advisor
// Runs a code expression, replacing variable names with their respective values
// ignoreUntil: if > 0, it doesn't replace any variables until that string position, but still evaluates the whole expr
- function ruleExprEvaluate($expr, $ignoreUntil = 0) {
- if($ignoreUntil > 0) {
+ function ruleExprEvaluate($expr, $ignoreUntil = 0)
+ {
+ if ($ignoreUntil > 0) {
$exprIgnore = substr($expr,0,$ignoreUntil);
$expr = substr($expr,$ignoreUntil);
}
$expr = preg_replace('/fired\s*\(\s*(\'|")(.*)\1\s*\)/Uie','1',$expr); //isset($this->runResult[\'fired\']
$expr = preg_replace('/\b(\w+)\b/e','isset($this->variables[\'\1\']) ? (!is_numeric($this->variables[\'\1\']) ? \'"\'.$this->variables[\'\1\'].\'"\' : $this->variables[\'\1\']) : \'\1\'', $expr);
- if($ignoreUntil > 0){
+ if ($ignoreUntil > 0) {
$expr = $exprIgnore . $expr;
}
$value = 0;
@@ -149,12 +151,15 @@ class Advisor
eval('$value = '.$expr.';');
$err = ob_get_contents();
ob_end_clean();
- if($err) throw new Exception(strip_tags($err) . '<br />Executed code: $value = '.$expr.';');
+ if ($err) {
+ throw new Exception(strip_tags($err) . '<br />Executed code: $value = '.$expr.';');
+ }
return $value;
}
// Reads the rule file into an array, throwing errors messages on syntax errors
- function parseRulesFile() {
+ function parseRulesFile()
+ {
$file = file('libraries/advisory_rules.txt');
$errors = array();
$rules = array();
@@ -166,15 +171,17 @@ class Advisor
for ($i = 0; $i<$numLines; $i++) {
$line = $file[$i];
- if($line[0] == '#' || $line[0] == "\n") continue;
+ if ($line[0] == '#' || $line[0] == "\n") {
+ continue;
+ }
// Reading new rule
- if(substr($line, 0, 4) == 'rule') {
- if($ruleLine > 0) {
+ if (substr($line, 0, 4) == 'rule') {
+ if ($ruleLine > 0) {
$errors[] = 'Invalid rule declaration on line '.($i+1). ', expected line '.$ruleSyntax[$ruleLine++].' of previous rule' ;
continue;
}
- if(preg_match("/rule\s'(.*)'( \[(.*)\])?$/",$line,$match)) {
+ if (preg_match("/rule\s'(.*)'( \[(.*)\])?$/",$line,$match)) {
$ruleLine = 1;
$j++;
$rules[$j] = array( 'name' => $match[1]);
@@ -184,19 +191,27 @@ class Advisor
}
continue;
} else {
- if($ruleLine == -1) $errors[] = 'Unexpected characters on line '.($i+1);
+ if ($ruleLine == -1) {
+ $errors[] = 'Unexpected characters on line '.($i+1);
+ }
}
// Reading rule lines
- if($ruleLine > 0) {
- if(!isset($line[0])) continue; // Empty lines are ok
+ if ($ruleLine > 0) {
+ if (!isset($line[0])) {
+ continue; // Empty lines are ok
+ }
// Non tabbed lines are not
- if($line[0] != "\t") { $errors[] = 'Unexpected character on line '.($i+1).'. Expected tab, but found \''.$line[0].'\''; continue; }
+ if ($line[0] != "\t") {
+ $errors[] = 'Unexpected character on line '.($i+1).'
+ . Expected tab, but found \''.$line[0].'\'';
+ continue;
+ }
$rules[$j][$ruleSyntax[$ruleLine++]] = chop(substr($line,1));
}
// Rule complete
- if($ruleLine == $numRules) {
+ if ($ruleLine == $numRules) {
$ruleLine = -1;
}
}
@@ -210,23 +225,22 @@ function PMA_bytime($num, $precision)
$per = '';
if ($num >= 1) { # per second
$per = "per second";
- }
- elseif ($num*60 >= 1) { # per minute
+ } elseif ($num*60 >= 1) { # per minute
$num = $num*60;
$per = "per minute";
- }
- elseif ($num*60*60 >=1 ) { # per hour
+ } elseif ($num*60*60 >=1 ) { # per hour
$num = $num*60*60;
$per = "per hour";
- }
- else {
+ } else {
$num = $num*60*60*24;
$per = "per day";
}
$num = round($num, $precision);
- if($num == 0) $num = '<'.pow(10,-$precision);
+ if ($num == 0) {
+ $num = '<'.pow(10,-$precision);
+ }
return "$num $per";
}
diff --git a/libraries/engines/pbxt.lib.php b/libraries/engines/pbxt.lib.php
index 0ebd2ca..dc3c47d 100644
--- a/libraries/engines/pbxt.lib.php
+++ b/libraries/engines/pbxt.lib.php
@@ -91,7 +91,7 @@ class PMA_StorageEngine_pbxt extends PMA_StorageEngine
*/
function resolveTypeSize($formatted_size)
{
- if (preg_match('/^[0-9]+[a-zA-Z]+$/', $formatted_size)){
+ if (preg_match('/^[0-9]+[a-zA-Z]+$/', $formatted_size)) {
$value = PMA_extractValueFromFormattedSize($formatted_size);
} else {
$value = $formatted_size;
diff --git a/libraries/export/xml.php b/libraries/export/xml.php
index 3e4bda2..a1f7d8f 100644
--- a/libraries/export/xml.php
+++ b/libraries/export/xml.php
@@ -85,7 +85,8 @@ if (isset($plugin_list)) {
*
* @access public
*/
- function PMA_exportFooter() {
+ function PMA_exportFooter()
+ {
$foot = '</pma_xml_export>';
return PMA_exportOutputHandler($foot);
@@ -98,7 +99,8 @@ if (isset($plugin_list)) {
*
* @access public
*/
- function PMA_exportHeader() {
+ function PMA_exportHeader()
+ {
global $crlf;
global $cfg;
global $db;
@@ -268,7 +270,8 @@ if (isset($plugin_list)) {
*
* @access public
*/
- function PMA_exportDBHeader($db) {
+ function PMA_exportDBHeader($db)
+ {
global $crlf;
if (isset($GLOBALS['xml_export_contents']) && $GLOBALS['xml_export_contents']) {
@@ -278,9 +281,7 @@ if (isset($plugin_list)) {
. ' <database name="' . htmlspecialchars($db) . '">' . $crlf;
return PMA_exportOutputHandler($head);
- }
- else
- {
+ } else {
return true;
}
}
@@ -293,14 +294,13 @@ if (isset($plugin_list)) {
*
* @access public
*/
- function PMA_exportDBFooter($db) {
+ function PMA_exportDBFooter($db)
+ {
global $crlf;
if (isset($GLOBALS['xml_export_contents']) && $GLOBALS['xml_export_contents']) {
return PMA_exportOutputHandler(' </database>' . $crlf);
- }
- else
- {
+ } else {
return true;
}
}
@@ -313,7 +313,8 @@ if (isset($plugin_list)) {
*
* @access public
*/
- function PMA_exportDBCreate($db) {
+ function PMA_exportDBCreate($db)
+ {
return true;
}
@@ -329,7 +330,8 @@ if (isset($plugin_list)) {
*
* @access public
*/
- function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
+ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
+ {
if (isset($GLOBALS['xml_export_contents']) && $GLOBALS['xml_export_contents']) {
$result = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
diff --git a/libraries/import.lib.php b/libraries/import.lib.php
index f457789..eda224f 100644
--- a/libraries/import.lib.php
+++ b/libraries/import.lib.php
@@ -811,9 +811,7 @@ function PMA_analyzeTable(&$table)
}
return array($types, $sizes);
- }
- else
- {
+ } else {
/**
* TODO: Handle this better
*/
@@ -1089,8 +1087,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, &$additional_sql =
unset($params);
$num_tables = count($tables);
- for ($i = 0; $i < $num_tables; ++$i)
- {
+ for ($i = 0; $i < $num_tables; ++$i) {
$params = array('db' => (string)$db_name, 'table' => (string)$tables[$i][TBL_NAME]);
$tbl_url = 'sql.php' . PMA_generate_common_url($params);
$tbl_struct_url = 'tbl_structure.php' . PMA_generate_common_url($params);
diff --git a/libraries/import/xml.php b/libraries/import/xml.php
index b51e6d8..ea0bddb 100644
--- a/libraries/import/xml.php
+++ b/libraries/import/xml.php
@@ -200,8 +200,7 @@ if (@count($xml->children())) {
foreach ($v1 as $k2 => $v2) {
$row_attr = $v2->attributes();
- if (! array_search((string)$row_attr['name'], $tempRow))
- {
+ if (! array_search((string)$row_attr['name'], $tempRow)) {
$tempRow[] = (string)$row_attr['name'];
}
$tempCells[] = (string)$v2;
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index bde23e3..703d08a 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -1388,7 +1388,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
// however, if we are on AS, we must keep the $previous_was_identifier
if (($arr[$i]['type'] == 'alpha_reservedWord')
- && ($upper_data == 'AS')) {
+ && ($upper_data == 'AS')) {
$previous_was_identifier = true;
}
diff --git a/libraries/sqlvalidator.lib.php b/libraries/sqlvalidator.lib.php
index dd3b8ad..68934dd 100644
--- a/libraries/sqlvalidator.lib.php
+++ b/libraries/sqlvalidator.lib.php
@@ -38,7 +38,7 @@ if (! defined('PHPMYADMIN')) {
* I'm not sure if PEAR was available before this point
* For now we actually use a configuration flag
*/
-if ($cfg['SQLValidator']['use'] == true) {
+if ($cfg['SQLValidator']['use'] == true) {
require_once './libraries/sqlvalidator.class.php';
} // if ($cfg['SQLValidator']['use'] == true)
diff --git a/sql.php b/sql.php
index fef6eb1..1070bda 100644
--- a/sql.php
+++ b/sql.php
@@ -22,7 +22,7 @@ if (isset($_SESSION['profiling'])) {
/* Files required for chart exporting */
$GLOBALS['js_include'][] = 'highcharts/exporting.js';
/* < IE 9 doesn't support canvas natively */
- if(PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER < 9) {
+ if (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER < 9) {
$GLOBALS['js_include'][] = 'canvg/flashcanvas.js';
}
$GLOBALS['js_include'][] = 'canvg/canvg.js';
@@ -96,8 +96,7 @@ if (isset($_REQUEST['get_relational_values']) && $_REQUEST['get_relational_value
$dropdown = '<span class="curr_value">' . htmlspecialchars($_REQUEST['curr_value']) . '</span> <a href="browse_foreigners.php' . PMA_generate_common_url($_url_params) . '"'
. ' target="_blank" class="browse_foreign" '
.'>' . __('Browse foreign values') . '</a>';
- }
- else {
+ } else {
$dropdown = PMA_foreignDropdown($foreignData['disp_row'], $foreignData['foreign_field'], $foreignData['foreign_display'], $curr_value, $cfg['ForeignKeyMaxLimit']);
$dropdown = '<select>' . $dropdown . '</select>';
}
@@ -788,8 +787,7 @@ else {
require './libraries/server_common.inc.php';
require './libraries/server_links.inc.php';
}
- }
- else {
+ } else {
require_once './libraries/header.inc.php';
//we don't need to buffer the output in PMA_showMessage here.
//set a global variable and check against it in the function
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14449-gb48b13d
by Dieter Adriaenssens 11 Aug '11
by Dieter Adriaenssens 11 Aug '11
11 Aug '11
The branch, master has been updated
via b48b13d20fb89b511348bef723bac05755d12fee (commit)
via 435c147aebd07c3b3556fd646af121e1e63cd88b (commit)
via f7d3a72af0634f9ff20e25fc682a22b6402cfc1c (commit)
from d585bba92e7daf234b71f022a2382b4f72a3ae7b (commit)
- Log -----------------------------------------------------------------
commit b48b13d20fb89b511348bef723bac05755d12fee
Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net>
Date: Thu Aug 11 20:57:34 2011 +0200
remove library/PHPExcel from build.xml
commit 435c147aebd07c3b3556fd646af121e1e63cd88b
Merge: d585bba f7d3a72
Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net>
Date: Thu Aug 11 20:53:21 2011 +0200
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
Summary of changes:
Documentation.html | 8 +++-----
build.xml | 8 +++-----
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/Documentation.html b/Documentation.html
index a49ddc2..5195df9 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -2079,11 +2079,9 @@ $cfg['TrustedProxies'] =
The name of the directory where temporary files can be stored.
<br /><br />
- This is needed for native MS Excel export, see
- <a href="#faq6_23"><abbr title="Frequently Asked Questions">FAQ</abbr>
- 6.23</a> and to work around limitations of
- <tt>open_basedir</tt> for uploaded
- files, see <a href="#faq1_11"><abbr title="Frequently Asked Questions">FAQ</abbr>
+ This is needed to work around limitations of <tt>open_basedir</tt>
+ for uploaded files, see
+ <a href="#faq1_11"><abbr title="Frequently Asked Questions">FAQ</abbr>
1.11</a>.
<br /><br />
diff --git a/build.xml b/build.xml
index 9beb3aa..5365747 100644
--- a/build.xml
+++ b/build.xml
@@ -38,7 +38,7 @@
<arg line="${source_comma_sep}
xml
codesize,design,naming,unusedcode
- --exclude test,build,PHPExcel,tcpdf,php-gettext
+ --exclude test,build,tcpdf,php-gettext
--reportfile ${basedir}/build/logs/pmd.xml" />
</exec>
</target>
@@ -48,7 +48,6 @@
<arg line="--log-pmd ${basedir}/build/logs/pmd-cpd.xml
--exclude test
--exclude build
- --exclude libraries/PHPExcel
--exclude libraries/tcpdf
--exclude libraries/php-gettext
${source}" />
@@ -60,17 +59,16 @@
<arg line="--log-csv ${basedir}/build/logs/phploc.csv
--exclude test
--exclude build
- --exclude libraries/PHPExcel
--exclude libraries/tcpdf
--exclude libraries/php-gettext
${source}" />
</exec>
</target>
- <target name="phpcs" description="Generate checkstyle.xml using PHP_CodeSniffer excluding test, PHPExcel, tcpdf directories">
+ <target name="phpcs" description="Generate checkstyle.xml using PHP_CodeSniffer excluding test, tcpdf directories">
<exec executable="phpcs">
<arg line="
- --ignore=*/PHPExcel/*,*/php-gettext/*,*/tcpdf/*,*/canvg/*,*/codemirror/*,*/highcharts/*,*/openlayers/*,*/jquery/*,*/build/*
+ --ignore=*/php-gettext/*,*/tcpdf/*,*/canvg/*,*/codemirror/*,*/highcharts/*,*/openlayers/*,*/jquery/*,*/build/*
--report=checkstyle
--report-file=${basedir}/build/logs/checkstyle.xml
--standard=PEAR
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_1-71-gf7d3a72
by Dieter Adriaenssens 11 Aug '11
by Dieter Adriaenssens 11 Aug '11
11 Aug '11
The branch, QA_3_4 has been updated
via f7d3a72af0634f9ff20e25fc682a22b6402cfc1c (commit)
from 440f1bd4ba1909a12aebb28a1e14f76c7a1f318e (commit)
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
Documentation.html | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/Documentation.html b/Documentation.html
index 061c771..1e11f8d 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -2002,11 +2002,9 @@ $cfg['TrustedProxies'] =
The name of the directory where temporary files can be stored.
<br /><br />
- This is needed for native MS Excel export, see
- <a href="#faq6_23"><abbr title="Frequently Asked Questions">FAQ</abbr>
- 6.23</a> and to work around limitations of
- <tt>open_basedir</tt> for uploaded
- files, see <a href="#faq1_11"><abbr title="Frequently Asked Questions">FAQ</abbr>
+ This is needed to work around limitations of <tt>open_basedir</tt>
+ for uploaded files, see
+ <a href="#faq1_11"><abbr title="Frequently Asked Questions">FAQ</abbr>
1.11</a>.
<br /><br />
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14446-gd585bba
by Marc Delisle 11 Aug '11
by Marc Delisle 11 Aug '11
11 Aug '11
The branch, master has been updated
via d585bba92e7daf234b71f022a2382b4f72a3ae7b (commit)
from 2074bd87b1ddfab89fe5c522825e1f5a338598a2 (commit)
- Log -----------------------------------------------------------------
commit d585bba92e7daf234b71f022a2382b4f72a3ae7b
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Aug 11 09:17:09 2011 -0400
Refresh .po files
-----------------------------------------------------------------------
Summary of changes:
po/af.po | 40 +++++++++++++-------------
po/ar.po | 52 +++++++++++++++++-----------------
po/az.po | 40 +++++++++++++-------------
po/be.po | 48 ++++++++++++++++----------------
po/be(a)latin.po | 60 ++++++++++++++++++++--------------------
po/bg.po | 48 ++++++++++++++++----------------
po/bn.po | 52 +++++++++++++++++-----------------
po/br.po | 52 +++++++++++++++++-----------------
po/bs.po | 40 +++++++++++++-------------
po/ca.po | 60 ++++++++++++++++++++--------------------
po/cs.po | 60 ++++++++++++++++++++--------------------
po/cy.po | 44 +++++++++++++++---------------
po/da.po | 64 +++++++++++++++++++++---------------------
po/de.po | 56 +++++++++++++++++++-------------------
po/el.po | 68 +++++++++++++++++++++++-----------------------
po/en_GB.po | 64 +++++++++++++++++++++---------------------
po/es.po | 53 +++++++++++++++++------------------
po/et.po | 40 +++++++++++++-------------
po/eu.po | 40 +++++++++++++-------------
po/fa.po | 56 +++++++++++++++++++-------------------
po/fi.po | 54 ++++++++++++++++++------------------
po/fr.po | 67 ++++++++++++++++++++++-----------------------
po/gl.po | 58 +++++++++++++++++++-------------------
po/he.po | 40 +++++++++++++-------------
po/hi.po | 48 ++++++++++++++++----------------
po/hr.po | 52 +++++++++++++++++-----------------
po/hu.po | 70 +++++++++++++++++++++++-----------------------
po/id.po | 48 ++++++++++++++++----------------
po/it.po | 56 +++++++++++++++++++-------------------
po/ja.po | 53 +++++++++++++++++------------------
po/ka.po | 66 ++++++++++++++++++++++----------------------
po/ko.po | 48 ++++++++++++++++----------------
po/lt.po | 58 +++++++++++++++++++-------------------
po/lv.po | 44 +++++++++++++++---------------
po/mk.po | 40 +++++++++++++-------------
po/ml.po | 40 +++++++++++++-------------
po/mn.po | 52 +++++++++++++++++-----------------
po/ms.po | 40 +++++++++++++-------------
po/nb.po | 54 ++++++++++++++++++------------------
po/nl.po | 52 +++++++++++++++++-----------------
po/phpmyadmin.pot | 39 +++++++++++++-------------
po/pl.po | 66 ++++++++++++++++++++++----------------------
po/pt.po | 48 ++++++++++++++++----------------
po/pt_BR.po | 44 +++++++++++++++---------------
po/ro.po | 48 ++++++++++++++++----------------
po/ru.po | 48 ++++++++++++++++----------------
po/si.po | 52 +++++++++++++++++-----------------
po/sk.po | 56 +++++++++++++++++++-------------------
po/sl.po | 40 +++++++++++++-------------
po/sq.po | 44 +++++++++++++++---------------
po/sr.po | 48 ++++++++++++++++----------------
po/sr(a)latin.po | 48 ++++++++++++++++----------------
po/sv.po | 56 +++++++++++++++++++-------------------
po/ta.po | 40 +++++++++++++-------------
po/te.po | 40 +++++++++++++-------------
po/th.po | 44 +++++++++++++++---------------
po/tr.po | 58 +++++++++++++++++++-------------------
po/tt.po | 44 +++++++++++++++---------------
po/ug.po | 52 +++++++++++++++++-----------------
po/uk.po | 52 +++++++++++++++++-----------------
po/ur.po | 48 ++++++++++++++++----------------
po/uz.po | 70 +++++++++++++++++++++++-----------------------
po/uz(a)latin.po | 78 ++++++++++++++++++++++++++--------------------------
po/zh_CN.po | 48 ++++++++++++++++----------------
po/zh_TW.po | 44 +++++++++++++++---------------
65 files changed, 1664 insertions(+), 1668 deletions(-)
diff --git a/po/af.po b/po/af.po
index ce4fe95..6c61d25 100644
--- a/po/af.po
+++ b/po/af.po
@@ -3,14 +3,14 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-08-11 15:11+0200\n"
+"POT-Creation-Date: 2011-08-11 09:15-0400\n"
"PO-Revision-Date: 2010-03-30 23:04+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: afrikaans <af(a)li.org>\n"
-"Language: af\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: af\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.1\n"
@@ -638,8 +638,8 @@ msgstr ""
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation"
-"%s."
+"This view has at least this number of rows. Please refer to %sdocumentation%"
+"s."
msgstr ""
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -882,8 +882,8 @@ msgstr ""
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation"
-"%s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
msgstr ""
#: import.php:277 import.php:330 libraries/File.class.php:456
@@ -2343,8 +2343,8 @@ msgstr "Welkom by %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the "
-"%1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the %"
+"1$ssetup script%2$s to create one."
msgstr ""
#: libraries/auth/config.auth.lib.php:109
@@ -5312,8 +5312,8 @@ msgstr ""
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: "
-"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -6023,8 +6023,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the "
-"%sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the %"
+"sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -8814,8 +8814,8 @@ msgstr ""
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should "
-"%sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should %"
+"sreload the privileges%s before you continue."
msgstr ""
#: server_privileges.php:1851
@@ -11537,8 +11537,8 @@ msgstr ""
#: po/advisory_rules.php:83
#, php-format
msgid ""
-"The current ratio of free query cache memory to total query cache size is %s"
-"%%. It should be above 80%%"
+"The current ratio of free query cache memory to total query cache size is %s%"
+"%. It should be above 80%%"
msgstr ""
#: po/advisory_rules.php:85
@@ -11657,8 +11657,8 @@ msgstr ""
#: po/advisory_rules.php:108
#, php-format
msgid ""
-"%s%% of all sorts cause temporary tables, this value should be lower than "
-"10%%."
+"%s%% of all sorts cause temporary tables, this value should be lower than 10%"
+"%."
msgstr ""
#: po/advisory_rules.php:110
@@ -11815,7 +11815,7 @@ msgstr ""
msgid ""
"Increasing {max_heap_table_size} and {tmp_table_size} might help. However "
"some temporary tables are always being written to disk, independent of the "
-"value of these variables. To elminiate these you will have to rewrite your "
+"value of these variables. To eliminate these you will have to rewrite your "
"queries to avoid those conditions (Within a temporary table: Presence of a "
"BLOB or TEXT column or presence of a column bigger than 512 bytes) as "
"mentioned in the beginning of an <a href=\\\"http://www.facebook.com/note."
@@ -11837,7 +11837,7 @@ msgstr ""
msgid ""
"Increasing {max_heap_table_size} and {tmp_table_size} might help. However "
"some temporary tables are always being written to disk, independent of the "
-"value of these variables. To elminiate these you will have to rewrite your "
+"value of these variables. To eliminate these you will have to rewrite your "
"queries to avoid those conditions (Within a temprorary table: Presence of a "
"BLOB or TEXT column or presence of a column bigger than 512 bytes) as "
"mentioned in in the <a href=\\\"http://dev.mysql.com/doc/refman/5.0/en/"
diff --git a/po/ar.po b/po/ar.po
index 69815b6..b469e47 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -3,14 +3,14 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-08-11 15:11+0200\n"
+"POT-Creation-Date: 2011-08-11 09:15-0400\n"
"PO-Revision-Date: 2011-08-07 03:51+0200\n"
"Last-Translator: Abdullah Al-Saedi <abdullah.10(a)windowslive.com>\n"
"Language-Team: arabic <ar(a)li.org>\n"
-"Language: ar\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
"X-Generator: Pootle 2.0.5\n"
@@ -347,8 +347,8 @@ msgid ""
"The phpMyAdmin configuration storage has been deactivated. To find out why "
"click %shere%s."
msgstr ""
-"تم تعطيل المزايا الإضافية للعمل بالجداول المترابطة. لمعرفة السبب اضغط %sهنا"
-"%s."
+"تم تعطيل المزايا الإضافية للعمل بالجداول المترابطة. لمعرفة السبب اضغط %sهنا%"
+"s."
#: db_operations.php:584
msgid "Edit or export relational schema"
@@ -624,8 +624,8 @@ msgstr "التتبع غير نشط."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation"
-"%s."
+"This view has at least this number of rows. Please refer to %sdocumentation%"
+"s."
msgstr "هذا العرض له ما لا يقل عدد هذه الصفوف يرجى الرجوع إلى %s الوثيقة %s"
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -859,8 +859,8 @@ msgstr "تم حفظ الـDump إلى الملف %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation"
-"%s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
msgstr ""
"يبدو أنك تحاول رفع ملف كبير الحجم , فضلاً راجع المستند %sdocumentation%s لحل "
"المشكلة."
@@ -2259,8 +2259,8 @@ msgstr "أهلا بك في %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the "
-"%1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the %"
+"1$ssetup script%2$s to create one."
msgstr "يبدو انك لم تنشئ ملف الإعدادات.إستخدم %1$ssetup script%2$s لإنشائه."
#: libraries/auth/config.auth.lib.php:109
@@ -5199,8 +5199,8 @@ msgstr ""
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: "
-"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -5915,8 +5915,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the "
-"%sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the %"
+"sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -8059,8 +8059,8 @@ msgid ""
"The phpMyAdmin configuration storage is not completely configured, some "
"extended features have been deactivated. To find out why click %shere%s."
msgstr ""
-"تم تعطيل المزايا الإضافية للعمل بالجداول المترابطة. لمعرفة السبب اضغط %sهنا"
-"%s."
+"تم تعطيل المزايا الإضافية للعمل بالجداول المترابطة. لمعرفة السبب اضغط %sهنا%"
+"s."
#: main.php:314
msgid ""
@@ -8801,8 +8801,8 @@ msgstr "احذف قواعد البيانات التي لها نفس أسماء
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should "
-"%sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should %"
+"sreload the privileges%s before you continue."
msgstr ""
"ملاحظة: يقرأ phpMyAdmin صلاحيات المستخدمين من جداول الصلاحيات من خادم MySQL "
"مباشرة. محتويات هذه الجداول قد تختلف عن الصلاحيات التي يستخدمها الخادم إذا "
@@ -11536,8 +11536,8 @@ msgstr ""
#: po/advisory_rules.php:83
#, php-format
msgid ""
-"The current ratio of free query cache memory to total query cache size is %s"
-"%%. It should be above 80%%"
+"The current ratio of free query cache memory to total query cache size is %s%"
+"%. It should be above 80%%"
msgstr ""
#: po/advisory_rules.php:85
@@ -11660,8 +11660,8 @@ msgstr ""
#: po/advisory_rules.php:108
#, php-format
msgid ""
-"%s%% of all sorts cause temporary tables, this value should be lower than "
-"10%%."
+"%s%% of all sorts cause temporary tables, this value should be lower than 10%"
+"%."
msgstr ""
#: po/advisory_rules.php:110
@@ -11819,7 +11819,7 @@ msgstr ""
msgid ""
"Increasing {max_heap_table_size} and {tmp_table_size} might help. However "
"some temporary tables are always being written to disk, independent of the "
-"value of these variables. To elminiate these you will have to rewrite your "
+"value of these variables. To eliminate these you will have to rewrite your "
"queries to avoid those conditions (Within a temporary table: Presence of a "
"BLOB or TEXT column or presence of a column bigger than 512 bytes) as "
"mentioned in the beginning of an <a href=\\\"http://www.facebook.com/note."
@@ -11841,7 +11841,7 @@ msgstr ""
msgid ""
"Increasing {max_heap_table_size} and {tmp_table_size} might help. However "
"some temporary tables are always being written to disk, independent of the "
-"value of these variables. To elminiate these you will have to rewrite your "
+"value of these variables. To eliminate these you will have to rewrite your "
"queries to avoid those conditions (Within a temprorary table: Presence of a "
"BLOB or TEXT column or presence of a column bigger than 512 bytes) as "
"mentioned in in the <a href=\\\"http://dev.mysql.com/doc/refman/5.0/en/"
@@ -12440,8 +12440,8 @@ msgstr ""
#~ "The additional features for working with linked tables have been "
#~ "deactivated. To find out why click %shere%s."
#~ msgstr ""
-#~ "تم تعطيل المزايا الإضافية للعمل بالجداول المترابطة. لمعرفة السبب اضغط "
-#~ "%sهنا%s."
+#~ "تم تعطيل المزايا الإضافية للعمل بالجداول المترابطة. لمعرفة السبب اضغط %"
+#~ "sهنا%s."
#~ msgid "Execute bookmarked query"
#~ msgstr "نفذ استعلام محفوظ بعلامة مرجعية"
diff --git a/po/az.po b/po/az.po
index ab08f72..5e93833 100644
--- a/po/az.po
+++ b/po/az.po
@@ -3,14 +3,14 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-08-11 15:11+0200\n"
+"POT-Creation-Date: 2011-08-11 09:15-0400\n"
"PO-Revision-Date: 2010-03-12 09:11+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: azerbaijani <az(a)li.org>\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
"X-Generator: Translate Toolkit 1.5.3\n"
#: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:277
@@ -639,8 +639,8 @@ msgstr ""
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation"
-"%s."
+"This view has at least this number of rows. Please refer to %sdocumentation%"
+"s."
msgstr ""
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -886,8 +886,8 @@ msgstr "Sxem %s faylına qeyd edildi."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation"
-"%s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
msgstr ""
#: import.php:277 import.php:330 libraries/File.class.php:456
@@ -2372,8 +2372,8 @@ msgstr "%s - e Xoş Gelmişsiniz!"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the "
-"%1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the %"
+"1$ssetup script%2$s to create one."
msgstr ""
#: libraries/auth/config.auth.lib.php:109
@@ -5380,8 +5380,8 @@ msgstr ""
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: "
-"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -6100,8 +6100,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the "
-"%sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the %"
+"sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -8998,8 +8998,8 @@ msgstr "İstifadeçilerle eyni adlı me'lumat bazalarını leğv et."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should "
-"%sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should %"
+"sreload the privileges%s before you continue."
msgstr ""
"Qeyd: phpMyAdmin istifadeçi selahiyyetlerini birbaşa MySQL-in selahiyyetler "
"cedvellerinden almaqdadır. Eger elle nizamlamalar edilmişse, bu cedvellerin "
@@ -11747,8 +11747,8 @@ msgstr ""
#: po/advisory_rules.php:83
#, php-format
msgid ""
-"The current ratio of free query cache memory to total query cache size is %s"
-"%%. It should be above 80%%"
+"The current ratio of free query cache memory to total query cache size is %s%"
+"%. It should be above 80%%"
msgstr ""
#: po/advisory_rules.php:85
@@ -11873,8 +11873,8 @@ msgstr ""
#: po/advisory_rules.php:108
#, php-format
msgid ""
-"%s%% of all sorts cause temporary tables, this value should be lower than "
-"10%%."
+"%s%% of all sorts cause temporary tables, this value should be lower than 10%"
+"%."
msgstr ""
#: po/advisory_rules.php:110
@@ -12031,7 +12031,7 @@ msgstr ""
msgid ""
"Increasing {max_heap_table_size} and {tmp_table_size} might help. However "
"some temporary tables are always being written to disk, independent of the "
-"value of these variables. To elminiate these you will have to rewrite your "
+"value of these variables. To eliminate these you will have to rewrite your "
"queries to avoid those conditions (Within a temporary table: Presence of a "
"BLOB or TEXT column or presence of a column bigger than 512 bytes) as "
"mentioned in the beginning of an <a href=\\\"http://www.facebook.com/note."
@@ -12053,7 +12053,7 @@ msgstr ""
msgid ""
"Increasing {max_heap_table_size} and {tmp_table_size} might help. However "
"some temporary tables are always being written to disk, independent of the "
-"value of these variables. To elminiate these you will have to rewrite your "
+"value of these variables. To eliminate these you will have to rewrite your "
"queries to avoid those conditions (Within a temprorary table: Presence of a "
"BLOB or TEXT column or presence of a column bigger than 512 bytes) as "
"mentioned in in the <a href=\\\"http://dev.mysql.com/doc/refman/5.0/en/"
diff --git a/po/be.po b/po/be.po
index 12bef42..9292dc0 100644
--- a/po/be.po
+++ b/po/be.po
@@ -3,14 +3,14 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-08-11 15:11+0200\n"
+"POT-Creation-Date: 2011-08-11 09:15-0400\n"
"PO-Revision-Date: 2010-03-12 09:12+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: belarusian_cyrillic <be(a)li.org>\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
"X-Generator: Translate Toolkit 1.5.3\n"
#: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:277
@@ -638,11 +638,11 @@ msgstr ""
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation"
-"%s."
+"This view has at least this number of rows. Please refer to %sdocumentation%"
+"s."
msgstr ""
-"Гэты прагляд мае толькі такую колькасьць радкоў. Калі ласка, зьвярніцеся да "
-"%sдакумэнтацыі%s."
+"Гэты прагляд мае толькі такую колькасьць радкоў. Калі ласка, зьвярніцеся да %"
+"sдакумэнтацыі%s."
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
#: libraries/tbl_info.inc.php:60 tbl_structure.php:210
@@ -892,8 +892,8 @@ msgstr "Дамп захаваны ў файл %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation"
-"%s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
msgstr ""
"Вы, мусіць, паспрабавалі загрузіць вельмі вялікі файл. Калі ласка, "
"зьвярніцеся да %sдакумэнтацыі%s для высьвятленьня спосабаў абыйсьці гэтае "
@@ -912,8 +912,8 @@ msgid ""
"You attempted to load file with unsupported compression (%s). Either support "
"for it is not implemented or disabled by your configuration."
msgstr ""
-"Вы паспрабавалі загрузіць файл з мэтадам сьціску, які непадтрымліваецца "
-"(%s). Ягоная падтрымка або не рэалізаваная, або адключаная ў вашай "
+"Вы паспрабавалі загрузіць файл з мэтадам сьціску, які непадтрымліваецца (%"
+"s). Ягоная падтрымка або не рэалізаваная, або адключаная ў вашай "
"канфігурацыі."
#: import.php:335
@@ -2423,8 +2423,8 @@ msgstr "Запрашаем у %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the "
-"%1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the %"
+"1$ssetup script%2$s to create one."
msgstr ""
"Імаверна, прычына гэтага ў тым, што ня створаны канфігурацыйны файл. Каб яго "
"стварыць, можна выкарыстаць %1$sналадачны скрыпт%2$s."
@@ -5494,8 +5494,8 @@ msgstr ""
#| "happen: %3$s. Other text will be kept as is."
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: "
-"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Гэтае значэньне інтэрпрэтуецца з выкарыстаньнем %1$sstrftime%2$s, таму можна "
"выкарыстоўваць радкі фарматаваньня часу. Апроч гэтага, будуць праведзеныя "
@@ -6286,8 +6286,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the "
-"%sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the %"
+"sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -9275,8 +9275,8 @@ msgstr "Выдаліць базы дадзеных, якія маюць такі
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should "
-"%sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should %"
+"sreload the privileges%s before you continue."
msgstr ""
"Заўвага: phpMyAdmin атрымлівае прывілеі карыстальнікаў наўпростава з табліц "
"прывілеяў MySQL. Зьмесьціва гэтых табліц можа адрозьнівацца ад прывілеяў, "
@@ -12183,8 +12183,8 @@ msgstr ""
#: po/advisory_rules.php:83
#, php-format
msgid ""
-"The current ratio of free query cache memory to total query cache size is %s"
-"%%. It should be above 80%%"
+"The current ratio of free query cache memory to total query cache size is %s%"
+"%. It should be above 80%%"
msgstr ""
#: po/advisory_rules.php:85
@@ -12312,8 +12312,8 @@ msgstr ""
#: po/advisory_rules.php:108
#, php-format
msgid ""
-"%s%% of all sorts cause temporary tables, this value should be lower than "
-"10%%."
+"%s%% of all sorts cause temporary tables, this value should be lower than 10%"
+"%."
msgstr ""
#: po/advisory_rules.php:110
@@ -12471,7 +12471,7 @@ msgstr ""
msgid ""
"Increasing {max_heap_table_size} and {tmp_table_size} might help. However "
"some temporary tables are always being written to disk, independent of the "
-"value of these variables. To elminiate these you will have to rewrite your "
+"value of these variables. To eliminate these you will have to rewrite your "
"queries to avoid those conditions (Within a temporary table: Presence of a "
"BLOB or TEXT column or presence of a column bigger than 512 bytes) as "
"mentioned in the beginning of an <a href=\\\"http://www.facebook.com/note."
@@ -12493,7 +12493,7 @@ msgstr ""
msgid ""
"Increasing {max_heap_table_size} and {tmp_table_size} might help. However "
"some temporary tables are always being written to disk, independent of the "
-"value of these variables. To elminiate these you will have to rewrite your "
+"value of these variables. To eliminate these you will have to rewrite your "
"queries to avoid those conditions (Within a temprorary table: Presence of a "
"BLOB or TEXT column or presence of a column bigger than 512 bytes) as "
"mentioned in in the <a href=\\\"http://dev.mysql.com/doc/refman/5.0/en/"
diff --git a/po/be(a)latin.po b/po/be(a)latin.po
index 268eb66..77b2e4a 100644
--- a/po/be(a)latin.po
+++ b/po/be(a)latin.po
@@ -3,16 +3,16 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-08-11 15:11+0200\n"
+"POT-Creation-Date: 2011-08-11 09:15-0400\n"
"PO-Revision-Date: 2010-03-30 23:09+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: belarusian_latin <be@latin@li.org>\n"
-"Language: be@latin\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Language: be@latin\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Generator: Pootle 2.0.1\n"
#: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:277
@@ -644,11 +644,11 @@ msgstr ""
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation"
-"%s."
+"This view has at least this number of rows. Please refer to %sdocumentation%"
+"s."
msgstr ""
-"Hety prahlad maje tolki takuju kolkaść radkoŭ. Kali łaska, źviarniciesia da "
-"%sdakumentacyi%s."
+"Hety prahlad maje tolki takuju kolkaść radkoŭ. Kali łaska, źviarniciesia da %"
+"sdakumentacyi%s."
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
#: libraries/tbl_info.inc.php:60 tbl_structure.php:210
@@ -889,8 +889,8 @@ msgstr "Damp zachavany ŭ fajł %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation"
-"%s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
msgstr ""
"Vy, musić, pasprabavali zahruzić vielmi vialiki fajł. Kali łaska, "
"źviarniciesia da %sdakumentacyi%s dla vyśviatleńnia sposabaŭ abyjści hetaje "
@@ -909,8 +909,8 @@ msgid ""
"You attempted to load file with unsupported compression (%s). Either support "
"for it is not implemented or disabled by your configuration."
msgstr ""
-"Vy pasprabavali zahruzić fajł z metadam ścisku, jaki niepadtrymlivajecca "
-"(%s). Jahonaja padtrymka abo nie realizavanaja, abo adklučanaja ŭ vašaj "
+"Vy pasprabavali zahruzić fajł z metadam ścisku, jaki niepadtrymlivajecca (%"
+"s). Jahonaja padtrymka abo nie realizavanaja, abo adklučanaja ŭ vašaj "
"kanfihuracyi."
#: import.php:335
@@ -2432,8 +2432,8 @@ msgstr "Zaprašajem u %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the "
-"%1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the %"
+"1$ssetup script%2$s to create one."
msgstr ""
"Imavierna, pryčyna hetaha ŭ tym, što nia stvorany kanfihuracyjny fajł. Kab "
"jaho stvaryć, možna vykarystać %1$snaładačny skrypt%2$s."
@@ -5472,8 +5472,8 @@ msgstr ""
#| "happen: %3$s. Other text will be kept as is."
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: "
-"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Hetaje značeńnie interpretujecca z vykarystańniem %1$sstrftime%2$s, tamu "
"možna vykarystoŭvać radki farmatavańnia času. Aproč hetaha, buduć "
@@ -6266,8 +6266,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the "
-"%sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the %"
+"sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -7995,8 +7995,8 @@ msgid ""
"installed the necessary PHP extensions as described in the %sdocumentation%s."
msgstr ""
"Niemahčyma prainicyjalizavać pravierku SQL. Kali łaska, praviercie, ci "
-"ŭstalavanyja ŭ vas nieabchodnyja pašyreńni PHP, jak heta apisana ŭ "
-"%sdakumentacyi%s."
+"ŭstalavanyja ŭ vas nieabchodnyja pašyreńni PHP, jak heta apisana ŭ %"
+"sdakumentacyi%s."
#: libraries/tbl_links.inc.php:118 libraries/tbl_links.inc.php:119
msgid "Table seems to be empty!"
@@ -8196,8 +8196,8 @@ msgstr ""
"dadadzienyja da mietki času (pa zmoŭčańni — 0). Druhi parametar "
"vykarystoŭvajcie, kab paznačyć inšy farmat daty/času. Treci parametar "
"vyznačaje typ daty, jakaja budzie pakazanaja: vašaja lakalnaja data albo "
-"data UTC (vykarystoŭvajcie dla hetaha parametry «local» i «utc» adpaviedna). "
-"U zaležnaści ad hetaha farmat daty maje roznyja značeńni: dla atrymańnia "
+"data UTC (vykarystoŭvajcie dla hetaha parametry «local» i «utc» adpaviedna). U "
+"zaležnaści ad hetaha farmat daty maje roznyja značeńni: dla atrymańnia "
"parametraŭ lakalnaj daty hladzicie dakumentacyju dla funkcyi PHP strftime(), "
"a dla hrynvickaha času (parametar «utc») — dakumentacyju funkcyi gmdate()."
@@ -9255,8 +9255,8 @@ msgstr ""
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should "
-"%sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should %"
+"sreload the privileges%s before you continue."
msgstr ""
"Zaŭvaha: phpMyAdmin atrymlivaje pryvilei karystalnikaŭ naŭprostava z tablic "
"pryvilejaŭ MySQL. Źmieściva hetych tablic moža adroźnivacca ad pryvilejaŭ, "
@@ -12154,8 +12154,8 @@ msgstr ""
#: po/advisory_rules.php:83
#, php-format
msgid ""
-"The current ratio of free query cache memory to total query cache size is %s"
-"%%. It should be above 80%%"
+"The current ratio of free query cache memory to total query cache size is %s%"
+"%. It should be above 80%%"
msgstr ""
#: po/advisory_rules.php:85
@@ -12284,8 +12284,8 @@ msgstr ""
#: po/advisory_rules.php:108
#, php-format
msgid ""
-"%s%% of all sorts cause temporary tables, this value should be lower than "
-"10%%."
+"%s%% of all sorts cause temporary tables, this value should be lower than 10%"
+"%."
msgstr ""
#: po/advisory_rules.php:110
@@ -12442,7 +12442,7 @@ msgstr ""
msgid ""
"Increasing {max_heap_table_size} and {tmp_table_size} might help. However "
"some temporary tables are always being written to disk, independent of the "
-"value of these variables. To elminiate these you will have to rewrite your "
+"value of these variables. To eliminate these you will have to rewrite your "
"queries to avoid those conditions (Within a temporary table: Presence of a "
"BLOB or TEXT column or presence of a column bigger than 512 bytes) as "
"mentioned in the beginning of an <a href=\\\"http://www.facebook.com/note."
@@ -12464,7 +12464,7 @@ msgstr ""
msgid ""
"Increasing {max_heap_table_size} and {tmp_table_size} might help. However "
"some temporary tables are always being written to disk, independent of the "
-"value of these variables. To elminiate these you will have to rewrite your "
+"value of these variables. To eliminate these you will have to rewrite your "
"queries to avoid those conditions (Within a temprorary table: Presence of a "
"BLOB or TEXT column or presence of a column bigger than 512 bytes) as "
"mentioned in in the <a href=\\\"http://dev.mysql.com/doc/refman/5.0/en/"
diff --git a/po/bg.po b/po/bg.po
index 0c39b39..6c3e9e3 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -3,14 +3,14 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-08-11 15:11+0200\n"
+"POT-Creation-Date: 2011-08-11 09:15-0400\n"
"PO-Revision-Date: 2011-07-19 14:58+0200\n"
"Last-Translator: <stoyanster(a)gmail.com>\n"
"Language-Team: bulgarian <bg(a)li.org>\n"
-"Language: bg\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: bg\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -613,8 +613,8 @@ msgstr "Проследяването е неактивно."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation"
-"%s."
+"This view has at least this number of rows. Please refer to %sdocumentation%"
+"s."
msgstr "Този изглед има поне толкова реда. Погледнете %sдокументацията%s"
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -851,8 +851,8 @@ msgstr "Схемата беше запазена във файл %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation"
-"%s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
msgstr ""
"Вероятно сте направили опит да качите твърде голям файл. Моля, обърнете се "
"към %sдокументацията%s за да намерите начин да избегнете това ограничение."
@@ -2269,8 +2269,8 @@ msgstr "Добре дошли в %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the "
-"%1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the %"
+"1$ssetup script%2$s to create one."
msgstr ""
"Изглежда не се създали конфигурационен файл. Вероятно ще искате да "
"използвате %1$sскрипта за настройки%2$s, за да го създадете."
@@ -5161,8 +5161,8 @@ msgstr ", @TABLE@ ще стане името на таблицата"
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: "
-"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -5839,8 +5839,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the "
-"%sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the %"
+"sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -7437,8 +7437,8 @@ msgid ""
"installed the necessary PHP extensions as described in the %sdocumentation%s."
msgstr ""
"SQL валидаторът не може да бъде инициализиран. Моля проверете дали са "
-"инсталирани необходимите PHP разширения, както е описано в %sдокументацията"
-"%s."
+"инсталирани необходимите PHP разширения, както е описано в %sдокументацията%"
+"s."
#: libraries/tbl_links.inc.php:118 libraries/tbl_links.inc.php:119
msgid "Table seems to be empty!"
@@ -8119,8 +8119,8 @@ msgid ""
"You can set more settings by modifying config.inc.php, eg. by using %sSetup "
"script%s."
msgstr ""
-"Имате достъп до още настройки, модифицирайки config.inc.php, примерно чрез "
-"%sскрипта за настройки%s."
+"Имате достъп до още настройки, модифицирайки config.inc.php, примерно чрез %"
+"sскрипта за настройки%s."
#: prefs_manage.php:300
msgid "Save to browser's storage"
@@ -8564,8 +8564,8 @@ msgstr "Изтриване на БД, които имат имена като т
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should "
-"%sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should %"
+"sreload the privileges%s before you continue."
msgstr ""
"Забележка: phpMyAdmin взема потребителските права директно от таблицата с "
"правата на MySQL. Съдържанието на тази таблица може да се различава от "
@@ -11263,8 +11263,8 @@ msgstr ""
#: po/advisory_rules.php:83
#, php-format
msgid ""
-"The current ratio of free query cache memory to total query cache size is %s"
-"%%. It should be above 80%%"
+"The current ratio of free query cache memory to total query cache size is %s%"
+"%. It should be above 80%%"
msgstr ""
#: po/advisory_rules.php:85
@@ -11393,8 +11393,8 @@ msgstr ""
#: po/advisory_rules.php:108
#, php-format
msgid ""
-"%s%% of all sorts cause temporary tables, this value should be lower than "
-"10%%."
+"%s%% of all sorts cause temporary tables, this value should be lower than 10%"
+"%."
msgstr ""
#: po/advisory_rules.php:110
@@ -11554,7 +11554,7 @@ msgstr ""
msgid ""
"Increasing {max_heap_table_size} and {tmp_table_size} might help. However "
"some temporary tables are always being written to disk, independent of the "
-"value of these variables. To elminiate these you will have to rewrite your "
+"value of these variables. To eliminate these you will have to rewrite your "
"queries to avoid those conditions (Within a temporary table: Presence of a "
"BLOB or TEXT column or presence of a column bigger than 512 bytes) as "
"mentioned in the beginning of an <a href=\\\"http://www.facebook.com/note."
@@ -11576,7 +11576,7 @@ msgstr ""
msgid ""
"Increasing {max_heap_table_size} and {tmp_table_size} might help. However "
"some temporary tables are always being written to disk, independent of the "
-"value of these variables. To elminiate these you will have to rewrite your "
+"value of these variables. To eliminate these you will have to rewrite your "
"queries to avoid those conditions (Within a temprorary table: Presence of a "
"BLOB or TEXT column or presence of a column bigger than 512 bytes) as "
"mentioned in in the <a href=\\\"http://dev.mysql.com/doc/refman/5.0/en/"
diff --git a/po/bn.po b/po/bn.po
index e1f78b6..b42ac84 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -3,14 +3,14 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-08-11 15:11+0200\n"
+"POT-Creation-Date: 2011-08-11 09:15-0400\n"
"PO-Revision-Date: 2010-10-21 01:36+0200\n"
"Last-Translator: Nobin নবীন <nobin(a)cyberbogra.com>\n"
"Language-Team: bangla <bn(a)li.org>\n"
-"Language: bn\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: bn\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -635,8 +635,8 @@ msgstr ""
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation"
-"%s."
+"This view has at least this number of rows. Please refer to %sdocumentation%"
+"s."
msgstr ""
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -884,11 +884,11 @@ msgstr "ডাম্প %s ফাইল এ সেভ করা হয়েছে
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation"
-"%s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
msgstr ""
-"You probably tried to upload too large file. Please refer to %sdocumentation"
-"%s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
#: import.php:277 import.php:330 libraries/File.class.php:456
#: libraries/File.class.php:539
@@ -2398,8 +2398,8 @@ msgstr "Welcome to %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the "
-"%1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the %"
+"1$ssetup script%2$s to create one."
msgstr ""
"সম্ভবত আপনি কনফিগারেশন ফাইল তৈরী করেননি। আপনি %1$ssetup script%2$s ব্যাবহার "
"করে একটি তৈরী করতে পারেন "
@@ -5451,12 +5451,12 @@ msgstr ""
#| "happen: %3$s. Other text will be kept as is."
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: "
-"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: "
-"%3$s. Other text will be kept as is."
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
#: libraries/display_export.lib.php:270
msgid "use this for future exports"
@@ -6205,8 +6205,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the "
-"%sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the %"
+"sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -9161,13 +9161,13 @@ msgstr "ব্যাবহারকারীর নামে নাম এমন
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should "
-"%sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should %"
+"sreload the privileges%s before you continue."
msgstr ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should "
-"%sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should %"
+"sreload the privileges%s before you continue."
#: server_privileges.php:1851
msgid "The selected user was not found in the privilege table."
@@ -12038,8 +12038,8 @@ msgstr ""
#: po/advisory_rules.php:83
#, php-format
msgid ""
-"The current ratio of free query cache memory to total query cache size is %s"
-"%%. It should be above 80%%"
+"The current ratio of free query cache memory to total query cache size is %s%"
+"%. It should be above 80%%"
msgstr ""
#: po/advisory_rules.php:85
@@ -12168,8 +12168,8 @@ msgstr ""
#: po/advisory_rules.php:108
#, php-format
msgid ""
-"%s%% of all sorts cause temporary tables, this value should be lower than "
-"10%%."
+"%s%% of all sorts cause temporary tables, this value should be lower than 10%"
+"%."
msgstr ""
#: po/advisory_rules.php:110
@@ -12327,7 +12327,7 @@ msgstr ""
msgid ""
"Increasing {max_heap_table_size} and {tmp_table_size} might help. However "
"some temporary tables are always being written to disk, independent of the "
-"value of these variables. To elminiate these you will have to rewrite your "
+"value of these variables. To eliminate these you will have to rewrite your "
"queries to avoid those conditions (Within a temporary table: Presence of a "
"BLOB or TEXT column or presence of a column bigger than 512 bytes) as "
"mentioned in the beginning of an <a href=\\\"http://www.facebook.com/note."
@@ -12349,7 +12349,7 @@ msgstr ""
msgid ""
"Increasing {max_heap_table_size} and {tmp_table_size} might help. However "
"some temporary tables are always being written to disk, independent of the "
-"value of these variables. To elminiate these you will have to rewrite your "
+"value of these variables. To eliminate these you will have to rewrite your "
"queries to avoid those conditions (Within a temprorary table: Presence of a "
"BLOB or TEXT column or presence of a column bigger than 512 bytes) as "
"mentioned in in the <a href=\\\"http://dev.mysql.com/doc/refman/5.0/en/"
diff --git a/po/br.po b/po/br.po
index 810e069..4d1ed4a 100644
--- a/po/br.po
+++ b/po/br.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-08-11 15:11+0200\n"
+"POT-Creation-Date: 2011-08-11 09:15-0400\n"
"PO-Revision-Date: 2011-08-10 22:33+0200\n"
"Last-Translator: Fulup <fulup.jakez(a)ofis-bzh.org>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
-"Language: br\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: br\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Pootle 2.0.5\n"
@@ -617,11 +617,11 @@ msgstr "N'eo ket oberiant an heuliañ."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation"
-"%s."
+"This view has at least this number of rows. Please refer to %sdocumentation%"
+"s."
msgstr ""
-"Da nebeutañ emañ an niver a linennoù-mañ er Gweled-mañ. Sellit ouzh an "
-"%steulioù titouriñ%s."
+"Da nebeutañ emañ an niver a linennoù-mañ er Gweled-mañ. Sellit ouzh an %"
+"steulioù titouriñ%s."
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
#: libraries/tbl_info.inc.php:60 tbl_structure.php:210
@@ -856,11 +856,11 @@ msgstr "Enrollet eo bet ar restr ezporzhiañ e%s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation"
-"%s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
msgstr ""
-"Evit doare hoc'h eus klasket enrollañ ur restr re vras. Sellit ouzh an "
-"%steulioù titouriñ%s evit gwelet penaos c'hoari an dro d'ar vevenn-se."
+"Evit doare hoc'h eus klasket enrollañ ur restr re vras. Sellit ouzh an %"
+"steulioù titouriñ%s evit gwelet penaos c'hoari an dro d'ar vevenn-se."
#: import.php:277 import.php:330 libraries/File.class.php:456
#: libraries/File.class.php:539
@@ -2257,11 +2257,11 @@ msgstr "Degemer mat e %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the "
-"%1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the %"
+"1$ssetup script%2$s to create one."
msgstr ""
-"Evit doare n'hoc'h eus krouet a restr kefluniañ. Gallout a rit implijout ar "
-"%1$sskript kefluniañ%2$s da sevel unan."
+"Evit doare n'hoc'h eus krouet a restr kefluniañ. Gallout a rit implijout ar %"
+"1$sskript kefluniañ%2$s da sevel unan."
#: libraries/auth/config.auth.lib.php:109
msgid ""
@@ -5187,8 +5187,8 @@ msgstr ""
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: "
-"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -5865,8 +5865,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the "
-"%sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the %"
+"sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -8514,8 +8514,8 @@ msgstr ""
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should "
-"%sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should %"
+"sreload the privileges%s before you continue."
msgstr ""
#: server_privileges.php:1851
@@ -11161,8 +11161,8 @@ msgstr ""
#: po/advisory_rules.php:83
#, php-format
msgid ""
-"The current ratio of free query cache memory to total query cache size is %s"
-"%%. It should be above 80%%"
+"The current ratio of free query cache memory to total query cache size is %s%"
+"%. It should be above 80%%"
msgstr ""
#: po/advisory_rules.php:85
@@ -11280,8 +11280,8 @@ msgstr ""
#: po/advisory_rules.php:108
#, php-format
msgid ""
-"%s%% of all sorts cause temporary tables, this value should be lower than "
-"10%%."
+"%s%% of all sorts cause temporary tables, this value should be lower than 10%"
+"%."
msgstr ""
#: po/advisory_rules.php:110
@@ -11439,7 +11439,7 @@ msgstr ""
msgid ""
"Increasing {max_heap_table_size} and {tmp_table_size} might help. However "
"some temporary tables are always being written to disk, independent of the "
-"value of these variables. To elminiate these you will have to rewrite your "
+"value of these variables. To eliminate these you will have to rewrite your "
"queries to avoid those conditions (Within a temporary table: Presence of a "
"BLOB or TEXT column or presence of a column bigger than 512 bytes) as "
"mentioned in the beginning of an <a href=\\\"http://www.facebook.com/note."
@@ -11461,7 +11461,7 @@ msgstr ""
msgid ""
"Increasing {max_heap_table_size} and {tmp_table_size} might help. However "
"some temporary tables are always being written to disk, independent of the "
-"value of these variables. To elminiate these you will have to rewrite your "
+"value of these variables. To eliminate these you will have to rewrite your "
"queries to avoid those conditions (Within a temprorary table: Presence of a "
"BLOB or TEXT column or presence of a column bigger than 512 bytes) as "
"mentioned in in the <a href=\\\"http://dev.mysql.com/doc/refman/5.0/en/"
diff --git a/po/bs.po b/po/bs.po
index 469e144..7aec4e5 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -3,14 +3,14 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-08-11 15:11+0200\n"
+"POT-Creation-Date: 2011-08-11 09:15-0400\n"
"PO-Revision-Date: 2010-03-12 09:12+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: bosnian <bs(a)li.org>\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
"X-Generator: Translate Toolkit 1.5.3\n"
#: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:277
@@ -639,8 +639,8 @@ msgstr ""
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation"
-"%s."
+"This view has at least this number of rows. Please refer to %sdocumentation%"
+"s."
msgstr ""
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -886,8 +886,8 @@ msgstr "Sadržaj baze je sačuvan u fajl %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation"
-"%s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
msgstr ""
#: import.php:277 import.php:330 libraries/File.class.php:456
@@ -2366,8 +2366,8 @@ msgstr "Dobrodošli na %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the "
-"%1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the %"
+"1$ssetup script%2$s to create one."
msgstr ""
#: libraries/auth/config.auth.lib.php:109
@@ -5370,8 +5370,8 @@ msgstr ""
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: "
-"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -6089,8 +6089,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the "
-"%sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the %"
+"sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -8985,8 +8985,8 @@ msgstr "Odbaci baze koje se zovu isto kao korisnici."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should "
-"%sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should %"
+"sreload the privileges%s before you continue."
msgstr ""
"Napomena: phpMyAdmin uzima privilegije korisnika direktno iz MySQL tabela "
"privilegija. Sadržaj ove tabele može se razlikovati od privilegija koje "
@@ -11731,8 +11731,8 @@ msgstr ""
#: po/advisory_rules.php:83
#, php-format
msgid ""
-"The current ratio of free query cache memory to total query cache size is %s"
-"%%. It should be above 80%%"
+"The current ratio of free query cache memory to total query cache size is %s%"
+"%. It should be above 80%%"
msgstr ""
#: po/advisory_rules.php:85
@@ -11856,8 +11856,8 @@ msgstr ""
#: po/advisory_rules.php:108
#, php-format
msgid ""
-"%s%% of all sorts cause temporary tables, this value should be lower than "
-"10%%."
+"%s%% of all sorts cause temporary tables, this value should be lower than 10%"
+"%."
msgstr ""
#: po/advisory_rules.php:110
@@ -12014,7 +12014,7 @@ msgstr ""
msgid ""
"Increasing {max_heap_table_size} and {tmp_table_size} might help. However "
"some temporary tables are always being written to disk, independent of the "
-"value of these variables. To elminiate these you will have to rewrite your "
+"value of these variables. To eliminate these you will have to rewrite your "
"queries to avoid those conditions (Within a temporary table: Presence of a "
"BLOB or TEXT column or presence of a column bigger than 512 bytes) as "
"mentioned in the beginning of an <a href=\\\"http://www.facebook.com/note."
@@ -12036,7 +12036,7 @@ msgstr ""
msgid ""
"Increasing {max_heap_table_size} and {tmp_table_size} might help. However "
"some temporary tables are always being written to disk, independent of the "
-"value of these variables. To elminiate these you will have to rewrite your "
+"value of these variables. To eliminate these you will have to rewrite your "
"queries to avoid those conditions (Within a temprorary table: Presence of a "
"BLOB or TEXT column or presence of a column bigger than 512 bytes) as "
"mentioned in in the <a href=\\\"http://dev.mysql.com/doc/refman/5.0/en/"
diff --git a/po/ca.po b/po/ca.po
index 4b4a513..52d56e8 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -3,14 +3,14 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-08-11 15:11+0200\n"
+"POT-Creation-Date: 2011-08-11 09:15-0400\n"
"PO-Revision-Date: 2011-02-23 09:57+0200\n"
"Last-Translator: Xavier Navarro <xvnavarro(a)gmail.com>\n"
"Language-Team: catalan <ca(a)li.org>\n"
-"Language: ca\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -617,8 +617,8 @@ msgstr "El seguiment no està actiu."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation"
-"%s."
+"This view has at least this number of rows. Please refer to %sdocumentation%"
+"s."
msgstr ""
"Aquesta vista té al menys aques nombre de files. Consulta %sdocumentation%s."
@@ -861,11 +861,11 @@ msgstr "El bolcat s'ha desat amb el nom d'arxiu %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation"
-"%s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
msgstr ""
-"Probablement has triat d'enviar un arxiu massa gran. Consulta la "
-"%sdocumentació%s per trobar formes de modificar aquest límit."
+"Probablement has triat d'enviar un arxiu massa gran. Consulta la %"
+"sdocumentació%s per trobar formes de modificar aquest límit."
#: import.php:277 import.php:330 libraries/File.class.php:456
#: libraries/File.class.php:539
@@ -2325,8 +2325,8 @@ msgstr "Benvingut a %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the "
-"%1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the %"
+"1$ssetup script%2$s to create one."
msgstr ""
"La raó més probable d'aixó és que no heu creat l'arxiu de configuració. "
"Podreu voler utilitzar %1$ssetup script%2$s per crear-ne un."
@@ -5437,12 +5437,12 @@ msgstr ", @TABLE@ serà el nom de la taula"
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: "
-"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Aquest valor s'interpreta usant %1$sstrftime%2$s, pel que podeu usar les "
-"cadenes de formateig de temps. A més, es faran aquestes transformacions: "
-"%3$s. Altre text es deixarà sense variació. Consulteu les %4$sPFC -FAQ- %5$s "
+"cadenes de formateig de temps. A més, es faran aquestes transformacions: %3"
+"$s. Altre text es deixarà sense variació. Consulteu les %4$sPFC -FAQ- %5$s "
"per a més detalls."
#: libraries/display_export.lib.php:270
@@ -6210,8 +6210,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the "
-"%sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the %"
+"sPrimeBase XT Home Page%s."
msgstr ""
"Pots trobar la documentació i més informació sobre PBXT a la pàgina "
"principal de %sPrimeBase XT%s."
@@ -7939,8 +7939,8 @@ msgid ""
"installed the necessary PHP extensions as described in the %sdocumentation%s."
msgstr ""
"No s'ha pogut iniciar el validador SQL. Si us plau, comproveu que teniu "
-"instal·lats els mòduls de PHP necessaris tal i com s'indica a la "
-"%sdocumentació%s."
+"instal·lats els mòduls de PHP necessaris tal i com s'indica a la %"
+"sdocumentació%s."
#: libraries/tbl_links.inc.php:118 libraries/tbl_links.inc.php:119
msgid "Table seems to be empty!"
@@ -9104,8 +9104,8 @@ msgstr ""
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should "
-"%sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should %"
+"sreload the privileges%s before you continue."
msgstr ""
"Nota: phpMyAdmin obté els permisos de l'usuari directament de les taules de "
"permisos de MySQL. El contingut d'aquestes taules pot ser diferent dels "
@@ -10902,8 +10902,8 @@ msgid ""
"If using cookie authentication and %sLogin cookie store%s is not 0, %sLogin "
"cookie validity%s must be set to a value less or equal to it."
msgstr ""
-"Si s'utilitza la autenticació per cookies i el valor de %sLogin cookie store"
-"%s no és 0, %sLogin cookie validity%s ha d'establir-se a un valor menor o "
+"Si s'utilitza la autenticació per cookies i el valor de %sLogin cookie store%"
+"s no és 0, %sLogin cookie validity%s ha d'establir-se a un valor menor o "
"igual a ell."
#: setup/lib/index.lib.php:290
@@ -10931,8 +10931,8 @@ msgstr ""
"Has triat el tipus d'autenticació [kbd]config[/kbd] i has inclós el nom "
"d'usuari i la contrasenya per connexions automàtiques, que es una opció no "
"recomanable per a servidors actius. Qualsevol que conegui la teva URL de "
-"phpMyAdmin pot accedir al teu panel directament. Estableix el "
-"%sauthentication type%s a [kbd]cookie[/kbd] o [kbd]http[/kbd]."
+"phpMyAdmin pot accedir al teu panel directament. Estableix el %"
+"sauthentication type%s a [kbd]cookie[/kbd] o [kbd]http[/kbd]."
#: setup/lib/index.lib.php:294
#, php-format
@@ -12059,8 +12059,8 @@ msgstr ""
#: po/advisory_rules.php:83
#, php-format
msgid ""
-"The current ratio of free query cache memory to total query cache size is %s"
-"%%. It should be above 80%%"
+"The current ratio of free query cache memory to total query cache size is %s%"
+"%. It should be above 80%%"
msgstr ""
#: po/advisory_rules.php:85
@@ -12189,8 +12189,8 @@ msgstr ""
#: po/advisory_rules.php:108
#, php-format
msgid ""
-"%s%% of all sorts cause temporary tables, this value should be lower than "
-"10%%."
+"%s%% of all sorts cause temporary tables, this value should be lower than 10%"
+"%."
msgstr ""
#: po/advisory_rules.php:110
@@ -12350,7 +12350,7 @@ msgstr ""
msgid ""
"Increasing {max_heap_table_size} and {tmp_table_size} might help. However "
"some temporary tables are always being written to disk, independent of the "
-"value of these variables. To elminiate these you will have to rewrite your "
+"value of these variables. To eliminate these you will have to rewrite your "
"queries to avoid those conditions (Within a temporary table: Presence of a "
"BLOB or TEXT column or presence of a column bigger than 512 bytes) as "
"mentioned in the beginning of an <a href=\\\"http://www.facebook.com/note."
@@ -12372,7 +12372,7 @@ msgstr ""
msgid ""
"Increasing {max_heap_table_size} and {tmp_table_size} might help. However "
"some temporary tables are always being written to disk, independent of the "
-"value of these variables. To elminiate these you will have to rewrite y he "