[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA2-1622-g48a5309
Michal Čihař
nijel at users.sourceforge.net
Wed Dec 1 09:55:31 CET 2010
The branch, master has been updated
via 48a5309632cb47055dd6d9cec66718a99875f6bb (commit)
via e4b52c6e7b810b144dfbe4ffa93c1f6934e5c9f8 (commit)
via d1330c2a17798abff8dfee6bc72d29bd79167820 (commit)
via f39daea6105f403b4760dde7ba1608be0f495893 (commit)
via c2c940e36d005fa1d0921904a8cb0d57cca136e6 (commit)
via 0a542aaffa411a1d8cc2ad409deeb0a1916185ee (commit)
via adc2334a33446335bd7688a38920ccc73945bb6d (commit)
via cef4635dcd6281d949aeed7fee4469fc4ce580ee (commit)
via 701051b3b527bcbd9c572625925bdf740732c6dc (commit)
via 0767f388ccf58180e6787c5f0e7ee7e97dd0a2f4 (commit)
via 284badfb41805918900b54075bc6b2ef650d0759 (commit)
via fc29e2d0f3783570af7cb492b4d95833e455ae94 (commit)
via 7a9f33d6c3bd1543546348bb935d1afb65460c80 (commit)
via ed82063df7c63edb7e5a99f0ad001c0cd87be61c (commit)
via 4f7c65affd5d27e160dcf81561455948a38c04a1 (commit)
via 7f6519151eae99958d15955b4d62fac1ad2f3b5c (commit)
via 883d921da3816ebaa4fa8dee4bb9660908cea2ca (commit)
via e5ead58ed8e050a7bdcae4c6f714ec5a4029bed8 (commit)
via 150439591cef0eb778fc5aeef65fabfc14a6878a (commit)
via f567fdac98bd61e9b05db5f261cbb6c0ef873894 (commit)
via 32a286719449ee56543221b013cddbf84541c203 (commit)
via 76b7932e11b9c247c6cc4e9a0e94f25e01310d93 (commit)
via 5c18361449bb7eebbe37d40f095d97ac1f450ab7 (commit)
via c897db5a4102dc51923b85191a9f25fc7a7fd35b (commit)
via 47efb4fe0e60327539c5bb5c7d82ac9329f65198 (commit)
via 04895868e825fc7c7adfe351827a9d0c805b2a57 (commit)
via cbfb653aebe4ed57e4a1b30dab500a6c39995b5f (commit)
via 91a03ab9fd6a519923e829b0b885bd2abfe9b39f (commit)
via 7fcde27c9c49c2ea1bf3cb812423cdd2d1f4c9ab (commit)
via 471984f684a93b42f9db336900afd762a11789b3 (commit)
via 0f4f9de9214648ac564ce59b1cf426bb35de7800 (commit)
via e7115c6ff54ecab020d8c3775bd9b4fffe62c948 (commit)
via fd972e1105c11cba27c650707390fbc99d854f30 (commit)
via 012b2df612d7ece8e97549300ac2e9141ba7682c (commit)
via de145456e94e7b43b301642df66d85681de94de7 (commit)
via 7ae3ce83f0e357ce1835b09af63cd9df005c3de6 (commit)
via 6ebf2eb03b9f0a3e1a80826f3eb07e76b080e2ec (commit)
via bdbc6e02393baa65ef3f3278a77ec61d8f4cc4b9 (commit)
from 795b6c7203ee529914125334a6cefcc58a907b7c (commit)
- Log -----------------------------------------------------------------
commit 48a5309632cb47055dd6d9cec66718a99875f6bb
Merge: e4b52c6e7b810b144dfbe4ffa93c1f6934e5c9f8 32a286719449ee56543221b013cddbf84541c203
Author: Michal Čihař <mcihar at novell.com>
Date: Wed Dec 1 09:53:12 2010 +0100
Merge remote branch 'pootle/master'
Conflicts:
po/sl.po
commit e4b52c6e7b810b144dfbe4ffa93c1f6934e5c9f8
Merge: 795b6c7203ee529914125334a6cefcc58a907b7c d1330c2a17798abff8dfee6bc72d29bd79167820
Author: Michal Čihař <mcihar at novell.com>
Date: Wed Dec 1 09:52:42 2010 +0100
Merge branch 'QA_3_4'
Conflicts:
po/sl.po
commit 32a286719449ee56543221b013cddbf84541c203
Merge: 76b7932e11b9c247c6cc4e9a0e94f25e01310d93 224423debb4f545295ba6d1f8e36fb047259ace3
Author: Pootle server <pootle at cihar.com>
Date: Tue Nov 30 16:40:07 2010 +0100
Merge remote branch 'origin/master'
commit 76b7932e11b9c247c6cc4e9a0e94f25e01310d93
Author: Domen <dbc334 at gmail.com>
Date: Tue Nov 30 17:31:35 2010 +0200
Translation update done using Pootle.
commit 5c18361449bb7eebbe37d40f095d97ac1f450ab7
Author: Domen <dbc334 at gmail.com>
Date: Tue Nov 30 17:31:27 2010 +0200
Translation update done using Pootle.
commit c897db5a4102dc51923b85191a9f25fc7a7fd35b
Author: Domen <dbc334 at gmail.com>
Date: Tue Nov 30 17:30:39 2010 +0200
Translation update done using Pootle.
commit 47efb4fe0e60327539c5bb5c7d82ac9329f65198
Author: Domen <dbc334 at gmail.com>
Date: Tue Nov 30 17:29:06 2010 +0200
Translation update done using Pootle.
commit 04895868e825fc7c7adfe351827a9d0c805b2a57
Author: Domen <dbc334 at gmail.com>
Date: Tue Nov 30 17:28:55 2010 +0200
Translation update done using Pootle.
commit cbfb653aebe4ed57e4a1b30dab500a6c39995b5f
Author: Domen <dbc334 at gmail.com>
Date: Tue Nov 30 17:28:50 2010 +0200
Translation update done using Pootle.
commit 91a03ab9fd6a519923e829b0b885bd2abfe9b39f
Author: Domen <dbc334 at gmail.com>
Date: Tue Nov 30 17:28:47 2010 +0200
Translation update done using Pootle.
commit 7fcde27c9c49c2ea1bf3cb812423cdd2d1f4c9ab
Author: Domen <dbc334 at gmail.com>
Date: Tue Nov 30 17:28:38 2010 +0200
Translation update done using Pootle.
commit 471984f684a93b42f9db336900afd762a11789b3
Author: Domen <dbc334 at gmail.com>
Date: Tue Nov 30 17:28:34 2010 +0200
Translation update done using Pootle.
commit 0f4f9de9214648ac564ce59b1cf426bb35de7800
Author: Domen <dbc334 at gmail.com>
Date: Tue Nov 30 17:28:21 2010 +0200
Translation update done using Pootle.
commit e7115c6ff54ecab020d8c3775bd9b4fffe62c948
Author: Domen <dbc334 at gmail.com>
Date: Tue Nov 30 17:28:11 2010 +0200
Translation update done using Pootle.
commit fd972e1105c11cba27c650707390fbc99d854f30
Author: Domen <dbc334 at gmail.com>
Date: Tue Nov 30 17:27:27 2010 +0200
Translation update done using Pootle.
commit 012b2df612d7ece8e97549300ac2e9141ba7682c
Author: Domen <dbc334 at gmail.com>
Date: Tue Nov 30 17:27:24 2010 +0200
Translation update done using Pootle.
commit de145456e94e7b43b301642df66d85681de94de7
Author: Domen <dbc334 at gmail.com>
Date: Tue Nov 30 17:27:18 2010 +0200
Translation update done using Pootle.
commit 7ae3ce83f0e357ce1835b09af63cd9df005c3de6
Author: Domen <dbc334 at gmail.com>
Date: Tue Nov 30 17:27:04 2010 +0200
Translation update done using Pootle.
commit 6ebf2eb03b9f0a3e1a80826f3eb07e76b080e2ec
Author: Domen <dbc334 at gmail.com>
Date: Tue Nov 30 17:26:08 2010 +0200
Translation update done using Pootle.
commit bdbc6e02393baa65ef3f3278a77ec61d8f4cc4b9
Author: Domen <dbc334 at gmail.com>
Date: Tue Nov 30 17:25:07 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/sl.po | 56 +++++++++++++++++++++++---------------------------------
1 files changed, 23 insertions(+), 33 deletions(-)
diff --git a/po/sl.po b/po/sl.po
index 4fbe1a5..b9e43f3 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -3,16 +3,16 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-11-30 12:47-0500\n"
-"PO-Revision-Date: 2010-11-03 01:25+0200\n"
+"POT-Creation-Date: 2010-11-20 07:34-0500\n"
+"PO-Revision-Date: 2010-11-30 17:31+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"
-"Language: sl\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
@@ -412,11 +412,11 @@ msgstr "Za prikaz morate izbrati morate vsaj en stolpec"
#: db_qbe.php:182
msgid "Switch to"
-msgstr ""
+msgstr "Preklopi na"
#: db_qbe.php:186
msgid "visual builder"
-msgstr ""
+msgstr "vidni graditelj"
#: db_qbe.php:219 libraries/db_structure.lib.php:95
#: libraries/display_tbl.lib.php:860
@@ -1114,7 +1114,7 @@ msgstr "Izberite stolpec za prikaz"
#: js/messages.php:98
msgid "Add an option for column "
-msgstr ""
+msgstr "Dodaj možnost za stolpec "
#: js/messages.php:101
msgid "Generate password"
@@ -2889,15 +2889,14 @@ msgid "Changes tracking"
msgstr "Sledenje spremembam"
#: libraries/config/messages.inc.php:202
-#, fuzzy
#| msgid ""
#| "Tracking of changes made in database. Requires configured PMA database."
msgid ""
"Tracking of changes made in database. Requires the phpMyAdmin configuration "
"storage."
msgstr ""
-"Sledenje spremembam narejenih v zbirki podatkov. Potrebuje konfigurirano "
-"zbirko podatkov PMA."
+"Sledenje spremembam narejenih v zbirki podatkov. Potrebuje hrambo "
+"konfiguracije phpMyAdmin."
#: libraries/config/messages.inc.php:203
msgid "Customize export options"
@@ -3029,7 +3028,7 @@ msgstr "Delni uvoz: dovoli prekinitev"
#: libraries/config/messages.inc.php:238 libraries/config/messages.inc.php:245
#: libraries/import/csv.php:26 libraries/import/ldi.php:39
msgid "Do not abort on INSERT error"
-msgstr ""
+msgstr "Ne prekini ob napaki INSERT"
#: libraries/config/messages.inc.php:239 libraries/config/messages.inc.php:247
#: libraries/import/csv.php:25 libraries/import/ldi.php:38
@@ -4722,13 +4721,11 @@ msgid "Options"
msgstr "Možnosti"
#: libraries/display_tbl.lib.php:558 libraries/display_tbl.lib.php:568
-#, fuzzy
#| msgid "Partial Texts"
msgid "Partial texts"
msgstr "Delna besedila"
#: libraries/display_tbl.lib.php:559 libraries/display_tbl.lib.php:572
-#, fuzzy
#| msgid "Full Texts"
msgid "Full texts"
msgstr "Polna besedila"
@@ -6837,7 +6834,7 @@ msgstr ""
"phpMyAdmin enkrat že konfiguriran."
#: main.php:304
-#, fuzzy, php-format
+#, php-format
#| msgid ""
#| "The phpMyAdmin configuration storage has been deactivated. To find out "
#| "why click %shere%s."
@@ -6845,8 +6842,9 @@ msgid ""
"The phpMyAdmin configuration storage is not completely configured, some "
"extended features have been deactivated. To find out why click %shere%s."
msgstr ""
-"Hramba konfiguracije phpMyAdmin je bila onemogočena. Če želite izvedeti "
-"zakaj, kliknite %stukaj%s."
+"Hramba konfiguracije phpMyAdmin ni konfigurirana v celoti, zato so bile "
+"nekatere razširjene zmožnosti onemogočene. Če želite izvedeti zakaj, "
+"kliknite %stukaj%s."
#: main.php:319
msgid ""
@@ -6956,10 +6954,9 @@ msgid "Import/Export coordinates for PDF schema"
msgstr "Uvozi/Izvozi koordinate za PDF-shemo"
#: pmd_general.php:122
-#, fuzzy
#| msgid "Submit Query"
msgid "Build Query"
-msgstr "Izvedi poizvedbo"
+msgstr "Zgradi poizvedbo"
#: pmd_general.php:127
msgid "Move Menu"
@@ -6982,42 +6979,36 @@ msgid "Delete relation"
msgstr "Izbriši razmerje"
#: pmd_general.php:462 pmd_general.php:521
-#, fuzzy
#| msgid "Relation deleted"
msgid "Relation operator"
-msgstr "Relacija je izbrisana"
+msgstr "Operator razmerja"
#: pmd_general.php:472 pmd_general.php:531 pmd_general.php:654
#: pmd_general.php:771
-#, fuzzy
#| msgid "Export"
msgid "Except"
-msgstr "Izvozi"
+msgstr "Razen"
#: pmd_general.php:478 pmd_general.php:537 pmd_general.php:660
#: pmd_general.php:777
-#, fuzzy
#| msgid "in query"
msgid "subquery"
-msgstr "v poizvedbi"
+msgstr "podpoizvedba"
#: pmd_general.php:482 pmd_general.php:578
-#, fuzzy
#| msgid "Rename view to"
msgid "Rename to"
-msgstr "Preimenuj pogled v"
+msgstr "Preimenuj v"
#: pmd_general.php:484 pmd_general.php:583
-#, fuzzy
#| msgid "User name"
msgid "New name"
-msgstr "Uporabniško ime"
+msgstr "Novo ime"
#: pmd_general.php:487 pmd_general.php:702
-#, fuzzy
#| msgid "Create"
msgid "Aggregate"
-msgstr "Ustvari"
+msgstr "Agregat"
#: pmd_general.php:489 pmd_general.php:509 pmd_general.php:631
#: pmd_general.php:644 pmd_general.php:707 pmd_general.php:761
@@ -7026,10 +7017,9 @@ msgid "Operator"
msgstr "Operator"
#: pmd_general.php:812
-#, fuzzy
#| msgid "Table options"
msgid "Active options"
-msgstr "Možnosti tabele"
+msgstr "Dejavne možnosti"
#: pmd_help.php:26
msgid "To select relation, click :"
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list