diff --git a/api/res/values-pl/strings.xml b/api/res/values-pl/strings.xml
index e69de29bb..8a551ca2e 100644
--- a/api/res/values-pl/strings.xml
+++ b/api/res/values-pl/strings.xml
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See the file "LICENSE" for the full license governing this code. -->
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <!-- ==================================================== Generic Units == -->
+  
+  <plurals name="DUt_years">
+    <!-- plurals: years -->
+    <item quantity="one">1 rok</item>
+    <!-- plurals: years -->
+    <item quantity="other">%d lat</item>
+  </plurals>
+  <plurals name="DUt_months">
+    <!-- plurals: months -->
+    <item quantity="one">1 miesiąc</item>
+    <!-- plurals: months -->
+    <item quantity="other">%d miesięcy</item>
+  </plurals>
+  <plurals name="DUt_weeks">
+    <!-- plurals: days -->
+    <item quantity="one">1 tydzień</item>
+    <!-- plurals: days -->
+    <item quantity="other">%d tygodni</item>
+  </plurals>
+  <plurals name="DUt_days">
+    <!-- plurals: days -->
+    <item quantity="one">1 dzień</item>
+    <!-- plurals: days -->
+    <item quantity="other">%d dni</item>
+  </plurals>
+  <plurals name="DUt_weekdays">
+    <!-- plurals: days -->
+    <item quantity="one">1 dzień roboczy</item>
+    <!-- plurals: days -->
+    <item quantity="other">%d dni roboczych</item>
+  </plurals>
+  <plurals name="DUt_hours">
+    <!-- plurals: hours -->
+    <item quantity="one">1 godzina</item>
+    <!-- plurals: hours -->
+    <item quantity="other">%d godzin</item>
+  </plurals>
+  <plurals name="DUt_minutes">
+    <!-- plurals: minutes -->
+    <item quantity="one">1 minuta</item>
+    <!-- plurals: minutes -->
+    <item quantity="other">%d minut</item>
+  </plurals>
+  <plurals name="DUt_seconds">
+    <!-- plurals: seconds -->
+    <item quantity="one">1 sekunda</item>
+    <!-- plurals: seconds -->
+    <item quantity="other">%d sekund</item>
+  </plurals>
+  <plurals name="DUt_hoursShort">
+    <!-- plurals: hours (abbreviated) -->
+    <item quantity="one">1 godz.</item>
+    <!-- plurals: hours (abbreviated) -->
+    <item quantity="other">%d godz.</item>
+  </plurals>
+  <plurals name="DUt_minutesShort">
+    <!-- plurals: minutes (abbreviated) -->
+    <item quantity="one">1 min.</item>
+    <!-- plurals: minutes (abbreviated) -->
+    <item quantity="other">%d min.</item>
+  </plurals>
+  <plurals name="DUt_secondsShort">
+    <!-- plurals: seconds (abbreviated) -->
+    <item quantity="one">1 sek.</item>
+    <!-- plurals: seconds (abbreviated) -->
+    <item quantity="other">%d sek.</item>
+  </plurals>
+  <plurals name="Ntasks">
+    <!-- plurals: tasks -->
+    <item quantity="one">1 zadanie</item>
+    <!-- plurals: tasks -->
+    <item quantity="other">%d zadań</item>
+  </plurals>
+  <plurals name="Npeople">
+    <!-- plurals: people -->
+    <item quantity="one">1 osoba</item>
+    <!-- plurals: people -->
+    <item quantity="other">%d osób</item>
+  </plurals>
+  
+  <!-- today -->
+  <string name="today">Dzisiaj</string>
+  
+  <!-- tomorrow -->
+  <string name="tomorrow">Jutro</string>
+  
+  <!-- today -->
+  <string name="yesterday">Wczoraj</string>
+  
+  <!-- tomorrow abbreviated -->
+  <string name="tmrw">Tmrw</string>
+  
+  <!-- today abbreviated -->
+  <string name="yest">Yest</string>
+  
+  <!-- ================================================== Generic Dialogs == -->
+  
+  <!-- confirmation dialog title -->
+  <string name="DLG_confirm_title">Potwierdzić?</string>
+  
+  <!-- question dialog title -->
+  <string name="DLG_question_title">Pytanie:</string>
+  
+  <!-- information dialog title -->
+  <string name="DLG_information_title">Informacja</string>
+  
+  <!-- error dialog title -->
+  <string name="DLG_error_title">Błąd!</string>
+  
+  <!-- general dialog save-->
+  <string name="DLG_save">Zapisz</string>
+  
+  <!-- general dialog yes-->
+  <string name="DLG_yes">Tak</string>
+  
+  <!-- general dialog no-->
+  <string name="DLG_no">Nie</string>
+  
+  <!-- general dialog close-->
+  <string name="DLG_close">Zamknij</string>
+  
+  <!-- general dialog done -->
+  <string name="DLG_done">Ukończone</string>
+  
+  <!-- error dialog (%s => error message)-->
+  <string name="DLG_error">Ups! Wygląda na to, że wystąpił jakiś błąd! Oto, co się stało:\n\n%s</string>
+  
+  <!-- error dialog (no message indicated)-->
+  <string name="DLG_error_generic">Ups! Wygląda na to, że wystąpił jakiś błąd!</string>
+  
+  <!-- Progress dialog shown when doing something slow -->
+  <string name="DLG_wait">Proszę czekać...</string>
+
+ <!-- ====================================================== SyncProvider == -->
+          
+  <!-- Sync Notification: message when sync service active -->
+  <string name="SyP_progress">Synchronizowanie Twoich zadań...</string>
+  
+  <!-- Sync Notification: toast when sync activated from activity -->
+  <string name="SyP_progress_toast">Synchronizacja...</string>
+  
+  <!-- Sync Label: used in menu to denote synchronization -->
+  <string name="SyP_label">Synchronizacja</string>  
+
+  <!-- Error msg when io exception  -->
+  <string name="SyP_ioerror">Błąd połączenia! Sprawdź swoje połączenie z Internetem!</string>
+
+  <!-- ================================================== SyncPreferences == -->
+  
+  <!-- Status Group Label -->    
+  <string name="sync_SPr_group_status">Stan</string>
+  
+  <!-- Sync Status: log in -->    
+  <string name="sync_status_loggedout">Nie zalogowano!</string>
+  <!-- Status: ongoing -->    
+  <string name="sync_status_ongoing">Synchronizacja trwa...</string>
+  <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
+  <string name="sync_status_success">Last Sync:\n%s</string>
+  <!-- Sync Status: failure status (%s -> last attempted sync date) -->    
+  <string name="sync_status_failed">Nieudana: %s</string>
+  <!-- Sync Status: error status (%s -> last sync date) -->    
+  <string name="sync_status_errors">Synch w/ Błędy: %s</string>
+  <!-- Sync Status: error subtitle (%s -> last successful sync date) -->    
+  <string name="sync_status_failed_subtitle">Ostatnia udana synchronizacja: %s</string>
+  <!-- Sync Status: never sync'd -->    
+  <string name="sync_status_never">Nigdy nie synchronizowano!</string>
+
+  <!-- Options Group Label -->    
+  <string name="sync_SPr_group_options">Opcje</string>
+
+  <!-- Preference: Synchronization Interval Title -->    
+  <string name="sync_SPr_interval_title">Synchronizacja w tle</string>
+  <!-- Preference: Synchronization Interval Description (when disabled) -->
+  <string name="sync_SPr_interval_desc_disabled">Synchronizacja w tle wyłączona</string>    
+  <!-- Preference: Synchronization Interval Description (%s => setting) -->
+  <string name="sync_SPr_interval_desc">Aktualnie ustawione na: %s</string>
+  
+  <!-- Preference: Background Wifi Title -->  
+  <string name="sync_SPr_bgwifi_title">Tylko połączenie Wi-Fi</string>    
+  <!-- Preference: Background Wifi Description (enabled) -->
+  <string name="sync_SPr_bgwifi_desc_enabled">Synchronizacja w tle przebiega tylko poprzez Wi-Fi</string>    
+  <!-- Preference: Background Wifi Description (disabled) -->
+  <string name="sync_SPr_bgwifi_desc_disabled">Synchronizowanie w tle zawsze, niezależnie od rodzaju połączenia</string>
+  
+  <!-- Actions Group Label  -->
+  <string name="sync_SPr_group_actions">Działania</string>
+
+  <!-- Synchronize Now Button -->    
+  <string name="sync_SPr_sync">Synchronizuj teraz!</string>
+  <!-- Synchronize Now Button if not logged in-->    
+  <string name="sync_SPr_sync_log_in">Zaloguj &amp; Synchronizuj!</string>
+  
+  <!-- Sync: Prefix string before logged in identifier -->
+  <string name="sync_SPr_logged_in_prefix">Logged in as:</string>
+  
+  <!-- Sync: Clear Data Title -->
+  <string name="sync_SPr_forget">Wyloguj</string>
+  <!-- Sync: Clear Data Description -->
+  <string name="sync_SPr_forget_description">Czyści wszystkie dane synchronizacji</string>
+
+  <!-- confirmation dialog for sync log out -->
+  <string name="sync_forget_confirm">Wyloguj / wyczyść dane synchronizacji?</string>
+  
+  <string-array name="sync_SPr_interval_entries">
+      <!-- sync_SPr_interval_entries: Synchronization Intervals -->
+      <item>Wyłączone</item>
+      <item>co 15 minut</item>
+      <item>co 30 minut</item>
+      <item>co godzinę</item>
+      <item>co 3 godziny</item>
+      <item>co 6 godzin</item>
+      <item>co 12 godzin</item>
+      <item>raz dziennie</item>
+      <item>co 3 dni</item>
+      <item>co tydzień</item>
+  </string-array>    
+    
+
+</resources>
diff --git a/astrid/res/layout/notification_control.xml b/astrid/res/layout/notification_control.xml
deleted file mode 100644
index 802ded5b7..000000000
--- a/astrid/res/layout/notification_control.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See the file "LICENSE" for the full license governing this code. -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:visibility="visible"
-    android:layout_weight="1"
-    android:background="@color/reminder_background">
-    
-            
-    <LinearLayout android:id="@+id/buttons"
-        android:layout_width="fill_parent" 
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentLeft="true"
-        android:visibility="gone"
-        android:orientation="vertical">
-        
-        <Button android:id="@+id/done"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:textSize="16sp"
-            android:drawableLeft="@drawable/tango_check"
-            android:text="@string/rmd_NoA_done"/>
-            
-    </LinearLayout>
-
-    <include 
-        android:id="@+id/reminder_layout"
-        layout="@layout/astrid_reminder_view"
-        android:layout_below="@id/buttons"/>
-         
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/reminder_layout"
-        android:layout_alignParentLeft="true"
-        android:orientation="horizontal">
-        
-        <Button android:id="@+id/snooze"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="49"
-            android:layout_marginLeft="10dip"
-            android:layout_marginRight="10dip"
-            android:layout_marginTop="5dip"
-            android:layout_marginBottom="5dip"
-            android:textSize="20sp"
-            android:textColor="@android:color/white"
-            android:background="#707070"
-            android:text="@string/rmd_NoA_snooze" />
-        
-        <Button android:id="@+id/goAway"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="49"
-            android:layout_marginLeft="10dip"
-            android:layout_marginRight="10dip"
-            android:layout_marginTop="5dip"
-            android:layout_marginBottom="5dip"
-            android:textSize="20sp"
-            android:textColor="@android:color/white"
-            android:background="?attr/asThemeTextColor"
-            android:text="@string/rmd_NoA_goAway" />
-        
-    </LinearLayout>
-        
-</RelativeLayout>
\ No newline at end of file
diff --git a/astrid/res/values-nl/strings.xml b/astrid/res/values-nl/strings.xml
index c415ec282..4a4b98e36 100644
--- a/astrid/res/values-nl/strings.xml
+++ b/astrid/res/values-nl/strings.xml
@@ -2227,7 +2227,7 @@
   <string name="TEA_no_tags_modified">Niets gewijzigd</string>
 
   <!-- Toast notification that a tag has been deleted -->
