From 10a74d6d08ab5e9dc061666e420cff46b40a3b99 Mon Sep 17 00:00:00 2001
From: Jake McGinty <me@jake.su>
Date: Mon, 9 Feb 2015 11:19:22 -0800
Subject: [PATCH] move plurals to strings.xml

Resolves #2421
// FREEBIE
---
 res/values/plurals.xml | 13 -------------
 res/values/strings.xml | 12 ++++++++----
 2 files changed, 8 insertions(+), 17 deletions(-)
 delete mode 100644 res/values/plurals.xml

diff --git a/res/values/plurals.xml b/res/values/plurals.xml
deleted file mode 100644
index 0e537bf959..0000000000
--- a/res/values/plurals.xml
+++ /dev/null
@@ -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>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d125657c8b..4ce4d33b0a 100644
--- a/res/values/strings.xml
+++ b/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>