Merge pull request #2434 from mcginty/plurals

move plurals to strings.xml

res/values/plurals.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <plurals name="minutes_ago">
-        <item quantity="one">@string/plurals__one_minute</item>
-        <item quantity="other">@string/plurals__many_minutes</item>
-    </plurals>
-
-    <plurals name="hours_ago">
-        <item quantity="one">@string/plurals__one_hour</item>
-        <item quantity="other">@string/plurals__many_hours</item>
-    </plurals>
-
-</resources>

res/values/strings.xml

@@ -656,11 +656,15 @@
     <string name="arrays__my_identity_key">My identity key</string>
 
     <!-- plurals.xml -->
-    <string name="plurals__one_minute">%d min</string>
-    <string name="plurals__many_minutes">%d mins</string>
-    <string name="plurals__one_hour">%d hour</string>
-    <string name="plurals__many_hours">%d hours</string>
-
+    <plurals name="minutes_ago">
+        <item quantity="one">%d min</item>
+        <item quantity="other">%d mins</item>
+    </plurals>
+
+    <plurals name="hours_ago">
+        <item quantity="one">%d hour</item>
+        <item quantity="other">%d hours</item>
+    </plurals>
 
     <!-- preferences.xml -->
     <string name="preferences__general">General</string>