Index: trunk/src/org/openstreetmap/josm/data/osm/Filters.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Filters.java	(revision 2178)
+++ trunk/src/org/openstreetmap/josm/data/osm/Filters.java	(revision 2179)
@@ -2,4 +2,5 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trc;
 
 import javax.swing.table.AbstractTableModel;
@@ -140,5 +141,5 @@
    public String getColumnName(int column){
       String[] names = { /* translators notes must be in front */
-          /* column header: enable filter */             tr("_: filter\nE"),
+          /* column header: enable filter */             tr("filter","E"),
           /* column header: hide filter */               tr("H"),
           /* column header: filter text */               tr("Text"),
Index: trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java	(revision 2178)
+++ trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java	(revision 2179)
@@ -5,4 +5,5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trn;
+import static org.openstreetmap.josm.tools.I18n.trnc;
 
 import java.awt.Color;
@@ -156,5 +157,5 @@
             points += c.size();
         }
-        String tool = data.size()+" "+trn("_: gps\ntrack", "_: gps\ntracks", data.size())
+        String tool = data.size()+" "+trnc("gps", "track", "tracks", data.size())
         +" "+points+" "+trn("point", "points", points);
         File f = getAssociatedFile();
Index: trunk/src/org/openstreetmap/josm/tools/I18n.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/I18n.java	(revision 2178)
+++ trunk/src/org/openstreetmap/josm/tools/I18n.java	(revision 2179)
@@ -31,5 +31,5 @@
     public static final String tr(String text, Object... objects) {
         if (i18n == null)
-            return filter(MessageFormat.format(text, objects));
+            return MessageFormat.format(filter(text), objects);
         return filter(i18n.tr(text, objects));
     }
@@ -41,4 +41,10 @@
     }
 
+    public static final String trc(String ctx, String text) {
+        if (i18n == null)
+            return text;
+        return i18n.trc(ctx, text);
+    }
+
     public static final String marktr(String text) {
         return text;
@@ -47,5 +53,5 @@
     public static final String trn(String text, String pluralText, long n, Object... objects) {
         if (i18n == null)
-            return filter(n == 1 ? tr(text, objects) : tr(pluralText, objects));
+            return n == 1 ? tr(text, objects) : tr(pluralText, objects);
         return filter(i18n.trn(text, pluralText, n, objects));
     }
@@ -53,6 +59,18 @@
     public static final String trn(String text, String pluralText, long n) {
         if (i18n == null)
-            return filter(n == 1 ? tr(text) : tr(pluralText));
+            return n == 1 ? tr(text) : tr(pluralText);
         return filter(i18n.trn(text, pluralText, n));
+    }
+
+    public static final String trnc(String ctx, String text, String pluralText, long n, Object... objects) {
+        if (i18n == null)
+            return n == 1 ? tr(text, objects) : tr(pluralText, objects);
+        return i18n.trnc(ctx, text, pluralText, n, objects);
+    }
+
+    public static final String trnc(String ctx, String text, String pluralText, long n) {
+        if (i18n == null)
+            return n == 1 ? tr(text) : tr(pluralText);
+        return i18n.trnc(ctx, text, pluralText, n);
     }