[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1413-g8b290ea - Git

7 Apr 2010

The branch, master has been updated
       via  8b290ea2ab0716ec365482d3e548a39e2b83468d (commit)
       via  35950b34f68f8f3bda680a4fa95b415e13b87779 (commit)
       via  60147604c09ab7f0666faffcf8639fd63db6dfc1 (commit)
       via  a735facb8766b409f09f24e98de38d8698317ba1 (commit)
       via  a66e032f6e1458366998f67bba159ec8263959aa (commit)
       via  0a72536bd54f32550488b3f0191a006c9a16d308 (commit)
       via  6435e1e7084ebafd705b0250336131b0f58d3437 (commit)
       via  fdfcb4e0cea18716b33ac45ba672b4a9b33c27cf (commit)
       via  d78136c1230acc9786998e3b0eb02f523a76ddd0 (commit)
       via  87aee336a043f781f290e03b11d4bef2c87beff9 (commit)
       via  5523ddf7a34c64657f2baf61554dc1390b333843 (commit)
       via  42d1788fdbd6d58e3591201f848b7ea5704d52ef (commit)
       via  ab6afd7d05df4f6e5cac098a6cab32f77b7f1a0a (commit)
       via  a40beba04ac04952641928aff7315e2f51e8cf08 (commit)
       via  918a18d9367e47607e25ed815dfa09c19e191bc3 (commit)
       via  cb4a45380014b90bc82c07ccb6540a730bf68a14 (commit)
       via  1f27a0f63c08e977d2e80f3f0de433226113a607 (commit)
       via  54531c4d156009e3412943f13e8e66e48c1c40fa (commit)
       via  52159928908c56499e0d991fa289f377bd81efe6 (commit)
       via  c5b313676bbce57d95605debc4c7b2995fc4b279 (commit)
       via  5f78fa38a33e0186aa538eaac61da693074f3a7f (commit)
       via  9a9035b0eac5a780df4b844c5d94474ea53d6d2d (commit)
      from  f472cb149833bef5ec43e47f440592a354da38fd (commit)
- Log -----------------------------------------------------------------
commit 8b290ea2ab0716ec365482d3e548a39e2b83468d
Merge: 35950b34f68f8f3bda680a4fa95b415e13b87779 f472cb149833bef5ec43e47f440592a354da38fd
Author: Michal Čihař michal@cihar.com
Date:   Tue Apr 6 20:40:07 2010 +0200
Merge remote branch 'origin/master'
commit 35950b34f68f8f3bda680a4fa95b415e13b87779
Merge: 60147604c09ab7f0666faffcf8639fd63db6dfc1 99ee848285591602ba54988415496b79a220981d
Author: Michal Čihař michal@cihar.com
Date:   Tue Apr 6 14:40:09 2010 +0200
Merge remote branch 'origin/master'
commit 60147604c09ab7f0666faffcf8639fd63db6dfc1
Author: sven.erik.andersen sven.erik.andersen@gmail.com
Date:   Tue Apr 6 14:28:14 2010 +0200
Translation update done using Pootle.
commit a735facb8766b409f09f24e98de38d8698317ba1
Author: sven.erik.andersen sven.erik.andersen@gmail.com
Date:   Tue Apr 6 14:27:47 2010 +0200
Translation update done using Pootle.
commit a66e032f6e1458366998f67bba159ec8263959aa
Author: sven.erik.andersen sven.erik.andersen@gmail.com
Date:   Tue Apr 6 14:27:39 2010 +0200
Translation update done using Pootle.
commit 0a72536bd54f32550488b3f0191a006c9a16d308
Author: sven.erik.andersen sven.erik.andersen@gmail.com
Date:   Tue Apr 6 14:27:31 2010 +0200
Translation update done using Pootle.
commit 6435e1e7084ebafd705b0250336131b0f58d3437
Author: sven.erik.andersen sven.erik.andersen@gmail.com
Date:   Tue Apr 6 14:27:25 2010 +0200
Translation update done using Pootle.
commit fdfcb4e0cea18716b33ac45ba672b4a9b33c27cf
Author: sven.erik.andersen sven.erik.andersen@gmail.com
Date:   Tue Apr 6 14:27:18 2010 +0200
Translation update done using Pootle.
commit d78136c1230acc9786998e3b0eb02f523a76ddd0
Author: sven.erik.andersen sven.erik.andersen@gmail.com
Date:   Tue Apr 6 14:27:11 2010 +0200
Translation update done using Pootle.
commit 87aee336a043f781f290e03b11d4bef2c87beff9
Author: sven.erik.andersen sven.erik.andersen@gmail.com
Date:   Tue Apr 6 14:27:03 2010 +0200
Translation update done using Pootle.
commit 5523ddf7a34c64657f2baf61554dc1390b333843
Author: sven.erik.andersen sven.erik.andersen@gmail.com
Date:   Tue Apr 6 14:26:53 2010 +0200
Translation update done using Pootle.
commit 42d1788fdbd6d58e3591201f848b7ea5704d52ef
Author: sven.erik.andersen sven.erik.andersen@gmail.com
Date:   Tue Apr 6 14:26:43 2010 +0200
Translation update done using Pootle.
commit ab6afd7d05df4f6e5cac098a6cab32f77b7f1a0a
Author: sven.erik.andersen sven.erik.andersen@gmail.com
Date:   Tue Apr 6 14:26:20 2010 +0200
Translation update done using Pootle.
commit a40beba04ac04952641928aff7315e2f51e8cf08
Author: sven.erik.andersen sven.erik.andersen@gmail.com
Date:   Tue Apr 6 14:26:11 2010 +0200
Translation update done using Pootle.
commit 918a18d9367e47607e25ed815dfa09c19e191bc3
Author: sven.erik.andersen sven.erik.andersen@gmail.com
Date:   Tue Apr 6 14:25:52 2010 +0200
Translation update done using Pootle.
commit cb4a45380014b90bc82c07ccb6540a730bf68a14
Author: sven.erik.andersen sven.erik.andersen@gmail.com
Date:   Tue Apr 6 14:25:30 2010 +0200
Translation update done using Pootle.
commit 1f27a0f63c08e977d2e80f3f0de433226113a607
Author: sven.erik.andersen sven.erik.andersen@gmail.com
Date:   Tue Apr 6 14:25:18 2010 +0200
Translation update done using Pootle.
commit 54531c4d156009e3412943f13e8e66e48c1c40fa
Author: sven.erik.andersen sven.erik.andersen@gmail.com
Date:   Tue Apr 6 14:25:10 2010 +0200
Translation update done using Pootle.
commit 52159928908c56499e0d991fa289f377bd81efe6
Author: sven.erik.andersen sven.erik.andersen@gmail.com
Date:   Tue Apr 6 14:24:55 2010 +0200
Translation update done using Pootle.
commit c5b313676bbce57d95605debc4c7b2995fc4b279
Author: sven.erik.andersen sven.erik.andersen@gmail.com
Date:   Tue Apr 6 14:24:35 2010 +0200
Translation update done using Pootle.
commit 5f78fa38a33e0186aa538eaac61da693074f3a7f
Author: sven.erik.andersen sven.erik.andersen@gmail.com
Date:   Tue Apr 6 14:24:17 2010 +0200
Translation update done using Pootle.
commit 9a9035b0eac5a780df4b844c5d94474ea53d6d2d
Author: sven.erik.andersen sven.erik.andersen@gmail.com
Date:   Tue Apr 6 14:24:03 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
 po/nb.po |   66 +++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/po/nb.po b/po/nb.po
index fee19a8..55d42c9 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,13 +4,13 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-04-02 13:41+0200\n"
-"PO-Revision-Date: 2010-03-30 23:13+0200\n"
-"Last-Translator: Michal michal@cihar.com\n"
+"PO-Revision-Date: 2010-04-06 14:28+0200\n"
+"Last-Translator:  sven.erik.andersen@gmail.com\n"
 "Language-Team: norwegian no@li.org\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.1\n"
@@ -57,37 +57,36 @@ msgstr "en"
#: libraries/common.lib.php:1276
 msgid "Inline edit of this query"
-msgstr ""
+msgstr "Inline redigering av denne spørringa"
#: libraries/common.lib.php:1278
-#, fuzzy
 #| msgid "Engines"
 msgid "Inline"
-msgstr "Motorer"
+msgstr "Inline"
#: libraries/Message.class.php:282
-#, fuzzy, php-format
+#, php-format
 #| msgid "%1$d row(s) affected."
 msgid "%1$d row affected."
 msgid_plural "%1$d rows affected."
-msgstr[0] "%1$d rad(er) berørt."
-msgstr[1] "%1$d rad(er) berørt."
+msgstr[0] "%1$d rad berørt."
+msgstr[1] "%1$d rader berørt."
#: libraries/Message.class.php:301
-#, fuzzy, php-format
+#, php-format
 #| msgid "%1$d row(s) deleted."
 msgid "%1$d row deleted."
 msgid_plural "%1$d rows deleted."
-msgstr[0] "%1$d rad(er) slettet."
-msgstr[1] "%1$d rad(er) slettet."
+msgstr[0] "%1$d rader slettet."
+msgstr[1] "%1$d rader slettet."
#: libraries/Message.class.php:320
-#, fuzzy, php-format
+#, php-format
 #| msgid "%1$d row(s) inserted."
 msgid "%1$d row inserted."
 msgid_plural "%1$d rows inserted."
-msgstr[0] "%1$d rad(er) innsatt."
-msgstr[1] "%1$d rad(er) innsatt."
+msgstr[0] "%1$d rader innsatt."
+msgstr[1] "%1$d rader innsatt."
#. l10n: Text direction, use either ltr or rtl
 #: libraries/messages.inc.php:19
@@ -6538,10 +6537,11 @@ msgstr "PMA database"
 #: setup/lib/messages.inc.php:133
 msgid "Tracking of changes made in database. Requires configured PMA database."
 msgstr ""
+"Sporing av endringer utført i databasen. PMA database må være konfigurert."
#: setup/lib/messages.inc.php:134
 msgid "Changes tracking"
-msgstr ""
+msgstr "Endringssporing"
#: setup/lib/messages.inc.php:135
 msgid "Customization"
@@ -7251,7 +7251,6 @@ msgid "SQL query history table"
 msgstr "SQL spørringshistorietabell"
#: setup/lib/messages.inc.php:279
-#, fuzzy
 #| msgid ""
 #| "Leave blank for no SQL query history support, suggested: [kbd]pma_history"
 #| "[/kbd]"
@@ -7259,13 +7258,13 @@ msgid ""
 "Leave blank for no SQL query tracking support, suggested: [kbd]pma_tracking[/"
 "kbd]"
 msgstr ""
-"La stå tom for ingen SQL spørringshistorie, anbefalt: [kbd]pma_history[/kbd]"
+"La stå tom for ingen SQL spørringshistorie, anbefalt: "
+"[kbd]pma_tracking[/kbd]"
#: setup/lib/messages.inc.php:280
-#, fuzzy
 #| msgid "SQL query history table"
 msgid "SQL query tracking table"
-msgstr "SQL spørringshistorietabell"
+msgstr "SQL spørringssporingstabell"
#: setup/lib/messages.inc.php:281
 msgid "Hostname where MySQL server is running"
@@ -7376,52 +7375,59 @@ msgid ""
 "Whether the tracking mechanism creates versions for tables and views "
 "automatically."
 msgstr ""
+"Om sporingsmekanismen oppretter versjoner for tabeller og visninger "
+"automatisk."
#: setup/lib/messages.inc.php:304
-#, fuzzy
 #| msgid "Automatic recovery mode"
 msgid "Automatically create versions"
-msgstr "Automatisk gjennopprettignsmodus"
+msgstr "Automatisk opprette versjoner"
#: setup/lib/messages.inc.php:305
 msgid "Defines the list of statements the auto-creation uses for new versions."
 msgstr ""
+"Definerer lista med spørringer autoopprettinga bruker for nye versjoner."
#: setup/lib/messages.inc.php:306
-#, fuzzy
 #| msgid "Statements"
 msgid "Statements to track"
-msgstr "Oversikt"
+msgstr "Spørringer som skal spores"
#: setup/lib/messages.inc.php:307
 msgid ""
 "Whether a DROP VIEW IF EXISTS statement will be added as first line to the "
 "log when creating a view."
 msgstr ""
+"Om en DROP VIEW IF EXISTS spørring vil bli lagt til som første linje i "
+"loggen når opprettes en visning."
#: setup/lib/messages.inc.php:308
 msgid "Add DROP VIEW"
-msgstr ""
+msgstr "Legg til DROP VIEW"
#: setup/lib/messages.inc.php:309
 msgid ""
 "Whether a DROP TABLE IF EXISTS statement will be added as first line to the "
 "log when creating a table."
 msgstr ""
+"Om en DROP TABLE IF EXISTS spørring vil bli lagt til som første linje til "
+"loggen når oppretter en tabell."
#: setup/lib/messages.inc.php:310
 msgid "Add DROP TABLE"
-msgstr ""
+msgstr "Legg til DROP TABLE"
#: setup/lib/messages.inc.php:311
 msgid ""
 "Whether a DROP DATABASE IF EXISTS statement will be added as first line to "
 "the log when creating a database."
 msgstr ""
+"Om en DROP DATABASE IF EXISTS spørring skal bli lagt til som første linje i "
+"loggen når oppretter en database."
#: setup/lib/messages.inc.php:312
 msgid "Add DROP DATABASE"
-msgstr ""
+msgstr "Legg til DROP DATABASE"
#: setup/lib/messages.inc.php:313
 msgid "You should use SSL connections if your web server supports it"
@@ -7703,7 +7709,7 @@ msgstr ""
 "versjon er %s, utgitt den %s."
#: setup/lib/messages.inc.php:372
-#, fuzzy, php-format
+#, php-format
 #| msgid ""
 #| "You are using subversion version, run [kbd]svn update[/kbd] :-)[br]The "
 #| "latest stable version is %s, released on %s."
@@ -7711,8 +7717,8 @@ msgid ""
 "You are using Git version, run [kbd]git pull[/kbd] :-)[br]The latest stable "
 "version is %s, released on %s."
 msgstr ""
-"Du bruker subversion versjon, kjør [kbd]svn update[/kbd] :-)[br]Den siste "
-"stabile versjon er %s, utgutt den %s."
+"Du bruker Git versjon, kjør [kbd]git pull[/kbd] :-)[br]Den siste stabile "
+"versjon er %s, utgitt den %s."
#: setup/lib/messages.inc.php:373
 msgid "No newer stable version is available"
hooks/post-receive
-- 
phpMyAdmin


    