More I18N cleanup

17 files changed, 219 insertions, 135 deletions

diff --git a/web/i18n/de.yml b/web/i18n/de.yml
index 9e4b364..3c03090 100644
--- a/web/i18n/de.yml
+++ b/web/i18n/de.yml
@@ -11,9 +11,11 @@ osm:
     ways: Ways
     relation: Relation
     relations: Relations
+    object: Objekt
+    objects: Objekte
     all: Alle
     user: User
-    users: Users
+    users: User
 
 taginfo:
     source: Datenquelle
@@ -48,14 +50,23 @@ misc:
     image: Bild
     no_image: kein Bild
     all: Alle
-    object: Objekt
-    objects: Objekte
     object_type: Typ
     description: Beschreibung
+    length: Länge
     icon: Icon
     line: Linie
     area: Fläche
     language: Sprache
+    objects_tooltip: Anzahl der Objekte (als Absolutwert und als Bruchteil aller Nodes, Ways und Relations).
+    nodes_tooltip: Anzahl der Nodes (als Absolutwert und als Bruchteil aller Nodes mit Tags, d.h. Nodes ohne jegliche Tags werden ignoriert).
+    ways_tooltip: Anzahl der Ways (als Absolutwert und als Bruchteil aller Ways).
+    relations_tooltip: Anzahl der Relations (als Absolutwert und als Bruchteil aller Relations).
+    values_tooltip: Anzahl verschiedener Values zu diesem Key.
+    users_tooltip: Anzahl unterschiedlicher User, die die Objekte mit diesem Key zuletzt geändert haben.
+    prevalent_values: Häufige Values
+    prevalent_values_tooltip: Bis zu zehn der häufigsten Values zu diesem Key (Anzeige nur, wenn mehr als 1% der Tags mit diesem Key auch diesen Value haben).
+    in_wiki_tooltip: Zu diesem Key gibt es mindestens eine Wiki-Seite.
+    in_josm_tooltip: Der Key erscheint in der JOSM-Konfiguration.
 
 pages:
     index:
@@ -117,27 +128,9 @@ pages:
     keys:
         intro: |
                 Diese Tabelle zeigt alle Keys, die in der Datenbank oder einer anderen Quelle vorkommen.
-        table:
-            total: Alle
-            total_tooltip: Anzahl der Objekte mit diesem Key (als Absolutwert und als Bruchteil aller Nodes, Ways und Relations).
-            nodes_tooltip: Anzahl der Nodes mit diesem Key (als Absolutwert und als Bruchteil aller Nodes mit Tags, d.h. Nodes ohne jegliche Tags werden ignoriert).
-            ways_tooltip: Anzahl der Ways mit diesem Key (als Absolutwert und als Bruchteil aller Ways).
-            relations_tooltip: Anzahl der Relations mit diesem Key (als Absolutwert und als Bruchteil aller Relations).
-            users_tooltip: Anzahl unterschiedlicher User, die die Objekte mit diesem Key zuletzt geändert haben.
-            in_wiki_tooltip: Zu diesem Key gibt es mindestens eine Wiki-Seite.
-            in_josm_tooltip: Der Key erscheint in der JOSM-Konfiguration.
-            values_tooltip: Anzahl verschiedener Values zu diesem Key.
-            prevalent_values: Häufige Values
-            prevalent_values_tooltip: Bis zu zehn der häufigsten Values zu diesem Key (Anzeige nur, wenn mehr als 1% der Tags mit diesem Key auch diesen Value haben).
     tags:
         intro: |
                 Diese Tabelle zeigt die häufigsten Tags in der Datenbank.
-        table:
-            total: Alle
-            total_tooltip: Anzahl der Objekte mit diesem Tag (als Absolutwert und als Bruchteil aller Nodes, Ways und Relations).
-            nodes_tooltip: Anzahl der Nodes mit diesem Tag (als Absolutwert und als Bruchteil aller Nodes mit Tags, d.h. Nodes ohne jegliche Tags werden ignoriert).
-            ways_tooltip: Anzahl der Ways mit diesem Tag (als Absolutwert und als Bruchteil aller Ways).
-            relations_tooltip: Anzahl der Relations mit diesem Tag (als Absolutwert und als Bruchteil aller Relations).
     key:
         description_from_wiki: Beschreibung dieses Keys aus dem Wiki (falls vorhanden in der gewählten Sprache, sonst auf englisch).
         no_description_in_wiki: Keine Beschreibung dieses Keys im Wiki.
@@ -239,14 +232,101 @@ sources:
 reports:
     characters_in_keys:
         name: Zeichen in Keys
+        intro: |
+            <p>Alle gültigen Unicode-Zeichen dürfen in OSM-Keys vorkommen. Typischerweise
+            werden aber nur Kleinbuchstaben (a-z) und der Unterstrich (_) benutzt. Manchmal
+            kommt dazu der Doppelpunkt (:) als Trennzeichen.
+        statistics:
+            tab: Statistik
+            title: Statistik-Übersicht
+            fraction: Anteil
+            characters: Zeichen im Key
+            characters_in_keys:
+                plain: Nur lateinische Kleinbuchstaben (<span class="char">a</span> bis <span class="char">z</span>) und Unterstrich (<span class="char">_</span>), erstes und letztes Zeichen sind Buchstaben.
+                colon: Wie A, aber mit einem oder mehreren Doppelpunkten (<span class="char">:</span>).
+                letters: Wie B, aber mit Großbuchstaben oder Buchstaben aus anderen Alphabeten.
+                space: Wie C, aber mit mindestens einem Whitespace-Zeichen (Leerzeichen, Tabulator, Neue Zeile, Wagenrücklauf, oder aus anderen Alphabeten)
+                problem: Wie C, enthält aber die möglicherweise problematischen Zeichen <span class="char">=+/&amp;&lt;&gt;;'"?%#@\,</span>.
+                rest: Alles andere.
+                total: Summe
+        whitespace:
+            tab: Leerzeichen
+            title: Keys mit Leerzeichen
+            intro: |
+                <p>Keys, die Whitespace-Zeichen (Leerzeichen, Tabulator, Neue Zeile,
+                Wagenrücklauf, oder aus anderen Alphabeten) enthalten.<br/>
+                Leerräume in Keys können (da sie nicht sichtbar sind) verwirrend sein,
+                besonders am Anfang und am Ende der Keys. Normalerweise sollte
+                stattdessen ein Unterstrich (_) verwenden werden.</p>
+        problematic:
+            tab: Problematisch
+            title: Keys mit möglicherweise problematischen Zeichen
+            intro: |
+                <p>Keys mit möglicherweise problematischen Zeichen: <span
+                class="char">=+/&amp;&lt;&gt;;'"?%#@\,</span>. Diese Zeichen
+                können problematisch sein, weil sie in verschiedenen Programmiersprachen
+                zum "Zitieren" von Zeichenketten verwendet werden oder weil sie in
+                XML, HTML, URLs oder anderen Zusammenhängen besondere Bedeutung
+                haben. Das Gleichheitszeichen (=) wird bei OSM häufig als Trennzeichen
+                zwischen Tag Keys und Values benutzt.<br/>
+                Keys, die in dieser Liste erscheinen, sind nicht unbedingt falsch. In
+                vielen Fällen sind sie aber das Ergebnis eines Fehlers.</p>
+    database_statistics:
+        name: Datenbank-Statistik
     frequently_used_keys_without_wiki_page:
         name: Häufig benutzte Keys ohne Wiki-Seite
