diff --git a/fastlane/android/metadata/ro/short_description.txt b/fastlane/android/metadata/ro/short_description.txt
index 38b0eef5..4769dc30 100644
--- a/fastlane/android/metadata/ro/short_description.txt
+++ b/fastlane/android/metadata/ro/short_description.txt
@@ -1 +1 @@
-Protejează spațiile personale și bunurile fără a compromite intimitatea
\ No newline at end of file
+Protejează spațiile personale și bunurile fără a compromite intimitatea
diff --git a/fastlane/android/metadata/sr/short_description.txt b/fastlane/android/metadata/sr/short_description.txt
index dd69cd9d..f912434e 100644
--- a/fastlane/android/metadata/sr/short_description.txt
+++ b/fastlane/android/metadata/sr/short_description.txt
@@ -1 +1 @@
-Zaštitite privatni prostor i lične stvari bez ugrožavanja privatnosti
\ No newline at end of file
+Zaštitite privatni prostor i lične stvari bez ugrožavanja privatnosti
diff --git a/fastlane/android/metadata/sr/title.txt b/fastlane/android/metadata/sr/title.txt
index 8e7ff87d..7d1a840d 100644
--- a/fastlane/android/metadata/sr/title.txt
+++ b/fastlane/android/metadata/sr/title.txt
@@ -1 +1 @@
-Haven
\ No newline at end of file
+Haven
diff --git a/tools/check-fastlane-whitespace.py b/tools/check-fastlane-whitespace.py
new file mode 100755
index 00000000..492f6235
--- /dev/null
+++ b/tools/check-fastlane-whitespace.py
@@ -0,0 +1,16 @@
+#!/usr/bin/env python3
+
+import glob
+import os
+
+os.chdir(os.path.join(os.path.dirname(__file__), '../fastlane/android'))
+for f in glob.glob('metadata/*/*.txt') +  glob.glob('metadata/*/*/*.txt'):
+    if os.path.getsize(f) == 0:
+        os.remove(f)
+        continue
+
+    with open(f) as fp:
+        data = fp.read()
+    with open(f, 'w') as fp:
+        fp.write(data.rstrip())
+        fp.write('\n')