[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10048-g05cc24c
Michal Čihař
nijel at users.sourceforge.net
Wed Sep 8 09:51:00 CEST 2010
The branch, master has been updated
via 05cc24c2bea9416d1c08b88c1c21e78f085a5475 (commit)
via c1d8f2b0180c10145c7d2173f5d6d5e52c166047 (commit)
via 5d136abd8bf9f85336f52332470acf9e52448b20 (commit)
via ea77deee984f2fde66b2afc152f85c2ccff29bd9 (commit)
via 687732c9ed67cc690d7c61b195ff3ba6c53ab367 (commit)
via 428f7f55838495a890dd5bfcc1edf39c9c039736 (commit)
via 38d9e07704f88e956f00d9c3ec58c2587499f1cf (commit)
via 1ae770b5b79f09e6edecd8a7f8df41457ffde24d (commit)
via 095e446b795427a33b221d42b138514311cc9eb7 (commit)
via e5c993548686f22608db712906746e9cbb86529b (commit)
via 747eeb8ec7e35f7cde0561fe92ff8f16ed9d1082 (commit)
via 826f7334dcef77c559f8e2168d681bf3165f04b3 (commit)
via ef532e2cfdcd78576f5c75d52b397f9ca9291e70 (commit)
via c9590a623b8c744bfbc74809c7fc78e59c36aa0f (commit)
via ad4a44782db596e4c2c4dfdd1b299b527ec5eff0 (commit)
via 4df52a8df59abe539000fc740c94688888678d2d (commit)
via e2074822c6b561cf8a7402dd220e88107e14838c (commit)
via e9605b94734473400800596f07ba80ff5a4e84cf (commit)
via c394f149f6b44524104dd8b02a6d567eb21f67e7 (commit)
via aaf52b6b77cf2ffbc4199951b280b674a295ca97 (commit)
from db08d6ad3a948d28b1a6e0929e64fab628ac0f5f (commit)
- Log -----------------------------------------------------------------
commit 05cc24c2bea9416d1c08b88c1c21e78f085a5475
Merge: c1d8f2b0180c10145c7d2173f5d6d5e52c166047 687732c9ed67cc690d7c61b195ff3ba6c53ab367
Author: Michal Čihař <mcihar at novell.com>
Date: Wed Sep 8 09:50:26 2010 +0200
Merge remote branch 'pootle/master'
commit c1d8f2b0180c10145c7d2173f5d6d5e52c166047
Merge: ea77deee984f2fde66b2afc152f85c2ccff29bd9 5d136abd8bf9f85336f52332470acf9e52448b20
Author: Michal Čihař <mcihar at novell.com>
Date: Wed Sep 8 09:50:19 2010 +0200
Merge branch 'QA_3_3'
commit ea77deee984f2fde66b2afc152f85c2ccff29bd9
Merge: aaf52b6b77cf2ffbc4199951b280b674a295ca97 db08d6ad3a948d28b1a6e0929e64fab628ac0f5f
Author: Michal Čihař <mcihar at novell.com>
Date: Wed Sep 8 09:48:51 2010 +0200
Merge remote branch 'origin/master'
commit 687732c9ed67cc690d7c61b195ff3ba6c53ab367
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date: Wed Sep 8 09:08:05 2010 +0200
Translation update done using Pootle.
commit 428f7f55838495a890dd5bfcc1edf39c9c039736
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date: Wed Sep 8 05:30:23 2010 +0200
Translation update done using Pootle.
commit 38d9e07704f88e956f00d9c3ec58c2587499f1cf
Merge: 1ae770b5b79f09e6edecd8a7f8df41457ffde24d db08d6ad3a948d28b1a6e0929e64fab628ac0f5f
Author: Pootle server <pootle at cihar.com>
Date: Tue Sep 7 20:40:09 2010 +0200
Merge remote branch 'origin/master'
commit 1ae770b5b79f09e6edecd8a7f8df41457ffde24d
Author: Robert Readman <robert_readman at hotmail.com>
Date: Tue Sep 7 19:46:04 2010 +0200
Translation update done using Pootle.
commit 095e446b795427a33b221d42b138514311cc9eb7
Author: Robert Readman <robert_readman at hotmail.com>
Date: Tue Sep 7 19:45:56 2010 +0200
Translation update done using Pootle.
commit e5c993548686f22608db712906746e9cbb86529b
Author: Robert Readman <robert_readman at hotmail.com>
Date: Tue Sep 7 19:45:51 2010 +0200
Translation update done using Pootle.
commit 747eeb8ec7e35f7cde0561fe92ff8f16ed9d1082
Author: Robert Readman <robert_readman at hotmail.com>
Date: Tue Sep 7 19:45:48 2010 +0200
Translation update done using Pootle.
commit 826f7334dcef77c559f8e2168d681bf3165f04b3
Author: Robert Readman <robert_readman at hotmail.com>
Date: Tue Sep 7 19:45:39 2010 +0200
Translation update done using Pootle.
commit ef532e2cfdcd78576f5c75d52b397f9ca9291e70
Author: Domen <dbc334 at gmail.com>
Date: Tue Sep 7 18:44:57 2010 +0200
Translation update done using Pootle.
commit c9590a623b8c744bfbc74809c7fc78e59c36aa0f
Author: Domen <dbc334 at gmail.com>
Date: Tue Sep 7 18:44:10 2010 +0200
Translation update done using Pootle.
commit ad4a44782db596e4c2c4dfdd1b299b527ec5eff0
Author: Domen <dbc334 at gmail.com>
Date: Tue Sep 7 18:43:05 2010 +0200
Translation update done using Pootle.
commit 4df52a8df59abe539000fc740c94688888678d2d
Author: Domen <dbc334 at gmail.com>
Date: Tue Sep 7 18:42:52 2010 +0200
Translation update done using Pootle.
commit e2074822c6b561cf8a7402dd220e88107e14838c
Author: Domen <dbc334 at gmail.com>
Date: Tue Sep 7 18:42:41 2010 +0200
Translation update done using Pootle.
commit aaf52b6b77cf2ffbc4199951b280b674a295ca97
Author: Michal Čihař <mcihar at novell.com>
Date: Tue Sep 7 15:53:23 2010 +0200
Some more improvements to formtatting.
-----------------------------------------------------------------------
Summary of changes:
README | 30 ++++++++++++----------
po/en_GB.po | 18 +++++--------
po/nb.po | 80 +---------------------------------------------------------
po/sl.po | 21 ++++++---------
po/tr.po | 4 +-
5 files changed, 36 insertions(+), 117 deletions(-)
diff --git a/README b/README
index ffa1b89..7b92968 100644
--- a/README
+++ b/README
@@ -8,17 +8,18 @@ Version 3.4.0-dev
http://www.phpmyadmin.net/
-Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>
-
-Copyright (C) 2001-2010 Marc Delisle <marc_at_infomarc.info>
- Olivier Müller <om_at_omnis.ch>
- Robin Johnson <robbat2_at_users.sourceforge.net>
- Alexander M. Turek <me_at_derrabus.de>
- Michal Čihař <michal_at_cihar.com>
- Garvin Hicking <me_at_supergarv.de>
- Michael Keck <mkkeck_at_users.sourceforge.net>
- Sebastian Mendel <cybot_tm_at_users.sourceforge.net>
- [check Documentation.txt/.html file for more details]
+Copyright (C) 1998-2000
+ Tobias Ratschiller <tobias_at_ratschiller.com>
+Copyright (C) 2001-2010
+ Marc Delisle <marc_at_infomarc.info>
+ Olivier Müller <om_at_omnis.ch>
+ Robin Johnson <robbat2_at_users.sourceforge.net>
+ Alexander M. Turek <me_at_derrabus.de>
+ Michal Čihař <michal_at_cihar.com>
+ Garvin Hicking <me_at_supergarv.de>
+ Michael Keck <mkkeck_at_users.sourceforge.net>
+ Sebastian Mendel <cybot_tm_at_users.sourceforge.net>
+ [check Documentation.txt/.html file for more details]
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License version 2,
@@ -36,7 +37,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Requirements
~~~~~~~~~~~~
-* php 5.2 or later
+* PHP 5.2 or later
* MySQL 5.0 or later
* a web-browser (doh!)
@@ -62,9 +63,10 @@ Support
See reference about support forums under http://www.phpmyadmin.net/
- Enjoy!
+Enjoy!
+~~~~~~
- -- The phpMyAdmin Devel team
+The phpMyAdmin Devel team
PS:
diff --git a/po/en_GB.po b/po/en_GB.po
index 2669ed9..4395eda 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
"POT-Creation-Date: 2010-09-07 15:21+0200\n"
-"PO-Revision-Date: 2010-09-03 14:27+0200\n"
+"PO-Revision-Date: 2010-09-07 19:46+0200\n"
"Last-Translator: Robert Readman <robert_readman at hotmail.com>\n"
"Language-Team: english-gb <en_GB at li.org>\n"
"Language: en_GB\n"
@@ -817,7 +817,7 @@ msgstr "Values for the column \"%s\""
#: enum_editor.php:22 libraries/tbl_properties.inc.php:799
msgid "Enter each value in a separate field."
-msgstr ""
+msgstr "Enter each value in a separate field."
#: export.php:73
msgid "Selected export type has to be saved in file!"
@@ -1068,10 +1068,9 @@ msgid "Changing Charset"
msgstr "Changing Charset"
#: js/messages.php:75
-#, fuzzy
#| msgid "Table must have atleast 1 column"
msgid "Table must have at least one column"
-msgstr "Table must have at-least 1 column"
+msgstr "Table must have at least one column"
#: js/messages.php:76
msgid "Create Table"
@@ -3063,10 +3062,9 @@ msgid "Display servers selection"
msgstr "Display servers selection"
#: libraries/config/messages.inc.php:268
-#, fuzzy
#| msgid "Display databases in a tree"
msgid "Display table filter"
-msgstr "Display databases in a tree"
+msgstr "Display table filter"
#: libraries/config/messages.inc.php:269
msgid "String that separates databases into different tree levels"
@@ -3205,10 +3203,9 @@ msgid "Login cookie validity"
msgstr "Login cookie validity"
#: libraries/config/messages.inc.php:296
-#, fuzzy
#| msgid "Double size of textarea for LONGTEXT fields"
msgid "Double size of textarea for LONGTEXT columns"
-msgstr "Double size of textarea for LONGTEXT fields"
+msgstr "Double size of textarea for LONGTEXT columns"
#: libraries/config/messages.inc.php:297
msgid "Bigger textarea for LONGTEXT"
@@ -3338,7 +3335,6 @@ msgid "Persistent connections"
msgstr "Persistent connections"
#: libraries/config/messages.inc.php:325
-#, fuzzy
#| msgid ""
#| "Disable the default warning that is displayed on the database details "
#| "Structure page if any of the required tables for the relation features "
@@ -3349,8 +3345,8 @@ msgid ""
"configuration storage could not be found"
msgstr ""
"Disable the default warning that is displayed on the database details "
-"Structure page if any of the required tables for the relation features could "
-"not be found"
+"Structure page if any of the required tables for the phpMyAdmin "
+"configuration storage could not be found"
#: libraries/config/messages.inc.php:326
msgid "Missing phpMyAdmin configuration storage tables"
diff --git a/po/nb.po b/po/nb.po
index 9c02aae..8d3922e 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
"POT-Creation-Date: 2010-09-07 15:21+0200\n"
-"PO-Revision-Date: 2010-09-07 14:07+0200\n"
+"PO-Revision-Date: 2010-09-08 09:08+0200\n"
"Last-Translator: <sven.erik.andersen at gmail.com>\n"
"Language-Team: norwegian <no at li.org>\n"
"Language: nb\n"
@@ -813,7 +813,7 @@ msgstr "Verdier for kolonnen \"%s\""
#: enum_editor.php:22 libraries/tbl_properties.inc.php:799
msgid "Enter each value in a separate field."
-msgstr ""
+msgstr "Skriv inn hver verdi i separate felter."
#: export.php:73
msgid "Selected export type has to be saved in file!"
@@ -9920,79 +9920,3 @@ msgstr "VIEW navn"
#: view_operations.php:91
msgid "Rename view to"
msgstr "Endre tabellens navn"
-
-#~| msgid ""
-#~| "Please enter the values for transformation options using this format: "
-#~| "'a', 100, b,'c'...<br />If you ever need to put a backslash (\"\\\") or "
-#~| "a single quote (\"'\") amongst those values, precede it with a backslash "
-#~| "(for example '\\\\xyz' or 'a\\'b')."
-#~ msgid ""
-#~ "Enter each value in a separate field, enclosed in single quotes. If you "
-#~ "ever need to put a backslash (\"\\\") or a single quote (\"'\") amongst "
-#~ "those values, precede it with a backslash (for example '\\\\xyz' or 'a"
-#~ "\\'b')."
-#~ msgstr ""
-#~ "Skriv hver enkelt verdi i et separat felt, innelukket i enkle apostrofer. "
-#~ "Hvis du trenger å skrive en bakoverskråstrek(\"\\\") eller en enkel "
-#~ "apostrof (\"'\") blant disse verdiene, så skriv en bakoverskråstrek foran "
-#~ "(eks. '\\\\\\xyz' eller 'a\\'b')."
-
-#, fuzzy
-#~| msgid ""
-#~| "Please enter the values for transformation options using this format: "
-#~| "'a', 100, b,'c'...<br />If you ever need to put a backslash (\"\\\") or "
-#~| "a single quote (\"'\") amongst those values, precede it with a backslash "
-#~| "(for example '\\\\xyz' or 'a\\'b')."
-#~ msgid ""
-#~ "Enter each value in a separate field. If you ever need to put a backslash "
-#~ "(\"\\\") or a single quote (\"'\") amongst those values, precede it with "
-#~ "a backslash (for example '\\\\xyz' or 'a\\'b')."
-#~ msgstr ""
-#~ "Skriv inn verdiene for transformasjon med dette formatet: 'a', 100, "
-#~ "b,'c'...<br />Hvis du trenger å bruke en skråstrek (\"\\\") eller en "
-#~ "enkel apostrof (\"'\") blant disse verdiene så sett en skråstrek foran "
-#~ "(eks. '\\\\xyz' eller 'a\\'b')."
-
-#~ msgid "New table"
-#~ msgstr "Ny tabell"
-
-#~ msgid "server name"
-#~ msgstr "tjenernavn"
-
-#~ msgid "database name"
-#~ msgstr "databasenavn"
-
-#~ msgid "table name"
-#~ msgstr "tabellnavn"
-
-#~ msgid "Edit PDF Pages"
-#~ msgstr "Rediger PDF-sider"
-
-#~ msgid "Data Dictionary Format"
-#~ msgstr "Data Ordbok Format"
-
-#~ msgid "no"
-#~ msgstr "nei"
-
-#~ msgid "Enter login options for signon authentication"
-#~ msgstr "Skriv innloggingsinnstillinger for signon autentiseringsmetode"
-
-#~ msgid "Signon login options"
-#~ msgstr "Signon innloggingsinnstillinger"
-
-#~ msgid "PMA database"
-#~ msgstr "PMA database"
-
-#~ msgid "Customization"
-#~ msgstr "Tilpasning"
-
-#~ msgid ""
-#~ "SQL queries settings, for SQL Query box options see [a@?page=form&"
-#~ "formset=main_frame#tab_Sql_box]Navigation frame[/a] settings"
-#~ msgstr ""
-#~ "Innstillinger for SQL spørringer, for SQL spørringsboksinnstillinger se "
-#~ "[a@?page=form&formset=main_frame#tab_Sql_box]navigasjonsramme[/a]"
-#~ "innstillingene"
-
-#~ msgid "yes"
-#~ msgstr "ja"
diff --git a/po/sl.po b/po/sl.po
index f68e201..a9aa67e 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,15 +4,15 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
"POT-Creation-Date: 2010-09-07 15:21+0200\n"
-"PO-Revision-Date: 2010-09-04 02:00+0200\n"
+"PO-Revision-Date: 2010-09-07 18:44+0200\n"
"Last-Translator: Domen <dbc334 at gmail.com>\n"
"Language-Team: slovenian <sl at li.org>\n"
"Language: sl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
+"n%100==4 ? 2 : 3);\n"
"X-Generator: Pootle 2.0.5\n"
#: browse_foreigners.php:36 browse_foreigners.php:57
@@ -821,7 +821,7 @@ msgstr "Vrednosti za stolpec \"%s\""
#: enum_editor.php:22 libraries/tbl_properties.inc.php:799
msgid "Enter each value in a separate field."
-msgstr ""
+msgstr "Vnesite vsako vrednost v svoje polje."
#: export.php:73
msgid "Selected export type has to be saved in file!"
@@ -1078,7 +1078,7 @@ msgstr "Spreminjanje nabora znakov"
#: js/messages.php:75
msgid "Table must have at least one column"
-msgstr "Tabele morajo imeti vsaj en stolpec."
+msgstr "Tabele morajo imeti vsaj en stolpec"
#: js/messages.php:76
msgid "Create Table"
@@ -3081,10 +3081,9 @@ msgid "Display servers selection"
msgstr "Prikaži izbiro strežnikov"
#: libraries/config/messages.inc.php:268
-#, fuzzy
#| msgid "Display databases in a tree"
msgid "Display table filter"
-msgstr "Prikaži zbirke podatkov v drevesu"
+msgstr "Prikaži filter tabel"
#: libraries/config/messages.inc.php:269
msgid "String that separates databases into different tree levels"
@@ -3225,10 +3224,9 @@ msgid "Login cookie validity"
msgstr "Veljavnost prijavnega piškotka"
#: libraries/config/messages.inc.php:296
-#, fuzzy
#| msgid "Double size of textarea for LONGTEXT fields"
msgid "Double size of textarea for LONGTEXT columns"
-msgstr "Dvojna velikost besedilnega polja za polja LONGTEXT"
+msgstr "Dvojna velikost besedilnega polja za stolpce LONGTEXT"
#: libraries/config/messages.inc.php:297
msgid "Bigger textarea for LONGTEXT"
@@ -3360,7 +3358,6 @@ msgid "Persistent connections"
msgstr "Vztrajne povezave"
#: libraries/config/messages.inc.php:325
-#, fuzzy
#| msgid ""
#| "Disable the default warning that is displayed on the database details "
#| "Structure page if any of the required tables for the relation features "
@@ -3371,8 +3368,8 @@ msgid ""
"configuration storage could not be found"
msgstr ""
"Onemogoči privzeto opozorilo, ki se prikaže na strani o podrobnostih zbirke "
-"podatkov Struktura, če katera od potrebnih tabel za funkcije relacij ni bila "
-"najdena"
+"podatkov Struktura, če katera od tabel, potrebnih za hrambo konfiguracije "
+"phpMyAdmin, ni bila najdena"
#: libraries/config/messages.inc.php:326
msgid "Missing phpMyAdmin configuration storage tables"
diff --git a/po/tr.po b/po/tr.po
index 5102877..48603c3 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
"POT-Creation-Date: 2010-09-07 15:21+0200\n"
-"PO-Revision-Date: 2010-09-07 09:48+0200\n"
+"PO-Revision-Date: 2010-09-08 05:30+0200\n"
"Last-Translator: Burak Yavuz <hitowerdigit at hotmail.com>\n"
"Language-Team: turkish <tr at li.org>\n"
"Language: tr\n"
@@ -813,7 +813,7 @@ msgstr "\"%s\" sütunu için değerler"
#: enum_editor.php:22 libraries/tbl_properties.inc.php:799
msgid "Enter each value in a separate field."
-msgstr ""
+msgstr "Her bir değeri ayrı alana girin."
#: export.php:73
msgid "Selected export type has to be saved in file!"
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list