+        intro: |
+            <p>Diese Tabelle zeigt Keys an, die mehr als 10&thinsp;000 mal in der OSM-Datebank
+            vorkommen, zu denen es aber keine Wiki-Seite gibt. Falls Du irgendwas über diesen
+            Key weißt, kannst Du eine Wiki-Seite anlegen, indem Du auf den Link in der linken
+            Spalte klickst. Manchmal ist es sinnvoll einen Verweis auf eine andere Wiki-Seite
+            anzulegen. Dazu trägst Du einfach nur eine Zeile mit
+            <tt style="background-color: #f0f0f0; padding: 0 2px;">#REDIRECT [[<i>Seitenname</i>]]</tt>
+            in die Wiki-Seite ein.</p>
+        also_show_keys: Auch Keys anzeigen, die keine Wiki-Seite in englischer Sprache haben, aber in einer anderen Sprache.
+        table:
+            create_wiki_page: Wiki-Seite anlegen...
+    josm_styles:
+        name: JOSM-Stilregeln
     key_lengths:
         name: Key-Längen
+        intro: |
+            <p>Tag Keys können zwischen 0 und 255 (Unicode-)Zeichen lang sein. Sehr kurze oder sehr lange Keys sind oft (aber nicht immer) ein Fehler.</p>
+        table:
+            number_of_objects: Anzahl Objekte
+        histogram:
+            intro: Dieses Histogramm zeigt wieviele Keys es mit welcher Länge gibt.
+            key_length: Key-Länge
+            number_of_keys: Anzahl Keys
     language_comparison_table_for_keys_in_the_wiki:
         name: Sprach-Vergleichstabelle für Keys aus dem Wiki
+        icons:
+            template: Seite im Wiki vorhanden und enthält Standard-Vorlage.
+            error: Seite im Wiki vorhanden und enthält Standard-Vorlage. Die Vorlage konnte von taginfo aber nicht verstanden werden.
+            page: Seite im Wiki vorhanden, enthält aber keine Standard-Vorlage.
+            redirect: Seite im Wiki ist ein Verweise auf andere Wiki-Seite.
+        intro: |
+            <p>Diese Tabelle zeigt alle Keys zu denen es mindestens eine Wiki-Seite gibt und in
+            welchen Sprachen diese Wiki-Seiten sind.</p>
     languages:
         name: Sprachen
+        intro: |
+            <p>OpenStreetMap ist ein internationales Projekt. Tags und ihre Beschreibungen
+            können in jeder Sprache sein. Diese Tabelle zeigt die Sprachen, die taginfo
+            kennt, und wieviele Wiki-Seiten es in diesen Sprachen gibt, die Keys beziehungsweise
+            Tags dokumentieren.</p>
+        code: Code
+        native_name: Name der Sprache
+        english_name: Englischer Name
+        wiki_key_pages: Wiki-Seiten für Keys
+        wiki_tag_pages: Wiki-Seiten für Tags
     wiki_pages_about_non_existing_keys:
         name: Wiki-Seiten zu nicht-existierende Keys
+        intro: |
+            <p>Diese Tabelle zeigt Keys, zu denen (mindestens) eine Wiki-Seite existiert, die
+            aber in der Datenbank nicht vorkommen. Das ist nicht unbedingt ein Fehler (vielleicht
+            hat jemand die Dokumentation angelegt als Vorbereitung für die Benutzung des Keys
+            oder die Wiki-Seite beschreibt einen früher verwendeten Key, der inzwischen obsolet
+            wurde). Es kann aber auch ein Tippfehler oder anderer Fehler sein.</p>
+        wiki_pages: Wiki-Seiten
 
diff --git a/web/i18n/en.yml b/web/i18n/en.yml
index 556a489..575d728 100644
--- a/web/i18n/en.yml
+++ b/web/i18n/en.yml
@@ -12,6 +12,8 @@ osm:
     ways: Ways
     relation: Relation
     relations: Relations
+    object: Object
+    objects: Objects
     all: All
     user: User
     users: Users
@@ -49,14 +51,23 @@ misc:
     image: Image
     no_image: no image
     all: All
-    object: Object
-    objects: Objects
     object_type: Type
     description: Description
+    length: Length
     icon: Icon
     line: Line
     area: Area
     language: Language
+    objects_tooltip: Number of objects (as absolute value and as percentage of all nodes, ways, and relations).
+    nodes_tooltip: Number of nodes (as absolute value and as percentage of tagged nodes, ie. nodes without any tags are ignored).
+    ways_tooltip: Number of ways (as absolute value and as percentage of all ways).
+    relations_tooltip: Number of relations (as absolute value and as percentage of all relations).
+    values_tooltip: Number of different values for this key.
+    users_tooltip: Number of distinct users who last changed objects with this key.
+    prevalent_values: Prevalent values
+    prevalent_values_tooltip: Up to ten of the most common values for this key (only if more than 1% of tags with this key have this value).
+    in_wiki_tooltip: Key has at least one wiki page.
+    in_josm_tooltip: Key appears in JOSM config.
 
 pages:
     index:
@@ -113,27 +124,9 @@ pages:
     keys:
         intro: |
                 This table shows all tag keys that exist in the database or in any of the other sources.
-        table:
-            total: Total
-            total_tooltip: Number of objects with this key (as absolute value and as percentage of all nodes, ways, and relations).
-            nodes_tooltip: Number of nodes with this key (as absolute value and as percentage of tagged nodes, ie. nodes without any tags are ignored).
-            ways_tooltip: Number of ways with this key (as absolute value and as percentage of all ways).
-            relations_tooltip: Number of relations with this key (as absolute value and as percentage of all relations).
-            users_tooltip: Number of distinct users who last changed objects with this key.
-            in_wiki_tooltip: Key has at least one wiki page.
-            in_josm_tooltip: Key appears in JOSM config.
-            values_tooltip: Number of different values for this key.
-            prevalent_values: Prevalent values
-            prevalent_values_tooltip: Up to ten of the most common values for this key (only if more than 1% of tags with this key have this value).
     tags:
         intro: |
                 This table shows the most common tags in the database.
