Merge branch 'master' of github.com:NBKelly/netrunner into terminal-directive-campaign-cards

Author: NBKelly

resources/public/i18n/en.ftl

@@ -428,8 +428,8 @@ game_breach-server = Breach server
 game_card = Card
 
 game_card-count = {$cnt ->
-    [one] {$size} card
-    *[other] {$size} cards
+    [one] {$cnt} card
+    *[other] {$cnt} cards
 }
 
 game_click-count = {$click ->

src/cljs/nr/gameboard/board.cljs

@@ -911,7 +911,7 @@
            [:div.panel.blue-shade.popup {:ref #(swap! s assoc :hand-popup %) :class popup-direction}
             [:div
              [:a {:on-click #(close-popup % (:hand-popup @s) nil false false)} (tr [:game_close "Close"])]
-             [:label (tr [:game_card-count] size)]
+             [:label (tr [:game_card-count] {:cnt size})]
              (let [{:keys [total]} @hand-size]
                (stat-controls :hand-size [:div.hand-size (tr [:game_max-hand "Max hand size"] {:total total})]))
              [build-hand-card-view filled-hand size "card-popup-wrapper"]]])]))))