-  <string name="TEA_tags_deleted">De lijst %1 is verwijderd, van invloed op %2$d taken</string>
+  <string name="TEA_tags_deleted">De lijst %1$s is verwijderd, van invloed op %2$d taken</string>
   
   <!-- Toast notification that a shared tag has been left -->
   <string name="TEA_tags_left">You left shared list %1$s, affecting %2$d tasks</string>
diff --git a/astrid/res/values-pt_BR/strings.xml b/astrid/res/values-pt-rBR/strings.xml
similarity index 99%
rename from astrid/res/values-pt_BR/strings.xml
rename to astrid/res/values-pt-rBR/strings.xml
index b360837f4..360488d24 100644
--- a/astrid/res/values-pt_BR/strings.xml
+++ b/astrid/res/values-pt-rBR/strings.xml
@@ -2239,7 +2239,7 @@
   <string name="TEA_no_tags_modified">Nenhuma mudança efetuada</string>
 
   <!-- Toast notification that a tag has been deleted -->
-  <string name="TEA_tags_deleted">A Lista %s foi excluída, afetando %2$d tarefas</string>
+  <string name="TEA_tags_deleted">A Lista %1$s foi excluída, afetando %2$d tarefas</string>
   
   <!-- Toast notification that a shared tag has been left -->
   <string name="TEA_tags_left">You left shared list %1$s, affecting %2$d tasks</string>