-        table:
-            total: Total
-            total_tooltip: Number of objects with this tag (as absolute value and as percentage of all nodes, ways, and relations).
-            nodes_tooltip: Number of nodes with this tag (as absolute value and as percentage of tagged nodes, ie. nodes without any tags are ignored).
-            ways_tooltip: Number of ways with this tag (as absolute value and as percentage of all ways).
-            relations_tooltip: Number of relations with this tag (as absolute value and as percentage of all relations).
     key:
         description_from_wiki: Description of this key from the wiki (if available in your chosen language, otherwise in English).
         no_description_in_wiki: No description for this key in the wiki.
@@ -233,10 +226,6 @@ sources:
         description: Configuration data from the Merkaartor OSM editor.
 
 reports:
-    database_statistics:
-        name: Database statistics
-    josm_styles:
-        name: JOSM styles
     characters_in_keys:
         name: Characters in keys
         intro: |
@@ -255,6 +244,7 @@ reports:
                 space: Like C but contains at least one whitespace character (space, tab, new line, carriage return, or from other alphabets).
                 problem: Like C but contains possibly problematic characters <span class="char">=+/&amp;&lt;&gt;;'"?%#@\,</span>.
                 rest: Everything else.
+                total: Total
         whitespace:
             tab: Whitespace
             title: Keys with whitespace
@@ -277,10 +267,33 @@ reports:
                 between tag keys and values.<br/>
                 Keys that appear in this list are not necessarily wrong though. But
                 in many cases they are just results of some error.</p>
+    database_statistics:
+        name: Database statistics
     frequently_used_keys_without_wiki_page:
         name: Frequently used keys without wiki page
+        intro: |
+            <p>This table shows keys that appear more than 10&thinsp;000 times in the OSM
+            database but have no wiki page describing them.  If you know anything about one
+            of these keys, please create the wiki page by clicking on the link in the
+            leftmost column and describe the key. Sometimes it might make sense to create a
+            redirect to a different wiki page instead. To do this put just one line with
+            <tt style="background-color: #f0f0f0; padding: 0 2px;">#REDIRECT [[<i>page name</i>]]</tt>
+            in the wiki page.</p>
+        also_show_keys: Also show keys that have no English language wiki page but a page in some other language.
+        table:
+            create_wiki_page: Create wiki page...
+    josm_styles:
+        name: JOSM styles
     key_lengths:
         name: Key lengths
+        intro: |
+            <p>Tag keys can be between 0 and 255 (Unicode) characters long. Very short or very long keys are often, but not always, errors.</p>
+        table:
+            number_of_objects: Number of objects
+        histogram:
+            intro: This histogram shows how many keys there are of each length.
+            key_length: Key length
+            number_of_keys: Number of keys
     language_comparison_table_for_keys_in_the_wiki:
         name: Language comparison table for keys in the wiki
         icons:
@@ -294,9 +307,14 @@ reports:
         name: Languages
         intro: |
             <p>OpenStreetMap is an international project. Tags and their descriptions can
-            be in any language. This table lists the languages Taginfo knows about and how
+            be in any language. This table lists the languages taginfo knows about and how
             many wiki pages there are in these languages documenting keys and tags,
             respectively.</p>
+        code: Code
+        native_name: Native name
+        english_name: English name
+        wiki_key_pages: Wiki key pages
+        wiki_tag_pages: Wiki tag pages
     wiki_pages_about_non_existing_keys:
         name: Wiki pages about non-existing keys
         intro: |
@@ -304,4 +322,5 @@ reports:
             instance in the database. This is not necessarily an error (maybe somebody
             added the documentation in the wiki as preparation for using a key or the wiki
             page documents a now obsolete key), but it can also be a typo or other error.</p>
+        wiki_pages: Wiki pages
 
diff --git a/web/views/reports/characters_in_keys.erb b/web/views/reports/characters_in_keys.erb
index a07495d..a8beabe 100644
--- a/web/views/reports/characters_in_keys.erb
+++ b/web/views/reports/characters_in_keys.erb
@@ -32,7 +32,7 @@
                 <td class="tc" style="border-top: 1px solid #000000;"></td>
                 <td class="tr" style="border-top: 1px solid #000000;"><%= @db.stats('num_keys') %></td>
                 <td class="tr" style="border-top: 1px solid #000000;">100%</td>
-                <td class="tl" style="border-top: 1px solid #000000;">Total</td>
+                <td class="tl" style="border-top: 1px solid #000000;"><%= t.reports.characters_in_keys.statistics.characters_in_keys.total %></td>
             </tr>
         </table>
     </div>
diff --git a/web/views/reports/database_statistics.erb b/web/views/reports/database_statistics.erb
index da04737..3cf9f94 100644
--- a/web/views/reports/database_statistics.erb
+++ b/web/views/reports/database_statistics.erb
@@ -2,9 +2,9 @@
 
 <table class="boxes">
     <tr>
-        <td><h2><img class="icon_large" src="/img/types/all.24.png" alt=""/> OBJECTS</h2></td>
+        <td><h2><img class="icon_large" src="/img/types/all.24.png" alt=""/> <%= t.osm.objects %></h2></td>
         <td rowspan="4" width="20"></td>
-        <td><h2><img class="icon_large" src="/img/types/tag.24.png" alt=""/> TAGS</h2></td>
+        <td><h2><img class="icon_large" src="/img/types/tag.24.png" alt=""/> <%= t.osm.tags %></h2></td>
         <td rowspan="4" width="20"></td>
         <td></td>
     </tr>
@@ -24,9 +24,9 @@
         <td></td>
     </tr>
     <tr>
-        <td><h2><img class="icon_large" src="/img/types/node.24.png" alt=""/> NODES</h2></td>
-        <td><h2><img class="icon_large" src="/img/types/way.24.png" alt=""/> WAYS</h2></td>
-        <td><h2><img class="icon_large" src="/img/types/relation.24.png" alt=""/> RELATIONS</h2></td>
+        <td><h2><img class="icon_large" src="/img/types/node.24.png" alt=""/> <%= t.osm.nodes %></h2></td>
+        <td><h2><img class="icon_large" src="/img/types/way.24.png" alt=""/> <%= t.osm.ways %></h2></td>
+        <td><h2><img class="icon_large" src="/img/types/relation.24.png" alt=""/> <%= t.osm.relations %></h2></td>
     </tr>
     <tr>
         <td class="box">
