The branch, master has been updated via 19172fb476a0082cb5e1e560c3613a99a4f085aa (commit) via c1053d0f1f7a49608904b8cfd001cc20c7d8c263 (commit) via c3ca1e2d27eb54efaf3aed1a87052ddc3d58b02e (commit) via 623e3c636c2f1f76306f7aec5724b94b33c2d3ff (commit) via a93037f6749ac84795efb1bcf578da40232e4f83 (commit) via 70a876d31db6a50e424c6934086dce49ca57c2bb (commit) via 0a74f2e791e1a509d17fa2756cb949b797f5fa19 (commit) via ab4807defeb325dcf5d50e0f3faa4f91088312a0 (commit) via 790e008d4ff705920d2df977ce25e6d881f2e5b9 (commit) via da6711ccc14be5a70682382c1d54545ca8755fb2 (commit) via 1ab3c16341a197a597b269f23169350557dca5c7 (commit) via 83c0211ccf66d235193281b7eb4a2230f3e725a0 (commit) via 444bfb0e234aed72aa2a3ff13af147c46b270c9d (commit) via 0e626adafba604e72b5c3b1d7817c4aa7933f76c (commit) from 15a384a2d510416857994908e6c6b45fc2b1e7e2 (commit)
- Log ----------------------------------------------------------------- commit 19172fb476a0082cb5e1e560c3613a99a4f085aa Merge: c1053d0f1f7a49608904b8cfd001cc20c7d8c263 15a384a2d510416857994908e6c6b45fc2b1e7e2 Author: Pootle server pootle@cihar.com Date: Sun Jul 31 22:40:15 2011 +0200
Merge remote-tracking branch 'origin/master'
commit c1053d0f1f7a49608904b8cfd001cc20c7d8c263 Author: stefan stefan@inkopsforum.se Date: Sun Jul 31 21:19:06 2011 +0200
Translation update done using Pootle.
commit c3ca1e2d27eb54efaf3aed1a87052ddc3d58b02e Author: stefan stefan@inkopsforum.se Date: Sun Jul 31 21:18:15 2011 +0200
Translation update done using Pootle.
commit 623e3c636c2f1f76306f7aec5724b94b33c2d3ff Author: stefan stefan@inkopsforum.se Date: Sun Jul 31 21:17:50 2011 +0200
Translation update done using Pootle.
commit a93037f6749ac84795efb1bcf578da40232e4f83 Author: stefan stefan@inkopsforum.se Date: Sun Jul 31 21:17:35 2011 +0200
Translation update done using Pootle.
commit 70a876d31db6a50e424c6934086dce49ca57c2bb Author: stefan stefan@inkopsforum.se Date: Sun Jul 31 21:17:16 2011 +0200
Translation update done using Pootle.
commit 0a74f2e791e1a509d17fa2756cb949b797f5fa19 Author: stefan stefan@inkopsforum.se Date: Sun Jul 31 21:16:39 2011 +0200
Translation update done using Pootle.
commit ab4807defeb325dcf5d50e0f3faa4f91088312a0 Author: stefan stefan@inkopsforum.se Date: Sun Jul 31 21:16:14 2011 +0200
Translation update done using Pootle.
commit 790e008d4ff705920d2df977ce25e6d881f2e5b9 Author: stefan stefan@inkopsforum.se Date: Sun Jul 31 21:15:44 2011 +0200
Translation update done using Pootle.
commit da6711ccc14be5a70682382c1d54545ca8755fb2 Author: stefan stefan@inkopsforum.se Date: Sun Jul 31 21:15:27 2011 +0200
Translation update done using Pootle.
commit 1ab3c16341a197a597b269f23169350557dca5c7 Author: stefan stefan@inkopsforum.se Date: Sun Jul 31 21:14:15 2011 +0200
Translation update done using Pootle.
commit 83c0211ccf66d235193281b7eb4a2230f3e725a0 Author: stefan stefan@inkopsforum.se Date: Sun Jul 31 21:13:18 2011 +0200
Translation update done using Pootle.
commit 444bfb0e234aed72aa2a3ff13af147c46b270c9d Author: mrbendig mrbendig@mrbendig.com Date: Sun Jul 31 21:12:19 2011 +0200
Translation update done using Pootle.
commit 0e626adafba604e72b5c3b1d7817c4aa7933f76c Author: mrbendig mrbendig@mrbendig.com Date: Sun Jul 31 21:11:59 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/de.po | 12 +++++------- po/sv.po | 35 ++++++++++++----------------------- 2 files changed, 17 insertions(+), 30 deletions(-)
diff --git a/po/de.po b/po/de.po index ec26b35..b9903b2 100644 --- a/po/de.po +++ b/po/de.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-30 14:14-0400\n" -"PO-Revision-Date: 2011-07-29 13:44+0200\n" +"PO-Revision-Date: 2011-07-31 21:12+0200\n" "Last-Translator: mrbendig@mrbendig.com\n" "Language-Team: german de@li.org\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n"
@@ -1326,7 +1326,6 @@ msgid "Analysing & loading logs. This may take a while." msgstr "Analysiere und Lade Protokolle. Dies kann eine Weile dauern."
#: js/messages.php:143 -#, fuzzy #| msgid "" #| "This columns shows the amount of identical queries that are grouped " #| "together. However only the SQL Text is being compared, thus the queries " @@ -1337,7 +1336,7 @@ msgid "" "the other attributes of queries, such as start time, may differ." msgstr "" "Diese Spalte zeigt die Anzahl der identischen Abfragen an, die gruppiert " -"wurden. Dennoch wird nur der SQL-Text verglichen, daher kann die Angabe von " +"wurden. Jedoch wird nur der SQL-Text verglichen, daher kann die Angabe von " "anderen Werten der Abfrage, wie die Startzeit, unterschiedlich sein."
#: js/messages.php:144 @@ -1360,12 +1359,11 @@ msgid "Jump to Log table" msgstr "Springe zur Protokoll-Tabelle"
#: js/messages.php:148 -#, fuzzy #| msgid "Log analysed, but not data found in this time span." msgid "Log analysed, but no data found in this time span." msgstr "" -"Protokoll wurde analysiert, es wurden jedoch keine Daten im angegebenen " -"Zeitraum gefunden." +"Das Protokoll wurde analysiert, es wurden jedoch keine Daten für den " +"angegebenen Zeitraum gefunden."
#. l10n: A collection of available filters #: js/messages.php:151 diff --git a/po/sv.po b/po/sv.po index b8904da..e014c8a 100644 --- a/po/sv.po +++ b/po/sv.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-30 14:14-0400\n" -"PO-Revision-Date: 2011-07-31 20:58+0200\n" +"PO-Revision-Date: 2011-07-31 21:19+0200\n" "Last-Translator: stefan@inkopsforum.se\n" "Language-Team: swedish sv@li.org\n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n"
@@ -9952,42 +9952,37 @@ msgstr "" "behövs längre. \n"
#: server_status.php:1385 -#, fuzzy #| msgid "Usage" msgid "CPU Usage" -msgstr "Användning" +msgstr "CPU Användning"
#: server_status.php:1388 msgid "Memory Usage" msgstr "Minnesanvändning"
#: server_status.php:1391 -#, fuzzy #| msgid "Usage" msgid "Swap Usage" -msgstr "Användning" +msgstr "Swap användning"
#: server_status.php:1394 -#, fuzzy #| msgid "All status variables" msgid "Status variable(s)" msgstr "Alla statusvariabler"
#: server_status.php:1396 -#, fuzzy #| msgid "Select Tables" msgid "Select series:" -msgstr "Välj tabeller" +msgstr "Välj serier:"
#: server_status.php:1398 msgid "Commonly monitored" msgstr "Vanligen övervakade"
#: server_status.php:1413 -#, fuzzy #| msgid "You must provide a routine name" msgid "or type variable name:" -msgstr "Du måste ange ett rutinnamn" +msgstr "eller skriv ett variabelnamn:"
#: server_status.php:1417 msgid "Display as differential value" @@ -10002,38 +9997,33 @@ msgid "Append unit to data values" msgstr "Lägg till enhet till datavärdena"
#: server_status.php:1432 -#, fuzzy #| msgid "Add a trigger" msgid "Add this series" -msgstr "Lägg till en ny Trigger" +msgstr "Lägg till denna serie"
#: server_status.php:1434 msgid "Clear series" msgstr "Rensa serier"
#: server_status.php:1437 -#, fuzzy #| msgid "Series:" msgid "Series in Chart:" -msgstr "Serie:" +msgstr "Serier i diagram:"
#: server_status.php:1445 -#, fuzzy #| msgid "Loading" msgid "Loading logs" -msgstr "Laddar" +msgstr "Läser in loggar"
#: server_status.php:1448 -#, fuzzy #| msgid "Show statistics" msgid "Log statistics" -msgstr "Visa statistik" +msgstr "Logga statistik"
#: server_status.php:1449 -#, fuzzy #| msgid "Select page" msgid "Selected time range:" -msgstr "Välj sida" +msgstr "Valt tidsintervall:"
#: server_status.php:1454 msgid "Only retrieve SELECT,INSERT,UPDATE and DELETE Statements" @@ -10052,10 +10042,9 @@ msgstr "" "grupperas efter frågetexten."
#: server_status.php:1465 -#, fuzzy #| msgid "Query type" msgid "Query analyzer" -msgstr "Fråge-typ" +msgstr "Fråge analyserare"
#: server_status.php:1501 #, php-format
hooks/post-receive