diff --git a/astrid/res/values/strings-tags.xml b/astrid/res/values/strings-tags.xml
index e1ecb0684..8e804c821 100644
--- a/astrid/res/values/strings-tags.xml
+++ b/astrid/res/values/strings-tags.xml
@@ -84,13 +84,13 @@
   <!-- Toast notification that no changes have been made -->
   <string name="TEA_no_tags_modified">No changes made</string>
 
-  <!-- Toast notification that a tag has been deleted -->
+  <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
   <string name="TEA_tags_deleted">List %1$s was deleted, affecting %2$d tasks</string>
   
-  <!-- Toast notification that a shared tag has been left -->
+  <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
   <string name="TEA_tags_left">You left shared list %1$s, affecting %2$d tasks</string>
 
-  <!-- Toast notification that a tag has been renamed -->
+  <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
   <string name="TEA_tags_renamed">Renamed %1$s with %2$s for %3$d tasks</string>
   
   <!-- Tag case migration -->
diff --git a/bin/androidxml2po.bash b/bin/androidxml2po.bash
index a8a87c80b..eb7528646 100755
--- a/bin/androidxml2po.bash
+++ b/bin/androidxml2po.bash
@@ -37,7 +37,7 @@ fi
 
 # Set the languages here (po -> name of .po file. res -> name of res folder)
 po_lang=( "ca" "cs" "da" "de" "es" "fr" "he" "it" "ja" "ko" "nb" "nl" "pl" "pt" "pt_BR" "ru" "sv" "th" "tr" "zh_CN"  "zh_TW")
-res_lang=("ca" "cs" "da" "de" "es" "fr" "he" "it" "ja" "ko" "nb" "nl" "pl" "pt" "pt_BR" "ru" "sv" "th" "tr" "zh-rCN" "zh-rTW")
+res_lang=("ca" "cs" "da" "de" "es" "fr" "he" "it" "ja" "ko" "nb" "nl" "pl" "pt" "pt-rBR" "ru" "sv" "th" "tr" "zh-rCN" "zh-rTW")
 
 #Change the dirs where the files are located.
 launchpad_po_files_dir="translations"
@@ -146,4 +146,4 @@ while [ "$1" != "" ]; do
     shift
 done
 usage
-<
+