diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/language/settings/providers/BuiltinSpecsDetectorOptionPage.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/language/settings/providers/BuiltinSpecsDetectorOptionPage.java
index bb95f1239a9..2644cc4699f 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/language/settings/providers/BuiltinSpecsDetectorOptionPage.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/language/settings/providers/BuiltinSpecsDetectorOptionPage.java
@@ -19,7 +19,9 @@ import org.eclipse.cdt.managedbuilder.language.settings.providers.AbstractBuilti
 import org.eclipse.cdt.utils.ui.controls.ControlFactory;
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
@@ -30,6 +32,7 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
@@ -105,13 +108,23 @@ public final class BuiltinSpecsDetectorOptionPage extends AbstractLanguageSettin
 			Button button = ControlFactory.createPushButton(composite, "Browse...");
 			button.setEnabled(fEditable);
 			button.addSelectionListener(new SelectionAdapter() {
-
 				@Override
 				public void widgetSelected(SelectionEvent evt) {
-//					handleAddr2LineButtonSelected();
-					//updateLaunchConfigurationDialog();
+					FileDialog dialog = new FileDialog(getShell(), SWT.NONE);
+					dialog.setText(/*PreferencesMessages.BuildLogPreferencePage_ChooseLogFile*/"Choose file");
+					String fileName = inputCommand.getText();
+					// taking chance that the first word is a compiler path
+					int space = fileName.indexOf(' ');
+					if (space > 0) {
+						fileName = fileName.substring(0, space);
+					}
+					IPath folder = new Path(fileName).removeLastSegments(1);
+					dialog.setFilterPath(folder.toOSString());
+					String chosenFile = dialog.open();
+					if (chosenFile != null) {
+						inputCommand.insert(chosenFile);
+					}
 				}
-
 			});
 
 		}
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/language/settings/providers/GCCBuildCommandParserOptionPage.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/language/settings/providers/GCCBuildCommandParserOptionPage.java
index c438cb93082..e41126cc3f2 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/language/settings/providers/GCCBuildCommandParserOptionPage.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/language/settings/providers/GCCBuildCommandParserOptionPage.java
@@ -205,7 +205,7 @@ public final class GCCBuildCommandParserOptionPage extends AbstractLanguageSetti
 
 		{
 			scopeFolderRadioButton = new Button(resourceScopeGroup, SWT.RADIO);
-			scopeFolderRadioButton.setText("Per folder, use when settings are the same for all files in a folder");
+			scopeFolderRadioButton.setText("Per folder, use when settings are the same for all files in each folder");
 //			applyToEnclosingFolderRadioButton.setText("Enclosing folder, use when settings are the same for all files in a folder");
 			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.horizontalSpan = 2;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsEntriesTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsEntriesTab.java
index f545418b48f..cf20207df55 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsEntriesTab.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsEntriesTab.java
@@ -575,7 +575,7 @@ public class LanguageSettingsEntriesTab extends AbstractCPropertyTab {
 			boolean isAllowedEditing = provider instanceof ILanguageSettingsEditableProvider
 					&& LanguageSettingsProviderAssociationManager.isAllowedToEditEntries(provider);
 			if (!isAllowedEditing) {
-				String msg = "Setting entries for this provider are supplied by system and are not editable.";
+				String msg = "Setting entries for this provider are supplied by the system and are not editable.";
 				status = new Status(IStatus.INFO, CUIPlugin.PLUGIN_ID, msg);
 			}
 		}