diff --git a/web/views/reports/frequently_used_keys_without_wiki_page.erb b/web/views/reports/frequently_used_keys_without_wiki_page.erb
index b1556aa..90bc546 100644
--- a/web/views/reports/frequently_used_keys_without_wiki_page.erb
+++ b/web/views/reports/frequently_used_keys_without_wiki_page.erb
@@ -1,17 +1,12 @@
 <div class="pre">
     <h1><%= @title %></h1>
-    <p>This table shows keys that appear more than 10&thinsp;000 times in the OSM
-    database but have no wiki page describing them.  If you know anything about one
-    of these keys, please create the wiki page by clicking on the link in the
-    leftmost column and describe the key. Sometimes it might make sense to create a
-    redirect to a different wiki page instead. To do this put just one line with
-    <tt style="background-color: #f0f0f0; padding: 0 2px;">#REDIRECT [[<i>page name</i>]]</tt>
-    in the wiki page.</p>
+    <%= t.reports.frequently_used_keys_without_wiki_page.intro %>
 </div>
 <div class="box resize">
     <div class="boxpre">
         <form method="" type="GET" style="margin-bottom: 10px;">
-            <input type="checkbox" name="english" id="english"<%= params[:english] == '1' ? ' checked="checked"' : '' %>/> Also show keys that have no English language wiki page but a page in some other language.
+            <input type="checkbox" name="english" id="english"<%= params[:english] == '1' ? ' checked="checked"' : '' %>/>
+            <%= t.reports.frequently_used_keys_without_wiki_page.also_show_keys %>
         </form>
     </div>
     <table id="grid-keys">
diff --git a/web/views/reports/key_lengths.erb b/web/views/reports/key_lengths.erb
index acdad7c..e6031dc 100644
--- a/web/views/reports/key_lengths.erb
+++ b/web/views/reports/key_lengths.erb
@@ -1,6 +1,6 @@
 <div class="pre">
     <h1><%= @title %></h1>
-    <p>Tag keys can be between 0 and 255 (Unicode) characters long. Very short or very long keys are often, but not always, errors.</p>
+    <%= t.reports.key_lengths.intro %>
 </div>
 <div id="tabs">
     <ul>
@@ -14,7 +14,7 @@
     </div>
     <div id="histogram">
         <h2>Histogram</h2>
-        <p>This histogram shows how many keys there are of each length.<p>
+        <p><%= t.reports.key_lengths.histogram.intro %><p>
         <div id="canvas"></div>
     </div>
 </div>
