diff --git a/rake.d/po.rb b/rake.d/po.rb
index aa5414086..4f5aa8157 100644
--- a/rake.d/po.rb
+++ b/rake.d/po.rb
@@ -10,6 +10,25 @@ def unformat_string_for_po str
   str.gsub(/^"|"$/, '').gsub(/\\"/, '"')
 end
 
+def fix_po_msgstr_plurals items
+  return items if (items.size == 0) || !items.first.key?(:comments)
+
+  matches = %r{nplurals=(\d+)}.match(items.first[:comments].join(""))
+
+  return items if !matches
+
+  num_plurals = matches[1].to_i
+
+  return items if num_plurals <= 0
+
+  items.each do |item|
+    next unless item.key?(:msgstr)
+    item[:msgstr] = item[:msgstr][0..num_plurals - 1] if item[:msgstr].size > num_plurals
+  end
+
+  return items
+end
+
 def read_po file_name
   items   = [ { comments: [] } ]
   msgtype = nil
@@ -76,7 +95,7 @@ def read_po file_name
 
   items.pop if items.last.keys.empty?
 
-  return items
+  return fix_po_msgstr_plurals items
 end
 
 def write_po file_name, items
@@ -202,8 +221,9 @@ def transifex_pull_and_merge resource, language
 
   transifex_items = read_po(po_file)
   merged_items    = merge_po orig_items, transifex_items
+  fixed_items     = fix_po_msgstr_plurals merged_items
 
-  write_po po_file, merged_items
+  write_po po_file, fixed_items
 end
 
 def transifex_remove_fuzzy_and_push resource, language