diff --git a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties
index c0791a15b0540b9b8dda248f5828a2a024c9815a..203f47fee0f51d32ac37ba0dff9809a455965aec 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties
+++ b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties
@@ -305,16 +305,15 @@ BlackboardAttribute.tskGeoLatitudeEnd.text=Ending Latitude
 BlackboardAttribute.tskGeoLongitudeStart.text=Starting Longitude
 BlackboardAttribute.tskGeoLongitudeEnd.text=Ending Longitude
 BlackboardAttribute.tskReadStatus.text=Read
-DatabaseConnectionCheck.Everything=Invalid hostname, port number, username, and/or password.
-DatabaseConnectionCheck.Hostname=Invalid hostname.
-DatabaseConnectionCheck.Port=Invalid port number.
+DatabaseConnectionCheck.Everything=Invalid hostname, port number, username, password, and firewall settings.
+DatabaseConnectionCheck.Port=Verify that PostgreSQL server is running, it's port number, and firewall settings.
 DatabaseConnectionCheck.HostnameOrPort=Invalid hostname and/or port number.
 DatabaseConnectionCheck.Authentication=Invalid username and/or password.
 DatabaseConnectionCheck.Access=Invalid username and/or password.
 DatabaseConnectionCheck.ServerDiskSpace=PostgreSQL server issue. Check disk space and memory availabilty on the PostgreSQL server.
 DatabaseConnectionCheck.ServerRestart="PostgreSQL server issue. PostgreSQL server may need to be restarted.
 DatabaseConnectionCheck.InternalServerIssue=Internal PostgreSQL issue. Database may be corrupted.
-DatabaseConnectionCheck.Connection=Invalid hostname, port, username, and/or password.
+DatabaseConnectionCheck.Connection=Invalid hostname, port, username, and/or password. Check firewall settings.
 DatabaseConnectionCheck.Installation=Issue with installation. JDBC driver not found.
 DatabaseConnectionCheck.MissingHostname=Missing hostname.
 DatabaseConnectionCheck.MissingPort=Missing port number.
diff --git a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED
index c0791a15b0540b9b8dda248f5828a2a024c9815a..203f47fee0f51d32ac37ba0dff9809a455965aec 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED
+++ b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED
@@ -305,16 +305,15 @@ BlackboardAttribute.tskGeoLatitudeEnd.text=Ending Latitude
 BlackboardAttribute.tskGeoLongitudeStart.text=Starting Longitude
 BlackboardAttribute.tskGeoLongitudeEnd.text=Ending Longitude
 BlackboardAttribute.tskReadStatus.text=Read
-DatabaseConnectionCheck.Everything=Invalid hostname, port number, username, and/or password.
-DatabaseConnectionCheck.Hostname=Invalid hostname.
-DatabaseConnectionCheck.Port=Invalid port number.
+DatabaseConnectionCheck.Everything=Invalid hostname, port number, username, password, and firewall settings.
+DatabaseConnectionCheck.Port=Verify that PostgreSQL server is running, it's port number, and firewall settings.
 DatabaseConnectionCheck.HostnameOrPort=Invalid hostname and/or port number.
 DatabaseConnectionCheck.Authentication=Invalid username and/or password.
 DatabaseConnectionCheck.Access=Invalid username and/or password.
 DatabaseConnectionCheck.ServerDiskSpace=PostgreSQL server issue. Check disk space and memory availabilty on the PostgreSQL server.
 DatabaseConnectionCheck.ServerRestart="PostgreSQL server issue. PostgreSQL server may need to be restarted.
 DatabaseConnectionCheck.InternalServerIssue=Internal PostgreSQL issue. Database may be corrupted.
-DatabaseConnectionCheck.Connection=Invalid hostname, port, username, and/or password.
+DatabaseConnectionCheck.Connection=Invalid hostname, port, username, and/or password. Check firewall settings.
 DatabaseConnectionCheck.Installation=Issue with installation. JDBC driver not found.
 DatabaseConnectionCheck.MissingHostname=Missing hostname.
 DatabaseConnectionCheck.MissingPort=Missing port number.
diff --git a/bindings/java/src/org/sleuthkit/datamodel/Bundle_ja.properties b/bindings/java/src/org/sleuthkit/datamodel/Bundle_ja.properties
index 17e3b07892f5607730a5691418230d285af22a26..f8aeaf6b799884945e7d7055cb71b8e97d531dbd 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/Bundle_ja.properties
+++ b/bindings/java/src/org/sleuthkit/datamodel/Bundle_ja.properties
@@ -249,7 +249,6 @@ DatabaseConnectionCheck.Access=\u30e6\u30fc\u30b6\u30fc\u540d\u304b\u30d1\u30b9\
 DatabaseConnectionCheck.Authentication=\u30e6\u30fc\u30b6\u30fc\u540d\u304b\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u7121\u52b9\u3067\u3059\u3002
 DatabaseConnectionCheck.Connection=\u30db\u30b9\u30c8\u540d\u3001\u30dd\u30fc\u30c8\u3001\u30e6\u30fc\u30b6\u30fc\u540d\u3001\u307e\u305f\u306f\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u7121\u52b9\u3067\u3059\u3002
 DatabaseConnectionCheck.Everything=\u30db\u30b9\u30c8\u540d\u3001\u30dd\u30fc\u30c8\u756a\u53f7\u3001\u30e6\u30fc\u30b6\u30fc\u540d\u3001\u307e\u305f\u306f\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u7121\u52b9\u3067\u3059\u3002
-DatabaseConnectionCheck.Hostname=\u7121\u52b9\u306a\u30db\u30b9\u30c8\u540d\u3002
 DatabaseConnectionCheck.HostnameOrPort=\u30db\u30b9\u30c8\u540d\u3084\u30dd\u30fc\u30c8\u756a\u53f7\u304c\u7121\u52b9\u3067\u3059\u3002
 DatabaseConnectionCheck.Installation=\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u306b\u95a2\u3059\u308b\u554f\u984c\u3002 JDBC\u30c9\u30e9\u30a4\u30d0\u30fc\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002
 DatabaseConnectionCheck.InternalServerIssue=PostgreSQL\u306e\u5185\u90e8\u554f\u984c\u3002 \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u304c\u7834\u640d\u3057\u3066\u3044\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002