Index: data/fonts/DroidSans-Bold.ttf
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: data/fonts/DroidSans.ttf
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: data/fonts/NotoSans-Bold.ttf
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: data/fonts/NotoSans-Bold.ttf
===================================================================
--- data/fonts/NotoSans-Bold.ttf	(revision 0)
+++ data/fonts/NotoSans-Bold.ttf	(working copy)

Property changes on: data/fonts/NotoSans-Bold.ttf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: data/fonts/NotoSans-Regular.ttf
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: data/fonts/NotoSans-Regular.ttf
===================================================================
--- data/fonts/NotoSans-Regular.ttf	(revision 0)
+++ data/fonts/NotoSans-Regular.ttf	(working copy)

Property changes on: data/fonts/NotoSans-Regular.ttf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
===================================================================
--- src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 9000)
+++ src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(working copy)
@@ -1439,7 +1439,7 @@
         showNames = paintSettings.getShowNamesDistance() > circum;
         showIcons = paintSettings.getShowIconsDistance() > circum;
         isOutlineOnly = paintSettings.isOutlineOnly();
-        orderFont = new Font(Main.pref.get("mappaint.font", "Droid Sans"), Font.PLAIN, Main.pref.getInteger("mappaint.fontsize", 8));
+        orderFont = new Font(Main.pref.get("mappaint.font", "Noto Sans"), Font.PLAIN, Main.pref.getInteger("mappaint.fontsize", 8));
 
         antialiasing = Main.pref.getBoolean("mappaint.use-antialiasing", true) ?
                         RenderingHints.VALUE_ANTIALIAS_ON : RenderingHints.VALUE_ANTIALIAS_OFF;
Index: src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java
===================================================================
--- src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java	(revision 9000)
+++ src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java	(working copy)
@@ -120,7 +120,7 @@
             synchronized (lock) {
                 n = DEFAULT_FONT_NAME;
                 if (n == null) {
-                    DEFAULT_FONT_NAME = n = Main.pref.get("mappaint.font", "Droid Sans");
+                    DEFAULT_FONT_NAME = n = Main.pref.get("mappaint.font", "Noto Sans");
                 }
             }
         }
Index: src/org/openstreetmap/josm/tools/FontsManager.java
===================================================================
--- src/org/openstreetmap/josm/tools/FontsManager.java	(revision 9000)
+++ src/org/openstreetmap/josm/tools/FontsManager.java	(working copy)
@@ -22,8 +22,8 @@
      * List of fonts embedded into JOSM jar.
      */
     private static final Collection<String> INCLUDED_FONTS = Arrays.asList(
-            "DroidSans.ttf",
-            "DroidSans-Bold.ttf"
+            "NotoSans-Regular.ttf",
+            "NotoSans-Bold.ttf"
     );
 
     private FontsManager() {