diff --git a/lib/vector/Vlib/build_sfa.c b/lib/vector/Vlib/build_sfa.c
index 9b34d374810..5eec69f4f57 100644
--- a/lib/vector/Vlib/build_sfa.c
+++ b/lib/vector/Vlib/build_sfa.c
@@ -17,6 +17,7 @@
    \author Various updates for GRASS 7 by Martin Landa <landa.martin gmail.com>
  */
 
+#include <inttypes.h>
 #include <stdlib.h>
 
 #include <grass/gis.h>
@@ -374,8 +375,9 @@ void build_pg(struct Map_info *Map, int build)
     G_message(n_("One primitive registered", "%d primitives registered",
                  Map->plus.n_lines),
               Map->plus.n_lines);
-    G_message(n_("One vertex registered", "%d vertices registered", npoints),
-              npoints);
+    G_message(n_("One vertex registered", "%" PRId64 " vertices registered",
+                 (int64_t)npoints),
+              (int64_t)npoints);
 
     Map->plus.built = GV_BUILD_BASE;
 
@@ -660,8 +662,9 @@ void build_ogr(struct Map_info *Map, int build)
     G_message(n_("One primitive registered", "%d primitives registered",
                  Map->plus.n_lines),
               Map->plus.n_lines);
-    G_message(n_("One vertex registered", "%d vertices registered", npoints),
-              npoints);
+    G_message(n_("One vertex registered", "%" PRId64 " vertices registered",
+                 (int64_t)npoints),
+              (int64_t)npoints);
 
     if (nskipped > 0)
         G_warning(n_("One feature without geometry skipped",
diff --git a/locale/Makefile b/locale/Makefile
index 6c5df6a7567..d60b091b680 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -31,11 +31,11 @@ MODDOMAIN = grassmods
 WXPYDOMAIN = grasswxpy
 DOMAINS = $(LIBDOMAIN) $(MODDOMAIN) $(WXPYDOMAIN)
 
-LIB_POTFILES = find ../lib \( -name "*.c" -o -name "*.py" \) | xargs grep -l "_(\"\|n_(\""
-MOD_POTFILES = find ../ \( -name "*.c" -o -name "*.cpp" \) | grep -v '../lib' | xargs grep -l "_(\"\|n_(\""
-WXPY_POTFILES = find ../gui/wxpython -name '*.py' | xargs grep -l "_(\"\|n_(\""
+LIB_POTFILES = find ../lib \( -name "*.c" -o -name "*.py" \) | LC_ALL=C sort | xargs grep -l "_(\"\|n_(\""
+MOD_POTFILES = find ../ \( -name "*.c" -o -name "*.cpp" \) | grep -v '../lib' | LC_ALL=C sort | xargs grep -l "_(\"\|n_(\""
+WXPY_POTFILES = find ../gui/wxpython -name '*.py' | LC_ALL=C sort | xargs grep -l "_(\"\|n_(\""
 #For Python script module messages
-MOD_PYFILES = find ../scripts -name '*.py' | xargs grep -l "_(\"\|n_(\""
+MOD_PYFILES = find ../scripts -name '*.py' | LC_ALL=C sort | xargs grep -l "_(\"\|n_(\""
 
 XGETTEXT_ARGS = --no-wrap --sort-by-file
 MSGMERGE_ARGS = --no-wrap --sort-by-file --previous