gnome-build r480 - in trunk: . po src/backends/libgbf_am src/backends/libgbf_mkfile

[jhs svn gnome org]

Author: jhs
Date: Tue Jan 22 13:34:55 2008
New Revision: 480
URL: http://svn.gnome.org/viewvc/gnome-build?rev=480&view=rev

Log:
2008-01-22  Johannes Schmid <jhs gnome org>

        * src/backends/libgbf_am/gbf-am-parse.in:
        * src/backends/libgbf_mkfile/gbf-mkfile-parse.in:

        gettext has problems with strings which are connected using "."




Modified:
   trunk/ChangeLog
   trunk/po/ChangeLog
   trunk/src/backends/libgbf_am/gbf-am-parse.in
   trunk/src/backends/libgbf_mkfile/gbf-mkfile-parse.in

Modified: trunk/src/backends/libgbf_am/gbf-am-parse.in
==============================================================================
--- trunk/src/backends/libgbf_am/gbf-am-parse.in	(original)
+++ trunk/src/backends/libgbf_am/gbf-am-parse.in	Tue Jan 22 13:34:55 2008
@@ -747,9 +747,7 @@
 		if (defined ($extra_deps)) {
 		    $new_target{config}{explicit_deps} .= $extra_deps;
 		    if ($extra_actions ne "") {
-			&report_warning (200, gettext("Actions defined for ".
-					 "\$(${canonical}_OBJECTS), " .
-					 "and this should be left to automake alone"));
+			&report_warning (200, gettext("Actions defined for \$(${canonical}_OBJECTS), and this should be left to automake alone"));
 		    };
 		};
 
@@ -1254,8 +1252,7 @@
 	    # Get the target hash from the group
 	    $target = $group->{targets}{$target};
 	    if (! defined ($target)) {
-		&report_error (304, gettext("The target $op->{target_name} ".
-			       "doesn't exist"));
+		&report_error (304, gettext("The target $op->{target_name} doesn't exist"));
 		next OP;
 	    }
 	    $target_type = $target->{type};
@@ -1528,8 +1525,7 @@
 	}
 
 	if (!defined $primary) {
-	    return &report_error (301, gettext("Invalid target type '$operand' ".
-				  "to compiled_primary_target_writer"));
+	    return &report_error (301, gettext("Invalid target type '$operand' to compiled_primary_target_writer"));
 	}
 
 	# FIXME: verify that the target doesn't yet exist
@@ -1800,14 +1796,11 @@
 
 	$primary = $primaries{$operand};
 	if (!defined $primary) {
-	    return &report_error (301, gettext("Invalid target type '$operand' ".
-				  "to simple_primary_target_writer"));
+	    return &report_error (301, gettext("Invalid target type '$operand' to simple_primary_target_writer"));
 	}
 
 	if ($check_primary ne $operand) {
-	    &report_warning (302, gettext("The target type supplied in the target name ".
-			     "$target and the given target type '$operand' ".
-			     "don't match.  Will use the one provided in the name"));
+	    &report_warning (302, gettext("The target type supplied in the target name $target and the given target type '$operand' don't match.  Will use the one provided in the name"));
 	}
 
 	if (!&check_primary_prefix ($prefix, $primary, $group)) {

Modified: trunk/src/backends/libgbf_mkfile/gbf-mkfile-parse.in
==============================================================================
--- trunk/src/backends/libgbf_mkfile/gbf-mkfile-parse.in	(original)
+++ trunk/src/backends/libgbf_mkfile/gbf-mkfile-parse.in	Tue Jan 22 13:34:55 2008
@@ -599,8 +599,7 @@
     &debug ("Using $project_dir as the project root");
     if ( ! -f "$project_dir/Makefile") {
 		if ( ! -f "$project_dir/makefile") {
-			&report_error (1, gettext("Can't find $project_dir/Makefile or ".
-							"$project_dir/makefile"));
+			&report_error (1, gettext("Can't find $project_dir/Makefile or $project_dir/makefile"));
 			return undef;
 		}
 		$mkfile_name = "makefile";
@@ -684,8 +683,7 @@
 	    # Get the target hash from the group
 	    $target = $group->{targets}{$target};
 	    if (! defined ($target)) {
-		&report_error (304, gettext("The target $op->{target_name} ".
-			       "doesn't exist"));
+		&report_error (304, gettext("The target $op->{target_name} doesn't exist"));
 		next OP;
 	    }
 	    $target_type = $target->{type};
@@ -875,8 +873,7 @@
 	}
 
 	if (!defined $primary) {
-	    return &report_error (301, gettext("Invalid target type '$operand' ".
-				  "to compiled_primary_target_writer"));
+	    return &report_error (301, gettext("Invalid target type '$operand' to compiled_primary_target_writer"));
 	}
 
 	# FIXME: verify that the target doesn't yet exist
@@ -1029,14 +1026,11 @@
 
 	$primary = $primaries{$operand};
 	if (!defined $primary) {
-	    return &report_error (301, gettext("Invalid target type '$operand' ".
-				  "to simple_primary_target_writer"));
+	    return &report_error (301, gettext("Invalid target type '$operand' to simple_primary_target_writer"));
 	}
 
 	if ($check_primary ne $operand) {
-	    &report_warning (302, gettext("The target type supplied in the target name ".
-			     "$target and the given target type '$operand' ".
-			     "don't match.  Will use the one provided in the name"));
+	    &report_warning (302, gettext("The target type supplied in the target name $target and the given target type '$operand' don't match.  Will use the one provided in the name"));
 	}
 
 	if (!&check_primary_prefix ($prefix, $primary, $group)) {