diff --git a/astrid/res/values-ca/strings.xml b/astrid/res/values-ca/strings.xml index 3e16598e8..eab6c955e 100644 --- a/astrid/res/values-ca/strings.xml +++ b/astrid/res/values-ca/strings.xml @@ -226,7 +226,7 @@ Estat - Més recent: + Més recent: %s Còpia de seguretat Fallida diff --git a/astrid/res/values-nb/strings.xml b/astrid/res/values-nb/strings.xml index df6012788..66ea71cb3 100644 --- a/astrid/res/values-nb/strings.xml +++ b/astrid/res/values-nb/strings.xml @@ -957,7 +957,7 @@ Astrid is open-source and proudly maintained by Todoroo, Inc. Etter liste - Google Tasks + Google Tasks: %s New List Name: diff --git a/astrid/res/values-nl/strings.xml b/astrid/res/values-nl/strings.xml index 918351f02..ce89a3560 100644 --- a/astrid/res/values-nl/strings.xml +++ b/astrid/res/values-nl/strings.xml @@ -1875,7 +1875,7 @@ Niets gewijzigd - De lijst %1 is verwijderd, van invloed op %2$d taken + De lijst %1$s is verwijderd, van invloed op %2$d taken Taak %1$s hernoemd naar %2$s voor %3$d taken diff --git a/astrid/res/values-zh-rCN/strings.xml b/astrid/res/values-zh-rCN/strings.xml index 043f9116d..fdf166d45 100644 --- a/astrid/res/values-zh-rCN/strings.xml +++ b/astrid/res/values-zh-rCN/strings.xml @@ -851,7 +851,7 @@ - % 含条件 + %s 含条件 删除列 diff --git a/tests/src/com/todoroo/andlib/test/TranslationTests.java b/tests/src/com/todoroo/andlib/test/TranslationTests.java index 37ac1a094..5fa9c61fd 100644 --- a/tests/src/com/todoroo/andlib/test/TranslationTests.java +++ b/tests/src/com/todoroo/andlib/test/TranslationTests.java @@ -5,7 +5,6 @@ package com.todoroo.andlib.test; import java.lang.reflect.Field; import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Arrays; import java.util.Date; import java.util.List; import java.util.Locale; @@ -72,7 +71,19 @@ abstract public class TranslationTests extends TodorooTestCase { /** test that the characters match */ public boolean matches(FormatStringData other) { - return Arrays.equals(characters, other.characters); + if(characters.length != other.characters.length) + return false; + outer: for(int i = 0; i < characters.length; i++) { + if(Character.isDigit(characters[i])) { + for(int j = 0; j < other.characters.length; j++) + if(characters[i] == other.characters[j]) + break outer; + return false; + } else if(characters[i] != other.characters[i]) + return false; + + } + return true; } @Override