Index: applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java
===================================================================
--- applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java	(revision 21023)
+++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java	(revision 21024)
@@ -31,5 +31,5 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionCache;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
 import org.openstreetmap.josm.plugins.tageditor.ac.AutoCompletionListViewer;
@@ -77,5 +77,5 @@
 
 	/** the cache of auto completion values used by the tag editor */
-	private AutoCompletionCache acCache = null;
+	private AutoCompletionManager autocomplete = null;
 
 	private OKAction okAction = null;
@@ -115,5 +115,4 @@
 		aclViewer = new AutoCompletionListViewer(autoCompletionList);
 		tagEditor.setAutoCompletionList(autoCompletionList);
-		tagEditor.setAutoCompletionCache(acCache);
 		aclViewer.addAutoCompletionListListener(tagEditor);
 		tagEditor.addComponentNotStoppingCellEditing(aclViewer);
@@ -252,5 +251,4 @@
 	 */
 	protected TagEditorDialog() {
-		acCache = new AutoCompletionCache();	
 		build();
 	}
@@ -280,5 +278,6 @@
 		tagEditor.getModel().clearAppliedPresets();
 		tagEditor.getModel().initFromJOSMSelection();
-		//acCache.initFromJOSMDataset();
+		autocomplete = Main.main.getEditLayer().data.getAutoCompletionManager();
+		tagEditor.setAutoCompletionManager(autocomplete);
 		getModel().ensureOneTag();
 	}
Index: applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditor.java
===================================================================
--- applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditor.java	(revision 21023)
+++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditor.java	(revision 21024)
@@ -16,5 +16,5 @@
 
 import org.openstreetmap.josm.gui.tagging.TagTable;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionCache;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
 import org.openstreetmap.josm.plugins.tageditor.ac.IAutoCompletionListListener;
@@ -179,6 +179,6 @@
 	}
 
-	public void setAutoCompletionCache(AutoCompletionCache acCache) {
-		tblTagEditor.setAutoCompletionCache(acCache);
+	public void setAutoCompletionManager(AutoCompletionManager autocomplete) {
+		tblTagEditor.setAutoCompletionManager(autocomplete);
 	}
 
Index: applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagSpecificationAwareTagCellEditor.java
===================================================================
--- applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagSpecificationAwareTagCellEditor.java	(revision 21023)
+++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagSpecificationAwareTagCellEditor.java	(revision 21024)
@@ -11,5 +11,5 @@
 import org.openstreetmap.josm.plugins.tageditor.tagspec.TagSpecifications;
 
-public class TagSpecificationAwareTagCellEditor extends TagCellEditor{
+public class TagSpecificationAwareTagCellEditor extends TagCellEditor {
 	private static final Logger logger = Logger.getLogger(TagCellEditor.class.getName());
 
@@ -42,5 +42,5 @@
 		// add the list of keys in the current data set
 		//
-		acCache.populateWithKeys(autoCompletionList, false /* don't append */);
+		autocomplete.populateWithKeys(autoCompletionList);
 		AutoCompletionContext context = new AutoCompletionContext();
 		try {
@@ -77,5 +77,5 @@
 		}
 		autoCompletionList.clear();
-		acCache.populateWithTagValues(autoCompletionList, forKey, false /* don't append */);
+		autocomplete.populateWithTagValues(autoCompletionList, forKey);
 		
 		AutoCompletionContext context = new AutoCompletionContext();
Index: applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java
===================================================================
--- applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java	(revision 21023)
+++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java	(revision 21024)
@@ -129,5 +129,5 @@
 		JPanel pnl = new JPanel();
 		pnl.setLayout(new FlowLayout(FlowLayout.LEFT));
-		btnApply = new JButton("Apply");
+		btnApply = new JButton(tr("Apply"));
 		pnl.add(btnApply);
 		btnApply.addActionListener(