diff --git a/web/viewsjs/key.js.erb b/web/viewsjs/key.js.erb
index baf2f15..5946cd6 100644
--- a/web/viewsjs/key.js.erb
+++ b/web/viewsjs/key.js.erb
@@ -88,7 +88,7 @@ var create_flexigrid_for = {
                 { display: '<%= page.wiki_pages.wiki_page %>', name: 'title', width: 160, sortable: false, align: 'right' },
                 { display: '<%= misc.description %>', name: 'description', width: 400, sortable: false },
                 { display: '<%= misc.image %>', name: 'image', width: 120, sortable: false },
-                { display: '<%= misc.objects %>', name: 'objects', width:  80, sortable: false },
+                { display: '<%= osm.objects %>', name: 'objects', width:  80, sortable: false },
                 { display: '<%= page.wiki_pages.implied_tags %>', name: 'tags_implied', width: 120, sortable: false },
                 { display: '<%= page.wiki_pages.combined_tags %>', name: 'tags_combination', width: 120, sortable: false },
                 { display: '<%= page.wiki_pages.linked_tags %>', name: 'tags_linked', width: 220, sortable: false }
diff --git a/web/viewsjs/keys.js.erb b/web/viewsjs/keys.js.erb
index c39cb80..a19754f 100644
--- a/web/viewsjs/keys.js.erb
+++ b/web/viewsjs/keys.js.erb
@@ -1,21 +1,21 @@
 <%
     osm = @trans.t.osm
-    table = @trans.t.pages.keys.table
+    misc = @trans.t.misc
  %>
 function page_init() {
     create_flexigrid('grid-keys', {
         url: '/api/2/db/keys?include=prevalent_values',
         colModel: [
             { display: '<%= osm.key %>', name: 'key', width: 160, sortable: true },
-            { display: '<span title="<%= table.total_tooltip %>"><img src="/img/types/all.16.png" width="16" height="16" alt=""/> <%= table.total %></span>', name: 'count_all', width: 200, sortable: true, align: 'center' },
-            { display: '<span title="<%= table.nodes_tooltip %>"><img src="/img/types/node.16.png" width="16" height="16" alt=""/> <%= osm.nodes %></span>', name: 'count_nodes', width: 220, sortable: true, align: 'center' },
-            { display: '<span title="<%= table.ways_tooltip %>"><img src="/img/types/way.16.png" width="16" height="16" alt=""/> <%= osm.ways %></span>', name: 'count_ways', width: 220, sortable: true, align: 'center' },
-            { display: '<span title="<%= table.relations_tooltip %>"><img src="/img/types/relation.16.png" width="16" height="16" alt=""/> <%= osm.relations %></span>', name: 'count_relations',  width: 220, sortable: true, align: 'center' },
-            { display: '<span title="<%= table.users_tooltip %>"><%= osm.users %></span>', name: 'users_all', width: 44, sortable: true, align: 'right' },
-            { display: '<img src="/img/sources/wiki.16.png" alt="Wiki" width="16" height="16" title="<%= table.in_wiki_tooltip %>"/>', name: 'in_wiki', width: 20, sortable: true, align: 'center' },
-            { display: '<img src="/img/sources/josm.16.png" alt="JOSM" width="16" height="16" title="<%= table.in_josm_tooltip %>"/>', name: 'in_josm', width: 20, sortable: true, align: 'center' },
-            { display: '<span title="<%= table.values_tooltip %>"><%= osm.values %></span>', name: 'values_all', width: 70, sortable: true, align: 'right' },
-            { display: '<span title="<%= table.prevalent_values_tooltip %>"><%= table.prevalent_values %></span>', name: 'prevalent_values', width: 500, sortable: true }
+            { display: '<span title="<%= misc.objects_tooltip %>"><img src="/img/types/all.16.png" width="16" height="16" alt=""/> <%= osm.objects %></span>', name: 'count_all', width: 200, sortable: true, align: 'center' },
+            { display: '<span title="<%= misc.nodes_tooltip %>"><img src="/img/types/node.16.png" width="16" height="16" alt=""/> <%= osm.nodes %></span>', name: 'count_nodes', width: 220, sortable: true, align: 'center' },
+            { display: '<span title="<%= misc.ways_tooltip %>"><img src="/img/types/way.16.png" width="16" height="16" alt=""/> <%= osm.ways %></span>', name: 'count_ways', width: 220, sortable: true, align: 'center' },
+            { display: '<span title="<%= misc.relations_tooltip %>"><img src="/img/types/relation.16.png" width="16" height="16" alt=""/> <%= osm.relations %></span>', name: 'count_relations',  width: 220, sortable: true, align: 'center' },
+            { display: '<span title="<%= misc.users_tooltip %>"><%= osm.users %></span>', name: 'users_all', width: 44, sortable: true, align: 'right' },
+            { display: '<img src="/img/sources/wiki.16.png" alt="Wiki" width="16" height="16" title="<%= misc.in_wiki_tooltip %>"/>', name: 'in_wiki', width: 20, sortable: true, align: 'center' },
+            { display: '<img src="/img/sources/josm.16.png" alt="JOSM" width="16" height="16" title="<%= misc.in_josm_tooltip %>"/>', name: 'in_josm', width: 20, sortable: true, align: 'center' },
+            { display: '<span title="<%= misc.values_tooltip %>"><%= osm.values %></span>', name: 'values_all', width: 70, sortable: true, align: 'right' },
+            { display: '<span title="<%= misc.prevalent_values_tooltip %>"><%= misc.prevalent_values %></span>', name: 'prevalent_values', width: 500, sortable: true }
         ],
         searchitems: [
             { display: '<%= osm.key %>', name: 'key' }
diff --git a/web/viewsjs/reports/characters_in_keys.js.erb b/web/viewsjs/reports/characters_in_keys.js.erb
index 65ebd8c..6c7e2bc 100644
--- a/web/viewsjs/reports/characters_in_keys.js.erb
+++ b/web/viewsjs/reports/characters_in_keys.js.erb
@@ -1,7 +1,6 @@
 <%
     osm = @trans.t.osm
     misc = @trans.t.misc
-    page = @trans.t.reports.characters_in_keys
  %>
 var create_flexigrid_for = {
     whitespace: function() {
@@ -9,14 +8,12 @@ var create_flexigrid_for = {
             url: '/api/2/db/keys?filters=characters_space&include=prevalent_values',
             colModel: [
                 { display: '<%= osm.key %>', name: 'key', width: 250, sortable: true },
-                { display: '<span title="Number of objects with this key"><img src="/img/types/all.16.png" alt=""/> Total</span>',           name: 'count_all',        width: 250, sortable: true, align: 'center' },
-                { display: 'Users', name: 'users_all', width: 44, sortable: true, align: 'right' },
-                { display: '<img src="/img/sources/wiki.16.png" alt="Wiki" title="Wiki"/>', name: 'in_wiki', width: 20, sortable: true, align: 'center' },
-                { display: '<img src="/img/sources/josm.16.png" alt="JOSM" title="JOSM"/>', name: 'in_josm', width: 20, sortable: true, align: 'center' },
-                //   { display: '<img src="/img/sources/potlatch.16.png" alt="Potlatch 2" title="Potlatch 2"/>', name: 'in_potlatch', width: 20, sortable: true, align: 'center' },
-                //   { display: '<img src="/img/sources/merkaartor.16.png" alt="Merkaartor" title="Merkaartor"/>', name: 'in_merkaartor', width: 20, sortable: true, align: 'center' },
-                { display: '<span title="Number of different values for this key">Values</span>', name: 'values_all', width: 70, sortable: true, align: 'right' },
-                { display: 'Prevalent Values', name: 'prevalent_values', width: 500, sortable: true }
+                { display: '<span title="<%= misc.objects_tooltip %>"><img src="/img/types/all.16.png" width="16" height="16" alt=""/> <%= osm.objects %></span>', name: 'count_all', width: 250, sortable: true, align: 'center' },
+                { display: '<span title="<%= misc.users_tooltip %>"><%= osm.users %></span>', name: 'users_all', width: 44, sortable: true, align: 'right' },
+                { display: '<img src="/img/sources/wiki.16.png" width="16" height="16" alt="Wiki" title="<%= misc.in_wiki_tooltip %>"/>', name: 'in_wiki', width: 20, sortable: true, align: 'center' },
+                { display: '<img src="/img/sources/josm.16.png" width="16" height="16" alt="JOSM" title="<%= misc.in_josm_tooltip %>"/>', name: 'in_josm', width: 20, sortable: true, align: 'center' },
+                { display: '<span title="<%= misc.values_tooltip %>"><%= osm.values %></span>', name: 'values_all', width: 70, sortable: true, align: 'right' },
+                { display: '<span title="<%= misc.prevalent_values_tooltip %>"><%= misc.prevalent_values %></span>', name: 'prevalent_values', width: 500, sortable: true }
             ],
             searchitems: [
                 { display: '<%= osm.key %>', name: 'key' }
@@ -31,8 +28,6 @@ var create_flexigrid_for = {
                         print_with_ts(row.users_all),
                         row.in_wiki       ? '&#x2714;' : '-',
                         row.in_josm       ? '&#x2714;' : '-',
-                    //       row.in_potlatch   ? '&#x2714;' : '-',
-                    //       row.in_merkaartor ? '&#x2714;' : '-',
                         print_with_ts(row.values_all),
                         print_prevalent_value_list(row.key, row.prevalent_values)
                     ] };
@@ -46,14 +41,12 @@ var create_flexigrid_for = {
             url: '/api/2/db/keys?filters=characters_problematic&include=prevalent_values',
             colModel: [
                 { display: '<%= osm.key %>', name: 'key', width: 250, sortable: true },
-                { display: '<span title="Number of objects with this key"><img src="/img/types/all.16.png" alt=""/> Total</span>',           name: 'count_all',        width: 250, sortable: true, align: 'center' },
-                { display: 'Users', name: 'users_all', width: 44, sortable: true, align: 'right' },
-                { display: '<img src="/img/sources/wiki.16.png" alt="Wiki" title="Wiki"/>', name: 'in_wiki', width: 20, sortable: true, align: 'center' },
-                { display: '<img src="/img/sources/josm.16.png" alt="JOSM" title="JOSM"/>', name: 'in_josm', width: 20, sortable: true, align: 'center' },
-                //   { display: '<img src="/img/sources/potlatch.16.png" alt="Potlatch 2" title="Potlatch 2"/>', name: 'in_potlatch', width: 20, sortable: true, align: 'center' },
-                //   { display: '<img src="/img/sources/merkaartor.16.png" alt="Merkaartor" title="Merkaartor"/>', name: 'in_merkaartor', width: 20, sortable: true, align: 'center' },
-                { display: '<span title="Number of different values for this key">Values</span>', name: 'values_all', width: 70, sortable: true, align: 'right' },
-                { display: 'Prevalent Values', name: 'prevalent_values', width: 500, sortable: true }
+                { display: '<span title="<%= misc.objects_tooltip %>"><img src="/img/types/all.16.png" width="16" height="16" alt=""/> <%= osm.objects %></span>', name: 'count_all', width: 250, sortable: true, align: 'center' },
+                { display: '<span title="<%= misc.users_tooltip %>"><%= osm.users %></span>', name: 'users_all', width: 44, sortable: true, align: 'right' },
+                { display: '<img src="/img/sources/wiki.16.png" width="16" height="16" alt="Wiki" title="<%= misc.in_wiki_tooltip %>"/>', name: 'in_wiki', width: 20, sortable: true, align: 'center' },
+                { display: '<img src="/img/sources/josm.16.png" width="16" height="16" alt="JOSM" title="<%= misc.in_josm_tooltip %>"/>', name: 'in_josm', width: 20, sortable: true, align: 'center' },
+                { display: '<span title="<%= misc.values_tooltip %>"><%= osm.values %></span>', name: 'values_all', width: 70, sortable: true, align: 'right' },
+                { display: '<span title="<%= misc.prevalent_values_tooltip %>"><%= misc.prevalent_values %></span>', name: 'prevalent_values', width: 500, sortable: true }
             ],
             searchitems: [
                 { display: '<%= osm.key %>', name: 'key' }
@@ -68,8 +61,6 @@ var create_flexigrid_for = {
                         print_with_ts(row.users_all),
                         row.in_wiki       ? '&#x2714;' : '-',
                         row.in_josm       ? '&#x2714;' : '-',
-                    //       row.in_potlatch   ? '&#x2714;' : '-',
-                    //       row.in_merkaartor ? '&#x2714;' : '-',
                         print_with_ts(row.values_all),
                         print_prevalent_value_list(row.key, row.prevalent_values)
                     ] };
diff --git a/web/viewsjs/reports/frequently_used_keys_without_wiki_page.js.erb b/web/viewsjs/reports/frequently_used_keys_without_wiki_page.js.erb
index b799a5d..ea5c84e 100644
--- a/web/viewsjs/reports/frequently_used_keys_without_wiki_page.js.erb
+++ b/web/viewsjs/reports/frequently_used_keys_without_wiki_page.js.erb
@@ -7,12 +7,12 @@ function create_flexigrid_with_option(english) {
     create_flexigrid('grid-keys', {
         url: '/api/2/reports/frequently_used_keys_without_wiki_page?english=' + english,
         colModel: [
-            { display: 'Create Wiki Page...', name: 'create_wiki_page', width: 200, sortable: false },
+            { display: '<%= page.table.create_wiki_page %>', name: 'create_wiki_page', width: 200, sortable: false },
             { display: '<%= osm.key %>', name: 'key', width: 180, sortable: true },
-            { display: '<span title="Number of objects with this key">Total</span>', name: 'count_all', width: 70, sortable: true, align: 'right' },
-            { display: 'Users', name: 'users_all', width: 44, sortable: true, align: 'right' },
-            { display: '<span title="Number of different values for this key">Values</span>', name: 'values_all', width: 70, sortable: true, align: 'right' },
-            { display: 'Prevalent Values', name: 'prevalent_values', width: 500, sortable: true }
+            { display: '<span title="<%= misc.objects_tooltip %>"><img src="/img/types/all.16.png" width="16" height="16" alt=""/> <%= osm.objects %></span>', name: 'count_all', width: 70, sortable: true, align: 'right' },
+            { display: '<%= osm.users %>', name: 'users_all', width: 44, sortable: true, align: 'right' },
+            { display: '<span title="<%= misc.values_tooltip %>"><%= osm.values %></span>', name: 'values_all', width: 70, sortable: true, align: 'right' },
+            { display: '<span title="<%= misc.prevalent_values_tooltip %>"><%= misc.prevalent_values %></span>', name: 'prevalent_values', width: 500, sortable: true }
         ],
         searchitems: [
             { display: '<%= osm.key %>', name: 'key' }
diff --git a/web/viewsjs/reports/josm_styles.js.erb b/web/viewsjs/reports/josm_styles.js.erb
index a49e1c6..d051a41 100644
--- a/web/viewsjs/reports/josm_styles.js.erb
+++ b/web/viewsjs/reports/josm_styles.js.erb
@@ -1,7 +1,6 @@
 <%
     osm = @trans.t.osm
     misc = @trans.t.misc
-    page = @trans.t.reports.josm_styles
  %>
 function create_flexigrid_with_option(stylename) {
     create_flexigrid('grid-rules', {
@@ -9,9 +8,9 @@ function create_flexigrid_with_option(stylename) {
         colModel: [
             { display: '<%= osm.key %>',   name: 'k', width: 300, sortable: true },
             { display: '<%= osm.value %>', name: 'v', width: 300, sortable: true },
-            { display: 'Icon', name: 'icon', width: 30, sortable: false, align: 'center' },
-            { display: 'Line', name: 'line', width: 30, sortable: false, align: 'center' },
-            { display: 'Area', name: 'area', width: 30, sortable: false, align: 'center' }
+            { display: '<%= misc.icon %>', name: 'icon', width: 40, sortable: false, align: 'center' },
+            { display: '<%= misc.line %>', name: 'line', width: 40, sortable: false, align: 'center' },
+            { display: '<%= misc.area %>', name: 'area', width: 40, sortable: false, align: 'center' }
         ],
         searchitems: [
             { display: '<%= osm.key %>/<%= osm.value %>', name: 'k' }
diff --git a/web/viewsjs/reports/key_lengths.js.erb b/web/viewsjs/reports/key_lengths.js.erb
index 3cff6fb..1bde6e7 100644
--- a/web/viewsjs/reports/key_lengths.js.erb
+++ b/web/viewsjs/reports/key_lengths.js.erb
@@ -8,15 +8,13 @@ var create_flexigrid_for = {
         create_flexigrid('grid-keys', {
             url: '/api/2/db/keys?include=prevalent_values',
             colModel: [
-                { display: 'Length', name: 'length', width: 60, sortable: true, align: 'right' },
+                { display: '<%= misc.length %>', name: 'length', width: 60, sortable: true, align: 'right' },
                 { display: '<%= osm.key %>', name: 'key', width: 180, sortable: true },
-                { display: 'Number of Objects', name: 'count_all', width: 250, sortable: true, align: 'center' },
-                { display: '<img src="/img/sources/wiki.16.png" alt="Wiki" title="Wiki"/>', name: 'in_wiki', width: 20, sortable: true, align: 'center' },
-                { display: '<img src="/img/sources/josm.16.png" alt="JOSM" title="JOSM"/>', name: 'in_josm', width: 20, sortable: true, align: 'center' },
-                //   { display: '<img src="/img/sources/potlatch.16.png" alt="Potlatch 2" title="Potlatch 2"/>', name: 'in_potlatch', width: 20, sortable: true, align: 'center' },
-                //   { display: '<img src="/img/sources/merkaartor.16.png" alt="Merkaartor" title="Merkaartor"/>', name: 'in_merkaartor', width: 20, sortable: true, align: 'center' },
-                { display: '<span title="Number of different values for this key">Values</span>', name: 'values_all', width: 70, sortable: true, align: 'right' },
-                { display: 'Prevalent Values', name: 'prevalent_values', width: 500, sortable: true }
+                { display: '<span title="<%= misc.objects_tooltip %>"><img src="/img/types/all.16.png" width="16" height="16" alt=""/> <%= osm.objects %></span>', name: 'count_all', width: 250, sortable: true, align: 'center' },
+                { display: '<img src="/img/sources/wiki.16.png" alt="Wiki" width="16" height="16" title="<%= misc.in_wiki_tooltip %>"/>', name: 'in_wiki', width: 20, sortable: true, align: 'center' },
+                { display: '<img src="/img/sources/josm.16.png" alt="JOSM" width="16" height="16" title="<%= misc.in_josm_tooltip %>"/>', name: 'in_josm', width: 20, sortable: true, align: 'center' },
+                { display: '<span title="<%= misc.values_tooltip %>"><%= osm.values %></span>', name: 'values_all', width: 70, sortable: true, align: 'right' },
+                { display: '<span title="<%= misc.prevalent_values_tooltip %>"><%= misc.prevalent_values %></span>', name: 'prevalent_values', width: 500, sortable: true }
             ],
             searchitems: [
                 { display: '<%= osm.key %>', name: 'key' }
@@ -70,14 +68,14 @@ function page_init() {
         .lineWidth(1);
 
     vis.add(pv.Label)
-        .data(['Key length'])
+        .data(['<%= page.histogram.key_length %>'])
         .font('12px Arial,sans-serif')
         .bottom(-36)
         .left(w/2)
         .textAlign('center');
 
     vis.add(pv.Label)
-        .data(['Number of keys'])
+        .data(['<%= page.histogram.number_of_keys %>'])
         .font('12px Arial,sans-serif')
         .left(-48)
         .bottom(h/2)
diff --git a/web/viewsjs/reports/language_comparison_table_for_keys_in_the_wiki.js.erb b/web/viewsjs/reports/language_comparison_table_for_keys_in_the_wiki.js.erb
index 6f47047..002af8a 100644
--- a/web/viewsjs/reports/language_comparison_table_for_keys_in_the_wiki.js.erb
+++ b/web/viewsjs/reports/language_comparison_table_for_keys_in_the_wiki.js.erb
@@ -1,4 +1,6 @@
 <%
+    osm = @trans.t.osm
+
     @languages = @db.execute('SELECT language FROM wiki_languages ORDER by language').map do |row|
         row['language']
     end
@@ -20,13 +22,13 @@ function page_init() {
         method: 'GET',
         dataType: 'json',
         colModel: [
-            { display: '<br/>Key', name: 'key', width: 200, sortable: true },
+            { display: '<br/><%= osm.key %>', name: 'key', width: 200, sortable: true },
             <% @languages.each do |lang| %>
             { display: '<%= ::Language[lang].native_name %><br /><span class="lang" style="margin-top: 2px;"><%= lang %></span>', name: '<%= lang %>', align: 'center', width: 60, sortable: false },
             <% end %>
         ],
         searchitems: [
-            { display: 'Key', name: 'key' }
+            { display: '<%= osm.key %>', name: 'key' }
         ],
         sortname: 'key',
         sortorder: 'asc',
diff --git a/web/viewsjs/reports/languages.js.erb b/web/viewsjs/reports/languages.js.erb
index 5be1b0c..2ea0724 100644
--- a/web/viewsjs/reports/languages.js.erb
+++ b/web/viewsjs/reports/languages.js.erb
@@ -1,12 +1,13 @@
+<% page = @trans.t.reports.languages %>
 function page_init() {
     create_flexigrid('grid-langs', {
         url: '/api/2/reports/languages',
         colModel: [
-            { display: 'Code', name: 'code', width: 60, sortable: true },
-            { display: 'Native Name', name: 'native_name', width: 150, sortable: true },
-            { display: 'English Name', name: 'english_name', width: 150, sortable: true },
-            { display: 'Wiki Key Pages', name: 'wiki_key_pages', width: 260, sortable: true, align: 'center' },
-            { display: 'Wiki Tag Pages', name: 'wiki_tag_pages', width: 260, sortable: true, align: 'center' }
+            { display: '<%= page.code %>', name: 'code', width: 60, sortable: true },
+            { display: '<%= page.native_name %>', name: 'native_name', width: 150, sortable: true },
+            { display: '<%= page.english_name %>', name: 'english_name', width: 150, sortable: true },
+            { display: '<%= page.wiki_key_pages %>', name: 'wiki_key_pages', width: 260, sortable: true, align: 'center' },
+            { display: '<%= page.wiki_tag_pages %>', name: 'wiki_tag_pages', width: 260, sortable: true, align: 'center' }
         ],
         sortname: 'code',
         sortorder: 'asc',
diff --git a/web/viewsjs/reports/wiki_pages_about_non_existing_keys.js.erb b/web/viewsjs/reports/wiki_pages_about_non_existing_keys.js.erb
index f31dc45..9dfc9d9 100644
--- a/web/viewsjs/reports/wiki_pages_about_non_existing_keys.js.erb
+++ b/web/viewsjs/reports/wiki_pages_about_non_existing_keys.js.erb
@@ -1,18 +1,17 @@
 <%
     osm = @trans.t.osm
-    misc = @trans.t.misc
     page = @trans.t.reports.wiki_pages_about_non_existing_keys
  %>
 function page_init() {
     create_flexigrid('grid-keys', {
         url: '/api/2/db/keys?filters=in_wiki,not_in_db&include=wikipages',
         colModel: [
-            { display: '<img src="/img/sources/wiki.16.png" alt="Wiki" title="Wiki"/>', name: 'in_wiki', width: 20, sortable: true, align: 'center' },
-            { display: '<img src="/img/sources/josm.16.png" alt="JOSM" title="JOSM"/>', name: 'in_josm', width: 20, sortable: true, align: 'center' },
-        //   { display: '<img src="/img/sources/potlatch.16.png" alt="Potlatch 2" title="Potlatch 2"/>', name: 'in_potlatch', width: 20, sortable: true, align: 'center' },
-        //   { display: '<img src="/img/sources/merkaartor.16.png" alt="Merkaartor" title="Merkaartor"/>', name: 'in_merkaartor', width: 20, sortable: true, align: 'center' },
+            { display: '<img src="/img/sources/wiki.16.png" alt="Wiki" width="16" height="16" title="Wiki"/>', name: 'in_wiki', width: 20, sortable: true, align: 'center' },
+            { display: '<img src="/img/sources/josm.16.png" alt="JOSM" width="16" height="16" title="JOSM"/>', name: 'in_josm', width: 20, sortable: true, align: 'center' },
+        //   { display: '<img src="/img/sources/potlatch.16.png" alt="Potlatch 2" width="16" height="16" title="Potlatch 2"/>', name: 'in_potlatch', width: 20, sortable: true, align: 'center' },
+        //   { display: '<img src="/img/sources/merkaartor.16.png" alt="Merkaartor" width="16" height="16" title="Merkaartor"/>', name: 'in_merkaartor', width: 20, sortable: true, align: 'center' },
             { display: '<%= osm.key %>', name: 'key', width: 260, sortable: true, align: 'left' },
-            { display: 'Wiki Pages', name: 'wikipages', width: 400, sortable: false, align: 'left' }
+            { display: '<%= page.wiki_pages %>', name: 'wikipages', width: 400, sortable: false, align: 'left' }
         ],
         searchitems: [
             { display: '<%= osm.key %>', name: 'key' }
diff --git a/web/viewsjs/tag.js.erb b/web/viewsjs/tag.js.erb
index 931e0b2..7b83255 100644
--- a/web/viewsjs/tag.js.erb
+++ b/web/viewsjs/tag.js.erb
@@ -61,7 +61,7 @@ var create_flexigrid_for = {
                 { display: '<%= page.wiki_pages.wiki_page %>', name: 'title', width: 200, sortable: false, align: 'right' },
                 { display: '<%= misc.description %>', name: 'description', width: 400, sortable: false },
                 { display: '<%= misc.image %>', name: 'image', width: 120, sortable: false },
-                { display: '<%= misc.objects %>', name: 'objects', width:  80, sortable: false },
+                { display: '<%= osm.objects %>', name: 'objects', width:  80, sortable: false },
                 { display: '<%= page.wiki_pages.implied_tags %>', name: 'tags_implied', width: 120, sortable: false },
                 { display: '<%= page.wiki_pages.combined_tags %>', name: 'tags_combination', width: 120, sortable: false },
                 { display: '<%= page.wiki_pages.linked_tags %>', name: 'tags_linked', width: 220, sortable: false }
@@ -96,9 +96,9 @@ var create_flexigrid_for = {
             url: '/api/2/josm/styles/standard/tags?key=' + encodeURIComponent(key) + '&value=' + encodeURIComponent(value),
             colModel: [
                 { display: '<%= osm.value %>', name: 'v',    width: 400, sortable: false },
-                { display: '<%= misc.icon %>', name: 'icon', width: 30, sortable: false, align: 'center' },
-                { display: '<%= misc.line %>', name: 'line', width: 30, sortable: false, align: 'center' },
-                { display: '<%= misc.area %>', name: 'area', width: 30, sortable: false, align: 'center' }
+                { display: '<%= misc.icon %>', name: 'icon', width: 40, sortable: false, align: 'center' },
+                { display: '<%= misc.line %>', name: 'line', width: 40, sortable: false, align: 'center' },
+                { display: '<%= misc.area %>', name: 'area', width: 40, sortable: false, align: 'center' }
             ],
             sortname: 'v',
             sortorder: 'asc',
diff --git a/web/viewsjs/tags.js.erb b/web/viewsjs/tags.js.erb
index 9ebf6b0..94b0b91 100644
--- a/web/viewsjs/tags.js.erb
+++ b/web/viewsjs/tags.js.erb
@@ -1,16 +1,16 @@
 <%
     osm = @trans.t.osm
-    table = @trans.t.pages.tags.table
+    misc = @trans.t.misc
  %>
 function page_init() {
     create_flexigrid('grid-tags', {
         url: '/api/2/db/tags',
         colModel: [
             { display: '<%= osm.tag %>', name: 'tag', width: 300, sortable: true },
-            { display: '<span title="<%= table.total_tooltip %>"><img src="/img/types/all.16.png" width="16" height="16" alt=""/> <%= table.total %></span>', name: 'count_all', width: 260, sortable: true, align: 'center' },
-            { display: '<span title="<%= table.nodes_tooltip %>"><img src="/img/types/node.16.png" width="16" height="16" alt=""/> <%= osm.nodes %></span>', name: 'count_nodes', width: 220, sortable: true, align: 'center' },
-            { display: '<span title="<%= table.ways_tooltip %>"><img src="/img/types/way.16.png" width="16" height="16" alt=""/> <%= osm.ways %></span>', name: 'count_ways', width: 220, sortable: true, align: 'center' },
-            { display: '<span title="<%= table.relations_tooltip %>"><img src="/img/types/relation.16.png" width="16" height="16" alt=""/> <%= osm.relations %></span>', name: 'count_relations',  width: 220, sortable: true, align: 'center' }
+            { display: '<span title="<%= misc.objects_tooltip %>"><img src="/img/types/all.16.png" width="16" height="16" alt=""/> <%= osm.objects %></span>', name: 'count_all', width: 260, sortable: true, align: 'center' },
+            { display: '<span title="<%= misc.nodes_tooltip %>"><img src="/img/types/node.16.png" width="16" height="16" alt=""/> <%= osm.nodes %></span>', name: 'count_nodes', width: 220, sortable: true, align: 'center' },
+            { display: '<span title="<%= misc.ways_tooltip %>"><img src="/img/types/way.16.png" width="16" height="16" alt=""/> <%= osm.ways %></span>', name: 'count_ways', width: 220, sortable: true, align: 'center' },
+            { display: '<span title="<%= misc.relations_tooltip %>"><img src="/img/types/relation.16.png" width="16" height="16" alt=""/> <%= osm.relations %></span>', name: 'count_relations',  width: 220, sortable: true, align: 'center' }
         ],
         searchitems: [
             { display: '<%= osm.tag %>', name: 'tag' }