diff --git a/astrid/res/values-ca/strings.xml b/astrid/res/values-ca/strings.xml
index 3b52bb8b6..8da9a6354 100644
--- a/astrid/res/values-ca/strings.xml
+++ b/astrid/res/values-ca/strings.xml
@@ -31,7 +31,7 @@
     <string name="backup_BPr_group_status">Estat</string>
     
     <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->    
-    <string name="backup_status_success">Més recent:</string>
+    <string name="backup_status_success">Més recent: %s</string>
     <!-- Backup Status: last error failed. Keep it short! -->    
     <string name="backup_status_failed">Còpia de seguretat Fallida</string>
     <!-- Backup Status: error subtitle -->    
@@ -137,7 +137,7 @@ File %1$s contained %2$s.\n\n
   <string name="DLG_delete_this_task_question">Eliminar aquesta tasca?</string>
 
   <!-- question for deleting items (%s => item name) -->
-  <string name="DLG_delete_this_item_question">Eliminar aquest</string>
+  <string name="DLG_delete_this_item_question">Eliminar aquest: %s?</string>
     
   <!-- Progress dialog shown when upgrading -->
   <string name="DLG_upgrading">Actualitzant les seves tasques...</string>
@@ -206,7 +206,7 @@ File %1$s contained %2$s.\n\n
   <string name="TAd_hiddenFormat">%s [ocult]</string>
   
   <!-- Format string to indicate task is deleted (%s => task name) -->
-  <string name="TAd_deletedFormat">% [eliminat]</string>
+  <string name="TAd_deletedFormat">%s [eliminat]</string>
   
   <!-- Displayed when adapter is flung (scrolled quickly) -->
   <string name="TAd_flingText"/>
diff --git a/astrid/res/values-cs/strings.xml b/astrid/res/values-cs/strings.xml
index f63305e0a..fac7f2ab0 100644
--- a/astrid/res/values-cs/strings.xml
+++ b/astrid/res/values-cs/strings.xml
@@ -580,7 +580,7 @@
     <string name="CFA_filterName_hint">Pojmenujte tento filtr pro jeho uložení</string>
     
     <!-- Filter Name default for copied filters (%s => old filter name) -->
-    <string name="CFA_filterName_copy">Kopie</string>
+    <string name="CFA_filterName_copy">Kopie %s</string>
     
     <!-- Filter Starting Universe: all tasks -->
     <string name="CFA_universe_all">Aktivní úkoly</string>
diff --git a/astrid/res/values-it/strings.xml b/astrid/res/values-it/strings.xml
index 9184f3013..e7e9e61b8 100644
--- a/astrid/res/values-it/strings.xml
+++ b/astrid/res/values-it/strings.xml
@@ -1328,7 +1328,7 @@
     <string name="rmilk_MLA_label">Per favore esegui l\'accesso e autorizza Astrid:</string>
 
     <!-- Login Error Dialog (%s => message) -->
-    <string name="rmilk_MLA_error">Spiacenti,si è verificato un errore durante la verifica di accesso. Prova di nuovo. \n\n Messaggio di Errore:% s</string>
+    <string name="rmilk_MLA_error">Spiacenti,si è verificato un errore durante la verifica di accesso. Prova di nuovo. \n\n Messaggio di Errore: %s</string>
     
     <!-- ======================== Synchronization ========================== -->    
     
diff --git a/bin/androidxml2po.bash b/bin/androidxml2po.bash
index 13001bab9..230f71ff7 100755
--- a/bin/androidxml2po.bash
+++ b/bin/androidxml2po.bash
@@ -57,7 +57,7 @@ xml2po="`dirname $0`/xml2po.py"
 catxml="`dirname $0`/catxml"
 
 function cat_all_xml() {
-    ${catxml} "${android_xml_files_res_dir}"/"${resource_file}"-*.xml ../astridApi/res/values/${resource_file}*.xml \
+    ${catxml} "${android_xml_files_res_dir}"/"${resource_file}"-*.xml .api/res/values/${resource_file}*.xml \
         ../astrid-plugins/astrid-power-pack/res/values/${resource_file}*.xml \
         > "${launchpad_pot_file_dir}/${resource_file}".xml
 }
diff --git a/tests/.classpath b/tests/.classpath
index 6c2f93551..1f0940313 100644
--- a/tests/.classpath
+++ b/tests/.classpath
@@ -4,6 +4,5 @@
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/astrid"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/astridApi"/>
 	<classpathentry kind="output" path="ecbuild"/>
 </classpath>