[evolvis-commits] r17520: assorted fixes

mirabilos at evolvis.org mirabilos at evolvis.org
Fri Sep 2 15:14:35 CEST 2011


Author: mirabilos
Date: 2011-09-02 15:14:35 +0200 (Fri, 02 Sep 2011)
New Revision: 17520

Modified:
   branches/ev48fixes/debian/rules
   branches/ev48fixes/plugins/fusionforge-plugin-extratabs/control/control
   branches/ev48fixes/plugins/fusionforge-plugin-extratabs/data/usr/share/gforge/plugins/extratabs/www/index.php
   branches/ev48fixes/translations/de.po
   branches/ev48fixes/translations/gforge.pot
Log:
assorted fixes


Modified: branches/ev48fixes/debian/rules
===================================================================
--- branches/ev48fixes/debian/rules	2011-09-02 12:53:19 UTC (rev 17519)
+++ branches/ev48fixes/debian/rules	2011-09-02 13:14:35 UTC (rev 17520)
@@ -207,8 +207,9 @@
 	v=$$(print -r -- $$(sed -n '\''/^Version: /s///p'\'' control/control | head -1)); \
 	a=$$(print -r -- $$(sed -n '\''/^Architecture: /s///p'\'' control/control | head -1)); \
 	d=$${p}_$${v}_$${a}.deb; \
-	s=$$(grep '^[Ss][Oo][Uu][Rr][Cc][Ee]:' control/control); \
-	printf '1,$$g/^[Ss][Oo][Uu][Rr][Cc][Ee]:/d\nw\nq\n' | ed -s control/control; \
+	s=$$(grep '\''^[Ss][Oo][Uu][Rr][Cc][Ee]:'\'' control/control); \
+	printf '\''1,$$g/^[Ss][Oo][Uu][Rr][Cc][Ee]:/d\nw\nq\n'\'' | \
+	    ed -s control/control; \
 	echo "Source: ${PACKAGE} (${VERSION})" >>control/control; \
 	rm -f $$toplev/../$$d control.tar.gz data.tar.gz; \
 	(cd control; find . | fgrep -v /.svn | sort | \
@@ -218,8 +219,9 @@
 	    mircpio -oC512 -Hustar -Minodes -Mlinks -Muidgid -Mgslash) | \
 	    gzip -n9 >data.tar.gz; \
 	mirtar -A -M dist -cf $$toplev/../$$d debian-binary control.tar.gz data.tar.gz; \
-	printf '1,$$g/^[Ss][Oo][Uu][Rr][Cc][Ee]:/d\nw\nq\n' | ed -s control/control; \
-	test -n "$$x" && echo "$$s" >>control/control; \
+	printf '\''1,$$g/^[Ss][Oo][Uu][Rr][Cc][Ee]:/d\nw\nq\n'\'' | \
+	    ed -s control/control; \
+	[[ -n $$x ]] && print -r -- "$$s" >>control/control; \
 	rm -f control.tar.gz data.tar.gz; \
 	cd $$toplev; dpkg-distaddfile $$d non-free/devel optional'
 

Modified: branches/ev48fixes/plugins/fusionforge-plugin-extratabs/control/control
===================================================================
--- branches/ev48fixes/plugins/fusionforge-plugin-extratabs/control/control	2011-09-02 12:53:19 UTC (rev 17519)
+++ branches/ev48fixes/plugins/fusionforge-plugin-extratabs/control/control	2011-09-02 13:14:35 UTC (rev 17520)
@@ -3,7 +3,7 @@
 Section: devel
 Maintainer: Thorsten Glaser <t.glaser at tarent.de>
 Architecture: all
-Version: 5.1+evolvis0~evolvis+4.8+3
+Version: 5.1+evolvis0~evolvis+4.8+4
 Replaces: gforge-plugin-extratabs (<< 5.0.51-2)
 Depends: gforge-common (>= 4.6.99), gforge-db-postgresql (>= 4.6.99) | gforge-db, gforge-web-apache2 (>= 4.6.99) | gforge-web
 Conflicts: gforge-plugin-extratabs (<< 5.0.51-2)

Modified: branches/ev48fixes/plugins/fusionforge-plugin-extratabs/data/usr/share/gforge/plugins/extratabs/www/index.php
===================================================================
--- branches/ev48fixes/plugins/fusionforge-plugin-extratabs/data/usr/share/gforge/plugins/extratabs/www/index.php	2011-09-02 12:53:19 UTC (rev 17519)
+++ branches/ev48fixes/plugins/fusionforge-plugin-extratabs/data/usr/share/gforge/plugins/extratabs/www/index.php	2011-09-02 13:14:35 UTC (rev 17520)
@@ -295,7 +295,7 @@
 		if (!$res || db_affected_rows($res) < 1) {
 			$error_msg = sprintf (_('Cannot change the tab tooltip: %s'), db_error());
 		} else {
-			$feedback .= ($feedback ? '. ' : '') . _('Tab successfully renamed');
+			$feedback .= ($feedback ? '. ' : '') . _('Tooltip successfully changed');
 			$done = 1;
 		}
 	}
@@ -424,7 +424,7 @@
 	<td><input type="text" size="20" maxlength="20" name="tab_rename" value="" /></td>
 </tr><tr>
 	<td><?php echo _('New tooltip (set to “-” to delete):'); ?></td>
-	<td><input type="text" size="20" maxlength="20" name="tab_new_tooltip" value="" /></td>
+	<td><input type="text" size="60" name="tab_new_tooltip" value="" /></td>
 </tr><tr>
 	<td><?php echo _('New URL:'); ?></td>
 	<td><input type="text" size="60" name="tab_new_url" value="http://" /></td>

Modified: branches/ev48fixes/translations/de.po
===================================================================
--- branches/ev48fixes/translations/de.po	2011-09-02 12:53:19 UTC (rev 17519)
+++ branches/ev48fixes/translations/de.po	2011-09-02 13:14:35 UTC (rev 17520)
@@ -3,8 +3,8 @@
 msgstr ""
 "Project-Id-Version: EvolvisForge 4.8.3+evolvis36\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-02 14:45+0200\n"
-"PO-Revision-Date: 2011-09-02 14:46+0200\n"
+"POT-Creation-Date: 2011-09-02 15:13+0200\n"
+"PO-Revision-Date: 2011-09-02 15:14+0200\n"
 "Last-Translator: Thorsten Glaser <t.glaser at tarent.de>\n"
 "Language-Team: german\n"
 "Language: de\n"
@@ -2396,7 +2396,6 @@
 msgstr "Kann Tab (Registerreiter) nicht umbenennen: %s"
 
 #: plugins/fusionforge-plugin-extratabs/data/usr/share/gforge/plugins/extratabs/www/index.php:286
-#: plugins/fusionforge-plugin-extratabs/data/usr/share/gforge/plugins/extratabs/www/index.php:298
 msgid "Tab successfully renamed"
 msgstr "Tab (Registerreiter) erfolgreich umbenannt"
 
@@ -2405,6 +2404,10 @@
 msgid "Cannot change the tab tooltip: %s"
 msgstr "Kann Tooltip für Tab (Registerreiter) nicht umbenennen: %s"
 
+#: plugins/fusionforge-plugin-extratabs/data/usr/share/gforge/plugins/extratabs/www/index.php:298
+msgid "Tooltip successfully changed"
+msgstr "Tooltip erfolgreich geändert"
+
 #: plugins/fusionforge-plugin-extratabs/data/usr/share/gforge/plugins/extratabs/www/index.php:311
 #, php-format
 msgid "Cannot change URL: %s"

Modified: branches/ev48fixes/translations/gforge.pot
===================================================================
--- branches/ev48fixes/translations/gforge.pot	2011-09-02 12:53:19 UTC (rev 17519)
+++ branches/ev48fixes/translations/gforge.pot	2011-09-02 13:14:35 UTC (rev 17520)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-02 14:45+0200\n"
+"POT-Creation-Date: 2011-09-02 15:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -2212,7 +2212,6 @@
 msgstr ""
 
 #: plugins/fusionforge-plugin-extratabs/data/usr/share/gforge/plugins/extratabs/www/index.php:286
-#: plugins/fusionforge-plugin-extratabs/data/usr/share/gforge/plugins/extratabs/www/index.php:298
 msgid "Tab successfully renamed"
 msgstr ""
 
@@ -2221,6 +2220,10 @@
 msgid "Cannot change the tab tooltip: %s"
 msgstr ""
 
+#: plugins/fusionforge-plugin-extratabs/data/usr/share/gforge/plugins/extratabs/www/index.php:298
+msgid "Tooltip successfully changed"
+msgstr ""
+
 #: plugins/fusionforge-plugin-extratabs/data/usr/share/gforge/plugins/extratabs/www/index.php:311
 #, php-format
 msgid "Cannot change URL: %s"



More information about the evolvis-commits mailing list