merge in gingerbread-release history after reset to gingerbread
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index dee1e9e..fa2234d 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -24,10 +24,10 @@
<string name="recording_stopped" msgid="1580278719585249612">"Enregistrement audio interrompu"</string>
<string name="storage_is_full" msgid="416039755956726221">"La mémoire est pleine"</string>
<string name="max_length_reached" msgid="6398215743584093353">"Taille maximale atteinte"</string>
- <string name="insert_sd_card" product="nosdcard" msgid="8212754638456591792">"Connectez une mémoire USB."</string>
+ <string name="insert_sd_card" product="nosdcard" msgid="8212754638456591792">"Installez une mémoire USB."</string>
<string name="insert_sd_card" product="default" msgid="2251831579676114197">"Insérez une carte SD"</string>
<string name="min_available" msgid="5493947690062988925">"<xliff:g id="MINUTES">%d</xliff:g> mn disponibles"</string>
- <string name="sec_available" msgid="2297020788861694399">"Il reste <xliff:g id="SECONDS">%d</xliff:g> s."</string>
+ <string name="sec_available" msgid="2297020788861694399">"Il reste <xliff:g id="SECONDS">%d</xliff:g> s"</string>
<string name="accept" msgid="7770652589312551402">"Utiliser cet enregistrement audio"</string>
<string name="discard" msgid="761613433029406319">"Supprimer"</string>
<string name="button_ok" msgid="3004911343723076226">"OK"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 13712e8..c2c37b1 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -26,7 +26,7 @@
<string name="max_length_reached" msgid="6398215743584093353">"Makslengde nådd"</string>
<string name="insert_sd_card" product="nosdcard" msgid="8212754638456591792">"Koble til USB-lagring"</string>
<string name="insert_sd_card" product="default" msgid="2251831579676114197">"Sett inn et minnekort"</string>
- <string name="min_available" msgid="5493947690062988925">"<xliff:g id="MINUTES">%d</xliff:g> min tilgjengelig"</string>
+ <string name="min_available" msgid="5493947690062988925">"<xliff:g id="MINUTES">%d</xliff:g> min. tilgjengelig"</string>
<string name="sec_available" msgid="2297020788861694399">"<xliff:g id="SECONDS">%d</xliff:g>s tilgjengelig"</string>
<string name="accept" msgid="7770652589312551402">"Bruk dette opptaket"</string>
<string name="discard" msgid="761613433029406319">"Forkast"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 4895ea6..3fb6deb 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -26,8 +26,8 @@
<string name="max_length_reached" msgid="6398215743584093353">"Osiągnięto maksymalną długość"</string>
<string name="insert_sd_card" product="nosdcard" msgid="8212754638456591792">"Podłącz nośnik USB"</string>
<string name="insert_sd_card" product="default" msgid="2251831579676114197">"Włóż kartę SD"</string>
- <string name="min_available" msgid="5493947690062988925">"Zostało <xliff:g id="MINUTES">%d</xliff:g> minut"</string>
- <string name="sec_available" msgid="2297020788861694399">"Zostało <xliff:g id="SECONDS">%d</xliff:g> sekund"</string>
+ <string name="min_available" msgid="5493947690062988925">"Zostało <xliff:g id="MINUTES">%d</xliff:g> min."</string>
+ <string name="sec_available" msgid="2297020788861694399">"Zostało <xliff:g id="SECONDS">%d</xliff:g> sek."</string>
<string name="accept" msgid="7770652589312551402">"Użyj tego nagrania"</string>
<string name="discard" msgid="761613433029406319">"Odrzuć"</string>
<string name="button_ok" msgid="3004911343723076226">"OK"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 60d79fd..d62b63e 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -26,7 +26,7 @@
<string name="max_length_reached" msgid="6398215743584093353">"Đã đạt đến độ dài tối đa"</string>
<string name="insert_sd_card" product="nosdcard" msgid="8212754638456591792">"Vui lòng kết nối bộ nhớ USB"</string>
<string name="insert_sd_card" product="default" msgid="2251831579676114197">"Vui lòng lắp thẻ SD"</string>
- <string name="min_available" msgid="5493947690062988925">"<xliff:g id="MINUTES">%d</xliff:g> phút khả dụng"</string>
+ <string name="min_available" msgid="5493947690062988925">"Còn <xliff:g id="MINUTES">%d</xliff:g> phút"</string>
<string name="sec_available" msgid="2297020788861694399">"<xliff:g id="SECONDS">%d</xliff:g> giây khả dụng"</string>
<string name="accept" msgid="7770652589312551402">"Sử dụng bản ghi này"</string>
<string name="discard" msgid="761613433029406319">"Huỷ"</string>
