[evolvis-commits] r12554: Merged from lenny maintenance branch (up until 4.7~rc2-3)
mirabilos at evolvis.org
mirabilos at evolvis.org
Mon Feb 28 01:45:51 CET 2011
Author: mirabilos
Date: 2011-02-28 01:45:51 +0100 (Mon, 28 Feb 2011)
New Revision: 12554
Modified:
trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog
trunk/gforge_base/evolvisforge-5.1/gforge/common/forum/Forum.class.php
trunk/gforge_base/evolvisforge-5.1/gforge/common/forum/ForumFactory.class.php
trunk/gforge_base/evolvisforge-5.1/gforge/common/pm/ProjectGroup.class.php
trunk/gforge_base/evolvisforge-5.1/gforge/common/pm/ProjectGroupFactory.class.php
trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactType.class.php
trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactTypeFactory.class.php
trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/install-chroot.sh
trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/sv.po
trunk/gforge_base/evolvisforge-5.1/gforge/plugins/webcalendar/www/index2.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/pm/msproject/msp.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/admin/form-extrafieldcopy.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/mod.php
Log:
Merged from lenny maintenance branch (up until 4.7~rc2-3)
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog 2011-02-28 00:45:44 UTC (rev 12553)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog 2011-02-28 00:45:51 UTC (rev 12554)
@@ -1,3 +1,18 @@
+2008-09-03 Roland Mas <lolando at debian.org>
+
+ * common/tracker/ArtifactType.class.php: Fixed PostgreSQL 8.3
+ compatibility by explicitly converting role_setting.value to an
+ integer.
+ * common/tracker/ArtifactTypeFactory.class.php: Ditto.
+ * common/pm/ProjectGroup.class.php: Ditto.
+ * common/pm/ProjectGroupFactory.class.php: Ditto.
+ * common/forum/Forum.class.php: Ditto.
+ * common/forum/ForumFactory.class.php: Ditto.
+ * plugins/webcalendar/www/index2.php: Ditto.
+ * www/pm/msproject/msp.php: Ditto.
+ * www/tracker/admin/form-extrafieldcopy.php: Ditto.
+ * www/tracker/mod.php: Ditto.
+
2008-08-18 Roland Mas <lolando at debian.org>
* common/include/PluginManager.class.php: Allow return values for
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/forum/Forum.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/forum/Forum.class.php 2011-02-28 00:45:44 UTC (rev 12553)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/forum/Forum.class.php 2011-02-28 00:45:51 UTC (rev 12554)
@@ -421,7 +421,7 @@
FROM user_group, role_setting
WHERE role_setting.section_name='forum'
AND role_setting.ref_id='".$this->getID()."'
- AND role_setting.value > 1
+ AND role_setting.value::integer > 1
AND user_group.role_id = role_setting.role_id";
$result = db_query($sql);
return util_result_column_to_array($result);
@@ -771,7 +771,7 @@
return -1;
} else {
if (!isset($this->current_user_perm)) {
- $sql="SELECT role_setting.value
+ $sql="SELECT role_setting.value::integer
FROM role_setting, user_group
WHERE role_setting.ref_id='". $this->getID() ."'
AND user_group.role_id = role_setting.role_id
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/forum/ForumFactory.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/forum/ForumFactory.class.php 2011-02-28 00:45:44 UTC (rev 12553)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/forum/ForumFactory.class.php 2011-02-28 00:45:51 UTC (rev 12554)
@@ -106,7 +106,7 @@
} else {
$exists=" AND group_forum_id IN (SELECT role_setting.ref_id
FROM role_setting, user_group
- WHERE role_setting.value >= 0
+ WHERE role_setting.value::integer >= 0
AND role_setting.section_name = 'forum'
AND role_setting.ref_id=forum_group_list_vw.group_forum_id
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/pm/ProjectGroup.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/pm/ProjectGroup.class.php 2011-02-28 00:45:44 UTC (rev 12553)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/pm/ProjectGroup.class.php 2011-02-28 00:45:51 UTC (rev 12554)
@@ -323,7 +323,7 @@
WHERE users.user_id=user_group.user_id
AND role_setting.role_id=user_group.role_id
AND role_setting.ref_id='". $this->getID() ."'
- AND role_setting.value IN (1,2)
+ AND role_setting.value::integer IN (1,2)
AND role_setting.section_name='pm'
ORDER BY users.realname";
$this->technicians=db_query($sql);
@@ -602,7 +602,7 @@
return -1;
} else {
if (!isset($this->current_user_perm)) {
- $sql="SELECT role_setting.value
+ $sql="SELECT role_setting.value::integer
FROM role_setting, user_group
WHERE role_setting.ref_id='". $this->getID() ."'
AND user_group.role_id = role_setting.role_id
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/pm/ProjectGroupFactory.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/pm/ProjectGroupFactory.class.php 2011-02-28 00:45:44 UTC (rev 12553)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/pm/ProjectGroupFactory.class.php 2011-02-28 00:45:51 UTC (rev 12554)
@@ -102,7 +102,7 @@
} else {
$exists=" AND group_project_id IN (SELECT role_setting.ref_id
FROM role_setting, user_group
- WHERE role_setting.value >= 0
+ WHERE role_setting.value::integer >= 0
AND role_setting.section_name = 'pm'
AND role_setting.ref_id=project_group_list_vw.group_project_id
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactType.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactType.class.php 2011-02-28 00:45:44 UTC (rev 12553)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactType.class.php 2011-02-28 00:45:51 UTC (rev 12554)
@@ -1015,7 +1015,7 @@
return 0;
} else {
if (!isset($this->current_user_perm)) {
- $sql="SELECT role_setting.value
+ $sql="SELECT role_setting.value::integer
FROM role_setting, user_group
WHERE role_setting.ref_id='". $this->getID() ."'
AND user_group.role_id = role_setting.role_id
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactTypeFactory.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactTypeFactory.class.php 2011-02-28 00:45:44 UTC (rev 12553)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactTypeFactory.class.php 2011-02-28 00:45:51 UTC (rev 12554)
@@ -101,7 +101,7 @@
} else {
$exists=" AND group_artifact_id IN (SELECT role_setting.ref_id
FROM role_setting, user_group
- WHERE role_setting.value >= 0
+ WHERE role_setting.value::integer >= 0
AND role_setting.section_name = 'tracker'
AND role_setting.ref_id=artifact_group_list_vw.group_artifact_id
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/install-chroot.sh
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/install-chroot.sh 2011-02-28 00:45:44 UTC (rev 12553)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/install-chroot.sh 2011-02-28 00:45:51 UTC (rev 12554)
@@ -69,7 +69,7 @@
| cpio --quiet -pdumVLB $CHROOTDIR
# cvs extra
- cp /lib/ld-linux.so.* $CHROOTDIR/lib
+ cp /lib/ld-linux*.so.* $CHROOTDIR/lib
# sshd extras
# pthread cancel
cp /lib/libgcc_s* $CHROOTDIR/lib
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog 2011-02-28 00:45:44 UTC (rev 12553)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog 2011-02-28 00:45:51 UTC (rev 12554)
@@ -6,6 +6,27 @@
-- Christian Bayle <bayle at debian.org> Fri, 15 Aug 2008 20:05:16 +0200
+gforge (4.7~rc2-3) unstable; urgency=low
+
+ * Added explicit cast to fix PostgreSQL 8.3 compatibility (closes:
+ #497512).
+
+ -- Roland Mas <lolando at debian.org> Thu, 04 Sep 2008 09:06:51 +0200
+
+gforge (4.7~rc2-2) unstable; urgency=low
+
+ * Fixed chroot setup on amd64 (closes: #495728).
+
+ -- Roland Mas <lolando at debian.org> Sun, 31 Aug 2008 20:33:58 +0200
+
+gforge (4.7~rc2-1) unstable; urgency=low
+
+ * Changed version number to reflect the upstream tagging of r6582 to
+ 4.7rc2. No changes in code.
+ * Updated Debconf template translations for Swedish (closes: #492883).
+
+ -- Roland Mas <lolando at debian.org> Tue, 19 Aug 2008 21:19:03 +0200
+
gforge (4.6.99+svn6582-1) unstable; urgency=low
* Removed from gforge-plugins-extra a few files that were also present
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/sv.po
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/sv.po 2011-02-28 00:45:44 UTC (rev 12553)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/sv.po 2011-02-28 00:45:51 UTC (rev 12554)
@@ -1,3 +1,4 @@
+# translation of gforge_4.6.99+svn6580-1_sv.po to Swedish
# Translators, if you are not familiar with the PO format, gettext
# documentation is worth reading, especially sections dedicated to
# this format, e.g. by running:
@@ -7,55 +8,51 @@
# /usr/share/doc/po-debconf/README-trans
# or http://www.debian.org/intl/l10n/po-debconf/README-trans
# Developers do not need to manually edit POT or PO files.
-# , fuzzy
#
-#
+# Martin Ågren <martin.agren at gmail.com>, 2008.
msgid ""
msgstr ""
-"Project-Id-Version: gforge 3.1-31\n"
+"Project-Id-Version: gforge_4.6.99+svn6580-1_sv\n"
"Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
"POT-Creation-Date: 2008-02-26 22:50+0100\n"
-"PO-Revision-Date: 2007-12-23 11:06+0100\n"
-"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
-"Language-Team: Swedish <sv at li.org>\n"
+"PO-Revision-Date: 2008-07-29 18:44+0200\n"
+"Last-Translator: Martin Ågren <martin.agren at gmail.com>\n"
+"Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: sv\n"
"X-Poedit-Country: sv\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. Type: string
#. Description
#: ../gforge-db-postgresql.templates.dsfh-in:3001
#: ../dsf-helper/shellhost-variables.templates:2001
-#, fuzzy
msgid "Shell server:"
-msgstr "Din skalserver"
+msgstr "Skalserver:"
#. Type: string
#. Description
#: ../gforge-db-postgresql.templates.dsfh-in:3001
-#, fuzzy
msgid ""
"Please enter the hostname of the server that will host the GForge shell "
"accounts."
-msgstr "Värdnamnet för servern som tillhandahåller dina skalkonton för Gforge"
+msgstr "Ange värdnamnet för servern som kommer tillhandahålla skalkonton för GForge."
#. Type: string
#. Description
#: ../gforge-db-postgresql.templates.dsfh-in:6001
#: ../dsf-helper/downloadhost-variables.templates:2001
-#, fuzzy
msgid "Download server:"
-msgstr "Din hämtningsserver"
+msgstr "Hämtningsserver:"
#. Type: string
#. Description
#: ../gforge-db-postgresql.templates.dsfh-in:6001
-#, fuzzy
-msgid ""
-"Please enter the hostname of the server that will host the GForge packages."
-msgstr "Värdnamnet för servern som tillhandahåller dina skalkonton för Gforge"
+msgid "Please enter the hostname of the server that will host the GForge packages."
+msgstr "Ange värdnamnet för servern som kommer tillhandahålla GForge-paketen."
#. Type: string
#. Description
@@ -64,14 +61,13 @@
#: ../dsf-helper/lists-variables.templates:2001
#: ../dsf-helper/users-variables.templates:2001
msgid "It should not be the same as the main GForge host."
-msgstr ""
+msgstr "Det ska inte vara samma som huvudvärden för GForge."
#. Type: string
#. Description
#: ../gforge-db-postgresql.templates.dsfh-in:8001
-#, fuzzy
msgid "GForge administrator login:"
-msgstr "Gforge-administratörens användarnamn"
+msgstr "GForge-administratörens användarnamn:"
#. Type: string
#. Description
@@ -79,66 +75,60 @@
#. Description
#: ../gforge-db-postgresql.templates.dsfh-in:8001
#: ../gforge-db-postgresql.templates.dsfh-in:10001
-#, fuzzy
msgid ""
"The GForge administrator account will have full privileges on the system. It "
"will be used to approve the creation of new projects."
msgstr ""
-"Detta Gforge-konto kommer att ha alla rättigheter i Gforge-systemet. Det "
-"behövs för att godkänna skapandet av projekten."
+"Administratörskontot för GForge kommer att ha alla rättigheter i GForge-systemet. "
+"Det behövs för att godkänna skapandet av projekten."
#. Type: string
#. Description
#: ../gforge-db-postgresql.templates.dsfh-in:8001
msgid "Please choose the username for this account."
-msgstr ""
+msgstr "Ange användarnamnet för detta konto."
#. Type: string
#. Description
#: ../gforge-db-postgresql.templates.dsfh-in:9001
#: ../dsf-helper/host-variables.templates:2001
-#, fuzzy
msgid "IP address:"
-msgstr "Din IP-adress"
+msgstr "IP-adress:"
#. Type: string
#. Description
#: ../gforge-db-postgresql.templates.dsfh-in:9001
#: ../dsf-helper/host-variables.templates:2001
-#, fuzzy
msgid ""
"Please enter the IP address of the server that will host the GForge "
"installation."
-msgstr "Värdnamnet för servern som tillhandahåller dina skalkonton för Gforge"
+msgstr "Ange IP-adressen för servern som kommer tillhandahålla GForge-installationen."
#. Type: string
#. Description
#: ../gforge-db-postgresql.templates.dsfh-in:9001
#: ../dsf-helper/host-variables.templates:2001
msgid "This is needed for the configuration of Apache virtual hosting."
-msgstr ""
+msgstr "Detta krävs för att konfigurera Apaches virtuella värd."
#. Type: password
#. Description
#: ../gforge-db-postgresql.templates.dsfh-in:10001
-#, fuzzy
msgid "GForge administrator password:"
-msgstr "Gforge-administratörens lösenord"
+msgstr "GForge-administratörens lösenord:"
#. Type: password
#. Description
#: ../gforge-db-postgresql.templates.dsfh-in:10001
-#, fuzzy
msgid "Please choose the password for this account."
-msgstr "Mata in lösenordet igen för bekräftelse."
+msgstr "Mata in lösenordet för detta konto."
#. Type: password
#. Description
#: ../gforge-db-postgresql.templates.dsfh-in:11001
#: ../dsf-helper/dbpasswd-variables.templates:3001
-#, fuzzy
msgid "Password confirmation:"
-msgstr "Mata in lösenordet igen för bekräftelse."
+msgstr "Lösenordsbekräftelse:"
#. Type: password
#. Description
@@ -150,45 +140,40 @@
#. Type: string
#. Description
#: ../gforge-db-postgresql.templates.dsfh-in:12001
-#, fuzzy
msgid "Initial list of skills:"
-msgstr "Initiala listan av färdigheter"
+msgstr "Initiala listan över färdigheter:"
#. Type: string
#. Description
#: ../gforge-db-postgresql.templates.dsfh-in:12001
-#, fuzzy
msgid ""
"GForge allows users to define a list of their skills, to be chosen from "
"those present in the database. This list is the initial list of skills that "
"will enter the database."
msgstr ""
-"Gforge låter användarna definiera en lista på sina färdigheter som kan "
-"väljas av de som finns i databasen. Denna lista är den initiala listan av "
-"färdigheter som kommer att läggas in i databasen. Mata in namn på "
-"färdigheter, separera dem med semikolon \";\"."
+"GForge låter användarna definiera en lista över sina färdigheter, som kan "
+"väljas av de som finns i databasen. Denna lista är den initiala listan "
+"som kommer att läggas in i databasen."
#. Type: string
#. Description
#: ../gforge-db-postgresql.templates.dsfh-in:12001
msgid "Please enter a semicolon-separated list of skill names."
-msgstr ""
+msgstr "Mata in namn på färdigheter, separerade med semikolon."
#. Type: boolean
#. Description
#. Translators: SCM here means "Source Control Management"
#. (cvs, svn, etc.)
#: ../gforge-dns-bind9.templates.dsfh-in:3001
-#, fuzzy
msgid "Do you want a simple DNS setup for GForge?"
-msgstr "Vill du ha en enkel DNS-konfiguration?"
+msgstr "Vill du ha en enkel DNS-konfiguration för GForge?"
#. Type: boolean
#. Description
#. Translators: SCM here means "Source Control Management"
#. (cvs, svn, etc.)
#: ../gforge-dns-bind9.templates.dsfh-in:3001
-#, fuzzy
msgid ""
"You can use a simple DNS setup with wildcards to map all project web-hosts "
"to a single IP address, and direct all the scm-hosts to a single SCM server, "
@@ -196,147 +181,130 @@
"servers."
msgstr ""
"Du kan ha en enkel DNS-konfiguration som använder jokertecken för att peka "
-"alla projektwebbplatser till en enda IP-adress och vidaresända alla scm-"
-"värdar till en enda SCM-server, eller en komplex konfiguration som låter dig "
-"att ha många servrar som projektwebbservrar eller SCM-servrar."
+"alla projektwebbplatser till en enda IP-adress och vidaresända alla källkodshanterings"
+"värdar till en enda källkodshanteringsserver, eller en komplex konfiguration som låter "
+"dig ha många servrar som projektwebbservrar eller källkodshanteringsservrar."
#. Type: boolean
#. Description
#. Translators: SCM here means "Source Control Management"
#. (cvs, svn, etc.)
#: ../gforge-dns-bind9.templates.dsfh-in:3001
-#, fuzzy
msgid ""
"Even if you use a simple DNS setup, you can still use separate machines as "
"project servers; it just assumes that all the project web directories are on "
"the same server with a single SCM server."
msgstr ""
-"Även om du har en enkel DNS-konfiguration kan du fortfarande ha separata "
-"burkar för dina projektservrar, den antar att du har alla projektens "
-"webbkataloger på samma server och en enda server för SCM."
+"Även om du har en enkel DNS-konfiguration, kan du fortfarande ha separata "
+"maskiner för dina projektservrar; den antar bara att du har alla projektens "
+"webbkataloger på samma server och en enda källkodshanteringsserver."
#. Type: boolean
#. Description
#: ../gforge-mta-postfix.templates.dsfh-in:3001
-#, fuzzy
msgid "Do you want mail to ${noreply} to be discarded?"
msgstr "Vill du att e-post till ${noreply} ska tas bort?"
#. Type: boolean
#. Description
#: ../gforge-mta-postfix.templates.dsfh-in:3001
-#, fuzzy
msgid ""
"GForge sends and receives plenty of e-mail to and from the \"${noreply}\" "
"address."
msgstr ""
-"Gforge skickar en mängd e-postmeddelanden från adressen \"${noreply}\" och "
-"kanske även några meddelanden till den adressen."
+"GForge skickar och tar emot en mängd e-postmeddelanden till och från "
+"adressen \"${noreply}\"."
#. Type: boolean
#. Description
#: ../gforge-mta-postfix.templates.dsfh-in:3001
-#, fuzzy
msgid ""
"E-mail to that address should be directed to a black hole (/dev/null), "
"unless you have another use for that address."
msgstr ""
-"Det rekommenderas att du låter detta paket peka e-post till den adressen mot "
+"E-post till den adressen ska pekas mot "
"ett svart hål (/dev/null) såvida du inte har andra användningsområden för "
"den adressen."
#. Type: string
#. Description
#: ../dsf-helper/common-variables.templates:2001
-#, fuzzy
msgid "GForge domain or subdomain name:"
-msgstr "Namnet på din Gforge-domän eller underdomän"
+msgstr "Namn på GForge-domänen eller -underdomänen:"
#. Type: string
#. Description
#: ../dsf-helper/common-variables.templates:2001
-#, fuzzy
msgid ""
"Please enter the domain that will host the GForge installation. Some "
"services (scm, lists, etc.) will be given their own subdomain in that domain."
msgstr ""
-"Domänen som kommer att vara värd för din Gforge-installation. Vissa "
-"tjänster kommer att tilldelas sina egna underdomäner i den domänen (scm, "
-"lists, etc.)."
+"Ange den domän som kommer att vara värd för GForge-installationen. Vissa "
+"tjänster (källkodshantering, listor, etc.) kommer att tilldelas sina egna underdomäner i den domänen."
#. Type: string
#. Description
#: ../dsf-helper/common-variables.templates:3001
-#, fuzzy
msgid "GForge administrator e-mail address:"
-msgstr "Gforge-administratörens e-postadress."
+msgstr "GForge-administratörens e-postadress:"
#. Type: string
#. Description
#: ../dsf-helper/common-variables.templates:3001
-#, fuzzy
msgid ""
"Please enter the e-mail address of the GForge administrator of this site. It "
"will be used when problems occur."
msgstr ""
-"E-postadressen för Gforge-administratören på ditt system. Behövs i fall att "
-"problem uppstår."
+"Ange e-postadressen för GForge-administratören på systemet. "
+"Den kommer användas ifall problem uppstår."
#. Type: string
#. Description
#: ../dsf-helper/common-variables.templates:4001
-#, fuzzy
msgid "GForge system name:"
-msgstr "Gforges systemnamn"
+msgstr "GForges systemnamn:"
#. Type: string
#. Description
#: ../dsf-helper/common-variables.templates:4001
-#, fuzzy
msgid ""
"Please enter the name of the GForge system. It is used in various places "
"throughout the system."
-msgstr "Detta namn används på flera ställen i systemet."
+msgstr "Ange namnet på GForge-systemet. Det används på olika ställen i systemet."
#. Type: string
#. Description
#: ../dsf-helper/dbhost-variables.templates:2001
-#, fuzzy
msgid "Database server:"
-msgstr "Din databasserver"
+msgstr "Databasserver:"
#. Type: string
#. Description
#: ../dsf-helper/dbhost-variables.templates:2001
-#, fuzzy
msgid ""
"Please enter the IP address (or hostname) of the server that will host the "
"GForge database."
msgstr ""
-"IP-adressen (eller värdnamnet) för servern som kommer att stå värd för din "
-"Gforge-databas. Detta behövs för nästan alla underpaket."
+"IP-adressen (eller värdnamnet) för servern som kommer tillhandahålla "
+"GForge-databasen."
#. Type: string
#. Description
#: ../dsf-helper/dbhost-variables.templates:3001
-#, fuzzy
msgid "Database name:"
-msgstr "Ditt databasnamn"
+msgstr "Databasnamn:"
#. Type: string
#. Description
#: ../dsf-helper/dbhost-variables.templates:3001
-#, fuzzy
-msgid ""
-"Please enter the name of the database that will host the GForge database."
-msgstr "Värdnamnet för servern som tillhandahåller dina skalkonton för Gforge"
+msgid "Please enter the name of the database that will host the GForge database."
+msgstr "Ange namnet på databasen som kommer tillhandahålla GForge-databasen."
#. Type: string
#. Description
#: ../dsf-helper/dbhost-variables.templates:4001
-#, fuzzy
msgid "Database administrator username:"
-msgstr "Din databasadministratörens användarnamn"
+msgstr "Databasadministratörens användarnamn:"
#. Type: string
#. Description
@@ -345,107 +313,98 @@
"Please enter the username of the database administrator for the server that "
"will host the GForge database."
msgstr ""
+"Ange användarnamnet på databasadministratören för servers "
+"som kommer tillhandahålla GForge-databasen."
#. Type: password
#. Description
#: ../dsf-helper/dbpasswd-variables.templates:2001
-#, fuzzy
msgid "Password used for the database:"
-msgstr "Lösenordet som används för databasen"
+msgstr "Lösenordet som används för databasen:"
#. Type: password
#. Description
#: ../dsf-helper/dbpasswd-variables.templates:2001
msgid "Connections to the database system are authenticated by a password."
-msgstr ""
+msgstr "Uppkopplingar till databassystem autentiseras med ett lösenord."
#. Type: password
#. Description
#: ../dsf-helper/dbpasswd-variables.templates:2001
msgid "Please choose the connection password."
-msgstr ""
+msgstr "Välj uppkopplingslösenordet."
#. Type: string
#. Description
#: ../dsf-helper/downloadhost-variables.templates:2001
-#, fuzzy
-msgid ""
-"Please enter the host name of the server that will host the GForge packages."
-msgstr "Värdnamnet för servern som tillhandahåller dina skalkonton för Gforge"
+msgid "Please enter the host name of the server that will host the GForge packages."
+msgstr "Ange värdnamnet för servern som kommer tillhandahålla GForge-paketen."
#. Type: string
#. Description
#: ../dsf-helper/groupid-variables.templates:2001
-#, fuzzy
msgid "News administrative group ID:"
-msgstr "Grupp-id för nyhetsadministratörerna"
+msgstr "Grupp-id för nyhetsadministratörerna:"
#. Type: string
#. Description
#: ../dsf-helper/groupid-variables.templates:2001
-#, fuzzy
msgid ""
"The members of the news admin group can approve news for the GForge main "
"page. This group's ID must not be 1. This should be changed only if you "
"upgrade from a previous version and want to keep the data."
msgstr ""
-"Medlemmar av nyhetersadministrationsgruppen kan godkänna nyheter för Gforges "
-"förstasida. Detta grupp-id FÅR INTE vara 1. Du behöver bara röra denna "
-"grupp om du uppgraderar från en tidigare version och vill behålla ditt data."
+"Medlemmar i nyhetsadministrationsgruppen kan godkänna nyheter för GForges "
+"förstasida. Detta grupp-id får inte vara 1. Du behöver bara ändra detta "
+"värde om du uppgraderar från en tidigare version och vill behålla ditt data."
#. Type: string
#. Description
#: ../dsf-helper/groupid-variables.templates:3001
msgid "Statistics administrative group ID:"
-msgstr ""
+msgstr "Grupp-id för statistikadministratörerna:"
#. Type: string
#. Description
#: ../dsf-helper/groupid-variables.templates:4001
-#, fuzzy
msgid "Peer rating administrative group ID:"
-msgstr "Grupp-id för användarbedömningsadministratörerna"
+msgstr "Grupp-id för användarbedömningsadministratörerna:"
#. Type: string
#. Description
#: ../dsf-helper/lists-variables.templates:2001
-#, fuzzy
msgid "Mailing lists server:"
-msgstr "Din server för sändlistor"
+msgstr "Server för sändlistor:"
#. Type: string
#. Description
#: ../dsf-helper/lists-variables.templates:2001
-#, fuzzy
msgid ""
"Please enter the host name of the server that will host the GForge mailing "
"lists."
-msgstr "Värdnamnet för servern som tillhandahåller dina skalkonton för Gforge"
+msgstr "Ange värdnamnet för servern som kommer tillhandahålla sändlistorna för GForge."
#. Type: string
#. Description
#: ../dsf-helper/shellhost-variables.templates:2001
-#, fuzzy
msgid ""
"Please enter the host name of the server that will host the GForge shell "
"accounts."
-msgstr "Värdnamnet för servern som tillhandahåller dina skalkonton för Gforge"
+msgstr "Ange värdnamnet för servern som kommer tillhandahålla skalkonton för GForge."
#. Type: string
#. Description
#: ../dsf-helper/users-variables.templates:2001
-#, fuzzy
msgid "User mail redirector server:"
-msgstr "Din relay-server för användarnas e-post"
+msgstr "Omdirigerarserver för användarnas e-post:"
#. Type: string
#. Description
#: ../dsf-helper/users-variables.templates:2001
-#, fuzzy
msgid ""
"Please enter the host name of the server that will host the GForge user mail "
"redirector."
-msgstr "Värdnamnet för servern som tillhandahåller dina skalkonton för Gforge"
+msgstr "Ange värdnamnet för servern som kommer tillhandahålla omdirigerarserver för användarnas e-post för GForge."
#. Type: select
#. Choices
@@ -469,7 +428,7 @@
#. Choices
#: ../dsf-helper/web-variables.templates:2001
msgid "Chinese (Traditional)"
-msgstr ""
+msgstr "Kinesiska (traditionell)"
#. Type: select
#. Choices
@@ -552,9 +511,8 @@
#. Type: select
#. Choices
#: ../dsf-helper/web-variables.templates:2001
-#, fuzzy
msgid "Portuguese (Brazilian)"
-msgstr "Portugisk-Brasilianska"
+msgstr "Portugisiska (brasiliansk)"
#. Type: select
#. Choices
@@ -572,7 +530,7 @@
#. Choices
#: ../dsf-helper/web-variables.templates:2001
msgid "Chinese (Simplified)"
-msgstr ""
+msgstr "Kinesiska (förenklad)"
#. Type: select
#. Choices
@@ -590,45 +548,37 @@
#. Choices
#: ../dsf-helper/web-variables.templates:2001
msgid "Thai"
-msgstr "Thai"
+msgstr "Thailändska"
#. Type: select
#. DefaultChoice
#: ../dsf-helper/web-variables.templates:2002
-#, fuzzy
msgid "English[ Default language]"
-msgstr "Standardspråk"
+msgstr "Engelska[ Standardspråk]"
#. Type: select
#. Description
#: ../dsf-helper/web-variables.templates:2003
-#, fuzzy
msgid "Default language:"
-msgstr "Standardspråk"
+msgstr "Standardspråk:"
#. Type: select
#. Description
#: ../dsf-helper/web-variables.templates:2003
-#, fuzzy
msgid "Please choose the default language for web pages."
-msgstr "Här är standardspråket för webbsidorna."
+msgstr "Ange standardspråket för webbsidorna."
#. Type: string
#. Description
#: ../dsf-helper/web-variables.templates:3001
-#, fuzzy
msgid "Default theme:"
-msgstr "Standardtema"
+msgstr "Standardtema:"
#. Type: string
#. Description
#: ../dsf-helper/web-variables.templates:3001
-#, fuzzy
-msgid ""
-"Please choose the default theme for web pages. This must be a valid name."
+msgid "Please choose the default theme for web pages. This must be a valid name."
msgstr ""
-"Här är standardtemat för webbsidorna, var försiktig och ange ett giltigt "
+"Ange standardtemat för webbsidorna. Detta måste vara ett giltigt "
"namn."
-#~ msgid "admin"
-#~ msgstr "admin"
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/plugins/webcalendar/www/index2.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/plugins/webcalendar/www/index2.php 2011-02-28 00:45:44 UTC (rev 12553)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/plugins/webcalendar/www/index2.php 2011-02-28 00:45:51 UTC (rev 12554)
@@ -30,7 +30,7 @@
function user_belongs_to_group($user_id,$group_id){
global $HTML;
-$sql = "SELECT value,admin_flags FROM user_group,role_setting WHERE role_setting.role_id = user_group.role_id AND user_group.user_id = '".$user_id."' AND user_group.group_id = '".$group_id."' AND role_setting.section_name = 'webcal'";
+$sql = "SELECT value::integer,admin_flags FROM user_group,role_setting WHERE role_setting.role_id = user_group.role_id AND user_group.user_id = '".$user_id."' AND user_group.group_id = '".$group_id."' AND role_setting.section_name = 'webcal'";
//$sql = "SELECT COUNT(*) FROM user_group WHERE user_id = '".$user_id."' AND group_id = '".$group_id."'";
$res = db_query($sql);
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/pm/msproject/msp.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/pm/msproject/msp.php 2011-02-28 00:45:44 UTC (rev 12553)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/pm/msproject/msp.php 2011-02-28 00:45:51 UTC (rev 12554)
@@ -47,7 +47,7 @@
FROM groups g, project_group_list pgl, role_setting rs, user_group ug
WHERE ug.user_id='".user_getid()."'
AND g.group_id=pgl.group_id
- AND rs.value > 0
+ AND rs.value::integer > 0
AND rs.group_project_id = pgl.group_project_id
AND ug.role_id = rs.role_id
AND rs.section_name='pm'";
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/admin/form-extrafieldcopy.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/admin/form-extrafieldcopy.php 2011-02-28 00:45:44 UTC (rev 12553)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/admin/form-extrafieldcopy.php 2011-02-28 00:45:51 UTC (rev 12554)
@@ -44,8 +44,8 @@
WHERE
(
(rs.section_name = 'projectadmin' AND rs.value = 'A')
- OR (rs.section_name = 'trackeradmin' AND rs.value = 2)
- OR (rs.section_name = 'tracker' AND rs.value >= 2 AND rs.ref_id = agl.group_artifact_id)
+ OR (rs.section_name = 'trackeradmin' AND rs.value = '2')
+ OR (rs.section_name = 'tracker' AND rs.value::integer >= 2 AND rs.ref_id = agl.group_artifact_id)
)
AND ug.user_id='".user_getid()."'
AND ug.group_id=g.group_id
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/mod.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/mod.php 2011-02-28 00:45:44 UTC (rev 12553)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/mod.php 2011-02-28 00:45:51 UTC (rev 12554)
@@ -103,7 +103,7 @@
FROM artifact_group_list agl, role_setting rs, user_group ug
WHERE agl.group_artifact_id=rs.ref_id
AND ug.user_id='". user_getid() ."'
- AND rs.value $alevel
+ AND rs.value::integer $alevel
AND agl.group_id='$group_id'
AND ug.role_id = rs.role_id
AND rs.section_name='tracker'";
More information about the evolvis-commits
mailing list