diff --git a/uppsrc/Geom/Ctrl/GeomCtrl.t b/uppsrc/Geom/Ctrl/GeomCtrl.t
index 7afebc12e..607c30a44 100644
--- a/uppsrc/Geom/Ctrl/GeomCtrl.t
+++ b/uppsrc/Geom/Ctrl/GeomCtrl.t
@@ -94,24 +94,23 @@ T_("Zoom full")
 csCZ("Zobrazit v\305\241e")
 
 T_("Zoom everything into view")
-csCZ("Nastavit m\304\233\305\231\303\255tko zobrazen\303\255 podle velikosti"
-     " okna")
+csCZ("Nastavit m\304\233\305\231\303\255tko zobrazen\303\255 podle velikosti "
+     "okna")
 
 T_("Zoom in")
 csCZ("Zv\304\233t\305\241it\tNum[+]")
 
-T_("Zoom in current view (click to zoom in 2x, drag & drop to zoom in area"
-     ")")
-csCZ("Zv\304\233t\305\241ovat oblasti plochy (kliknut\303\255m zv\304\233t\305"
-     "\241\303\255te 2x, ta\305\276en\303\255m my\305\241i zv\304\233t\305\241"
-     "\303\255te zadanou oblast)")
+T_("Zoom in current view (click to zoom in 2x, drag & drop to zoom in area)")
+csCZ("Zv\304\233t\305\241ovat oblasti plochy (kliknut\303\255m zv\304\233t\305\241\303\255te "
+     "2x, ta\305\276en\303\255m my\305\241i zv\304\233t\305\241\303\255te zadanou "
+     "oblast)")
 
 T_("Lock aspect ratio")
 csCZ("Stejn\303\251 m\304\233\305\231\303\255tko os")
 
 T_("Keep temporarily x and y scale factors in sync")
-csCZ("Do\304\215asn\304\233 udr\305\276ovat st\303\241l\303\251 m\304\233\305"
-     "\231\303\255tko os x a y")
+csCZ("Do\304\215asn\304\233 udr\305\276ovat st\303\241l\303\251 m\304\233\305\231\303\255tko "
+     "os x a y")
 
 T_("Pan")
 csCZ("Posouvat")
diff --git a/uppsrc/TCore/CalcType.cpp b/uppsrc/TCore/CalcType.cpp
index f141ede56..5f85f3504 100644
--- a/uppsrc/TCore/CalcType.cpp
+++ b/uppsrc/TCore/CalcType.cpp
@@ -6,6 +6,7 @@ NAMESPACE_UPP
 String CalcTypeDescribeInt()             { return t_("integer"); }
 
 String CalcType<double>::Describe()      { return t_("real number"); }
+String CalcType<int64>::Describe()       { return t_("64-bit integer"); }
 String CalcType<String>::Describe()      { return t_("string"); }
 String CalcType<Date>::Describe()        { return t_("date"); }
 String CalcType<Time>::Describe()        { return t_("date/time"); }
diff --git a/uppsrc/TCore/CalcType.h b/uppsrc/TCore/CalcType.h
index d0211b26a..653c215f6 100644
--- a/uppsrc/TCore/CalcType.h
+++ b/uppsrc/TCore/CalcType.h
@@ -75,6 +75,13 @@ struct CalcType<double> : CalcCastType<double>
 	static Value  ToValue(double t);
 };
 
+template <>
+struct CalcType<int64> : CalcCastType<int64>
+{
+	static bool   IsType(Value v) { return IsNumber(v); }
+	static String Describe();
+};
+
 template <>
 struct CalcType<String> : CalcCastType<String>
 {
diff --git a/uppsrc/TCore/TCore.t b/uppsrc/TCore/TCore.t
index 9bf93a3c0..a17a3d70c 100644
--- a/uppsrc/TCore/TCore.t
+++ b/uppsrc/TCore/TCore.t
@@ -41,6 +41,9 @@ csCZ("cel\303\251 \304\215\303\255slo")
 T_("real number")
 csCZ("re\303\241ln\303\251 \304\215\303\255slo")
 
+T_("64-bit integer")
+csCZ("cel\303\251 \304\215\303\255slo (64 bit\305\257)")
+
 T_("string")
 csCZ("\305\231et\304\233zec")
 
@@ -162,14 +165,14 @@ T_("invalid day number (")
 csCZ("neplatn\303\251 \304\215\303\255slo dne (%d)")
 
 T_("Unterminated string constant")
-csCZ("")
+csCZ("Neukon\304\215en\303\241 \305\231et\304\233zcov\303\241 konstanta")
 
 T_("illegal characters after expression: %s (expression: %s)")
 csCZ("neplatn\303\251 znaky za v\303\275razem: %s (za\304\215\303\241tek v\303\275razu: "
      "%s)")
 
 T_("expected 'between', 'in' or 'like'")
-csCZ("")
+csCZ("o\304\215ek\303\241v\303\241no 'between', 'in' nebo 'like'")
 
 T_("left parenthesis not matched; subexpression starts at %s")
 csCZ("nep\303\241rov\303\241 lev\303\241 z\303\241vorka; za\304\215\303\241tek "