From: notaz <notasas@gmail.com>
Date: Fri, 8 Jun 2012 22:00:56 +0000 (+0300)
Subject: merge in OI distribution
X-Git-Tag: r3~1
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=android_pandora.git;a=commitdiff_plain;h=27a4fda173aaf06f6976582506edfa266a8cc905;hp=811a5a4a3091f65fef340acafe62d6355b13c44f

merge in OI distribution

OI distribution is supposed to be built as a separate library,
but that doesn't work here in OS builder because it contains resources,
so merge it into OI FileManager directly.
---

diff --git a/apps/oi-filemanager/FileManager/AndroidManifest.xml b/apps/oi-filemanager/FileManager/AndroidManifest.xml
index 00c6c0c..d1d0652 100644
--- a/apps/oi-filemanager/FileManager/AndroidManifest.xml
+++ b/apps/oi-filemanager/FileManager/AndroidManifest.xml
@@ -144,7 +144,7 @@
     <provider android:name=".FileManagerProvider" android:authorities="org.openintents.filemanager"></provider>
     
 		<!-- Activities from OI Distribution Library -->
-        <activity android:name="org.openintents.distribution.EulaActivity" />
-        <activity android:name="org.openintents.distribution.NewVersionActivity" />
+        <activity android:name="org.openintents.filemanager.EulaActivity" />
+        <activity android:name="org.openintents.filemanager.NewVersionActivity" />
 </application>
 </manifest> 
diff --git a/apps/oi-filemanager/FileManager/res/layout-v14/oi_distribution_buttonbar.xml b/apps/oi-filemanager/FileManager/res/layout-v14/oi_distribution_buttonbar.xml
new file mode 100644
index 0000000..93bc441
--- /dev/null
+++ b/apps/oi-filemanager/FileManager/res/layout-v14/oi_distribution_buttonbar.xml
@@ -0,0 +1,31 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/container2"
+    style="@android:style/ButtonBar"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal" >
+
+    <Button
+        android:id="@+id/button2"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:layout_weight="1"
+        android:text="@string/oi_distribution_eula_refuse" />
+    
+
+    <LinearLayout
+        android:id="@+id/space"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" />
+
+    <Button
+        android:id="@+id/button1"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:layout_weight="1"
+        android:text="@string/oi_distribution_eula_accept" />
+
+</LinearLayout>
diff --git a/apps/oi-filemanager/FileManager/res/layout/oi_distribution_buttonbar.xml b/apps/oi-filemanager/FileManager/res/layout/oi_distribution_buttonbar.xml
new file mode 100644
index 0000000..65f4395
--- /dev/null
+++ b/apps/oi-filemanager/FileManager/res/layout/oi_distribution_buttonbar.xml
@@ -0,0 +1,30 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/container2"
+    style="@android:style/ButtonBar"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal" >
+
+    <Button
+        android:id="@+id/button1"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:layout_weight="1"
+        android:text="@string/oi_distribution_eula_accept" />
+
+    <LinearLayout
+        android:id="@+id/space"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" />
+
+    <Button
+        android:id="@+id/button2"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:layout_weight="1"
+        android:text="@string/oi_distribution_eula_refuse" />
+
+</LinearLayout>
diff --git a/apps/oi-filemanager/FileManager/res/layout/oi_distribution_eula.xml b/apps/oi-filemanager/FileManager/res/layout/oi_distribution_eula.xml
new file mode 100644
index 0000000..7d7c2b0
--- /dev/null
+++ b/apps/oi-filemanager/FileManager/res/layout/oi_distribution_eula.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+ * Copyright (C) 2007-2009 OpenIntents.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+    	<TextView  
+			    android:id="@+id/text1"
+			    android:textAppearance="?android:attr/textAppearanceLarge"
+				android:layout_height="wrap_content"
+				android:layout_width="fill_parent" 
+			    android:text="@string/oi_distribution_eula_title"
+    			android:gravity="center"
+			    android:textStyle="bold"
+			    android:textColor="#ffffffff"
+			    android:layout_marginTop="10dip"
+			    android:layout_marginBottom="10dip"
+				/><!-- 
+			    android:layout_height="34dip"  -->
+		<ScrollView
+				android:layout_width="fill_parent"
+				android:layout_height="0dip"
+				android:layout_weight="1"
+			    android:layout_marginBottom="10dip"
+				android:layout_marginLeft="5dip"
+			>
+			<LinearLayout
+				android:id="@+id/container1"
+				android:orientation="vertical"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				>
+				<ImageView android:id="@+id/imageview"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center"
+					/>
+				<TextView  
+				    android:id="@+id/text2"
+					android:layout_width="wrap_content"
+				    android:layout_height="wrap_content"
+			    	android:textStyle="bold"
+				    android:textColor="#ffffffff"
+				    android:layout_marginLeft="10dip"
+				    android:layout_marginRight="10dip"
+				    android:layout_marginTop="10dip"
+				    android:layout_marginBottom="10dip"
+					/>
+				<TextView  
+				    android:id="@+id/text"
+					android:layout_width="wrap_content" 
+				    android:layout_height="wrap_content" 
+				    android:autoLink="web"
+			    	android:bufferType="spannable"
+				    android:textColor="#ffffffff"
+				    android:layout_marginLeft="10dip"
+				    android:layout_marginRight="10dip"
+				    android:layout_marginTop="10dip"
+				    android:layout_marginBottom="10dip"
+					/>
+			</LinearLayout>
+		</ScrollView>
+		<include layout="@layout/oi_distribution_buttonbar" android:id="@+id/buttonbar"/>		
+</LinearLayout>
\ No newline at end of file
diff --git a/apps/oi-filemanager/FileManager/res/layout/oi_distribution_infoactivity.xml b/apps/oi-filemanager/FileManager/res/layout/oi_distribution_infoactivity.xml
new file mode 100644
index 0000000..f26de7d
--- /dev/null
+++ b/apps/oi-filemanager/FileManager/res/layout/oi_distribution_infoactivity.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/background"
+    android:orientation="vertical"
+    android:layout_width="fill_parent" 
+    android:layout_height="fill_parent"
+    android:padding="10dip" >
+    
+    <TextView android:id="@+id/text"
+    	android:text="@string/oi_distribution_info_activity_text"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+        
+    <ListView android:id="@android:id/list"
+        android:layout_width="fill_parent" 
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:cacheColorHint="#00000000"
+        android:background="#00000000" />
+</LinearLayout>
diff --git a/apps/oi-filemanager/FileManager/res/raw/license_short.txt b/apps/oi-filemanager/FileManager/res/raw/license_short.txt
new file mode 100644
index 0000000..85874cc
--- /dev/null
+++ b/apps/oi-filemanager/FileManager/res/raw/license_short.txt
@@ -0,0 +1,13 @@
+Copyright (C) 2008-2012 OpenIntents.org
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
\ No newline at end of file
diff --git a/apps/oi-filemanager/FileManager/res/raw/oi_distribution_buttonbar.xml b/apps/oi-filemanager/FileManager/res/raw/oi_distribution_buttonbar.xml
new file mode 100644
index 0000000..8ab1134
--- /dev/null
+++ b/apps/oi-filemanager/FileManager/res/raw/oi_distribution_buttonbar.xml
@@ -0,0 +1,33 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/container2"
+    style="@android:style/ButtonBar"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:gravity="bottom" >
+
+    <!-- "space" kept its id to minimize code changes. It serves only as an anchor now. -->
+
+    <View
+        android:id="@+id/space"
+        android:layout_width="1dp"
+        android:layout_height="1dp"
+        android:layout_centerInParent="true" />
+
+    <Button
+        android:id="@+id/button1"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignRight="@id/space"
+        android:layout_alignWithParentIfMissing="true"
+        android:text="@string/oi_distribution_eula_accept" />
+
+    <Button
+        android:id="@+id/button2"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@id/space"
+        android:layout_alignParentRight="true"
+        android:text="@string/oi_distribution_eula_refuse" />
+
+</RelativeLayout>
diff --git a/apps/oi-filemanager/FileManager/res/values-ar/strings.xml b/apps/oi-filemanager/FileManager/res/values-ar/strings.xml
index 4eabba1..684c2d4 100644
--- a/apps/oi-filemanager/FileManager/res/values-ar/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-ar/strings.xml
@@ -81,7 +81,10 @@
     <string name="move_button_multiselect">نقل</string>
     <string name="copy_button_multiselect">نسخ</string>
     <string name="delete_button_multiselect">حذف</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">اختر ملفات متعددة</string>
     <string name="error_selection">رجاءا اخر ملف  أو عدة ملفات</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-be/strings.xml b/apps/oi-filemanager/FileManager/res/values-be/strings.xml
index b90687f..77b02cf 100644
--- a/apps/oi-filemanager/FileManager/res/values-be/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-be/strings.xml
@@ -22,6 +22,7 @@
 	<!-- Automatically filled in by Launchpad: -->
 	<string name="about_translators">Launchpad Contributions:
   Alexander Geroimenko https://launchpad.net/~geroimenko
+  Mikhail_SaTuRn https://launchpad.net/~mikhailsaturn
   OpenIntents devs https://launchpad.net/~openintents-devs</string>
 	
     <!-- Short explanation of the application (max. 80 characters) -->
@@ -81,7 +82,10 @@
     <string name="move_button_multiselect">Перамясціць</string>
     <string name="copy_button_multiselect">Капіяваць</string>
     <string name="delete_button_multiselect">Выдаліць</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">Абярыце некалькі файлаў</string>
     <string name="error_selection">Калі ласка, абярыце адзін ці больш файлаў.</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-bg/strings.xml b/apps/oi-filemanager/FileManager/res/values-bg/strings.xml
index 45d3d36..3a85950 100644
--- a/apps/oi-filemanager/FileManager/res/values-bg/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-bg/strings.xml
@@ -85,7 +85,10 @@
     <string name="move_button_multiselect">Премести</string>
     <string name="copy_button_multiselect">Копирай</string>
     <string name="delete_button_multiselect">Изтрий</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">Изберете много файлове.</string>
     <string name="error_selection">Моля, изберете един или повече файла.</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-bs/strings.xml b/apps/oi-filemanager/FileManager/res/values-bs/strings.xml
new file mode 100644
index 0000000..325ed1c
--- /dev/null
+++ b/apps/oi-filemanager/FileManager/res/values-bs/strings.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+ * Copyright (C) 2007-2008 OpenIntents.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ -->
+<resources>
+	<!-- ***************************
+	     About information
+	     *************************** -->
+	
+	<!-- Automatically filled in by Launchpad: -->
+	<string name="about_translators">Launchpad Contributions:
+  Almin Islamović https://launchpad.net/~almin-islamovic</string>
+	
+    <!-- Short explanation of the application (max. 80 characters) -->
+    <string name="about_comments">Upravljanje Fajlovima na SD kartici sa OI File Manager.</string>  
+	
+	<!-- ***************************
+	     Applicatio-specific strings
+	     *************************** -->
+	<!-- Name of application. Can be localized. OI = OpenIntents should stay unmodified. -->
+    <string name="app_name">OI Fajl Meneger</string>
+    
+    <string name="menu_new_folder">Novi Direktorij</string>
+    
+    <!-- Multi select option menu -->
+    <string name="menu_multi_select">Više odabira</string>
+
+    <string name="menu_delete">Brisanje</string>
+    <string name="menu_rename">Preimenuj</string>
+    <string name="menu_send">Å alji</string>
+    <string name="menu_open">Otvori</string>
+    <string name="menu_move">Pomjeri</string>
+    <string name="menu_copy">kopiraj</string>
+    <string name="menu_details">Detalji</string>
+    <string name="menu_more">Više</string>
+    <string name="menu_compress">Kompresuj (ZIP)</string>
+    <string name="menu_extract">Ekstraktuj (ZIP)</string>
+    <string name="menu_filter">Filter</string>
+    <string name="menu_include_in_media_scan">Include in media scan</string>
+    <string name="menu_exclude_from_media_scan">Exclude from media scan</string>
+    <string name="menu_bookmark">Add to bookmarks</string>
+    <string name="menu_refresh">Osvježi</string>
+    
+    <string name="create_new_folder">Create new folder</string>
+    <string name="folder_name">Naziv foldera</string>
+    <string name="file_name">Naziv foldera</string>
+    <string name="extension">Extenzije</string>
+    <string name="this_folder_is_empty">Ovaj direktorij je prazan.</string>
+    <string name="really_delete">Do you really want to delete %s?</string>
+    <string name="file_deleted">File deleted.</string>
+    <string name="folder_deleted">Folder deleted.</string>
+    <string name="file_renamed">Fajl preimenovan.</string>
+    <string name="folder_renamed">Folder premješten</string>
+    <string name="file_moved">Fajl pomjeren</string>
+    <string name="folder_moved">Folder pomjeren</string>
+    <string name="file_copied">Folder kopiran</string>
+    <string name="move_title">Izaberi folder za pomjeriti</string>
+    <string name="move_button">Premesti ovde</string>
+    <string name="copy_title">Select folder to copy to</string>
+    <string name="copy_button">Kopiraj ovdje</string>
+	<string name="deleting_files">Izbriši fajl</string>
+    <string name="title_warning_some_may_not_work">Upozoranje</string>
+    <string name="warning_some_may_not_work">Some of the following options may not work.</string>
+    <string name="show_warning_again">Prikaži ponovo upozorenje</string>
+    
+    <!-- Strings for a multi select feature -->
+	<string name="really_delete_multiselect">Da li stvarno želite izbrisati %d fajlove?</string>
+    <string name="move_button_multiselect">Pomjeri</string>
+    <string name="copy_button_multiselect">kopiraj</string>
+    <string name="delete_button_multiselect">Brisanje</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
+    <string name="compress_zip_button_multiselect">ZIP</string>
+
+    <string name="multiselect_title">Izaberi više fajlova</string>
+    <string name="error_selection">Izaberite jedan ili više fajlova</string>
+    
+    <!-- Strings for details table -->
+    <string name="details_type">Vrsta</string>
+    <string name="details_type_folder">Folder</string>
+    <string name="details_type_file">Fajl</string>
+    <string name="details_type_other">Ostalo</string>
+    <string name="details_size">Velicina</string>
+    <string name="details_permissions">Permissions</string>
+    <string name="details_hidden">Skriven</string>
+    <string name="details_lastmodified">Zadnja izmjena</string>
+    <string name="details_yes">Da</string>
+    <string name="details_no">Ne</string>
+    
+    <!-- Construct a unique file name of a file called %s. -->
+    <string name="copied_file_name">Kopija od %s</string>
+    
+    <!-- Construct a unique file name with number %1$d of a file called %2$s. -->
+    <string name="copied_file_name_2">Copy %1$d of %2$s</string>
+    
+    <string name="media_scan_included">Ovaj folder će biti uključen u sljedećem medija skenu</string>
+    <string name="media_scan_excluded">Ovaj folder će biti isključen u sljedećem media scanu</string>
+    
+    <string name="error_creating_new_folder">Neuspješno kreiranje novog foldera</string>
+    <string name="error_deleting_file">Nije mogao izbrisati fajl</string>
+    <string name="error_deleting_folder">Ne može se izbrisati folder \'%s\'</string>
+    <string name="error_renaming_file">Ne može se preimenovati fajl.</string>
+    <string name="error_renaming_folder">Ne moguće preimenovat folder.</string>
+    <string name="error_moving_file">Ne moguće pomjeriti fajl</string>
+    <string name="error_moving_folder">Ne moguće pomjeriti folder.</string>
+    <string name="error_copying_file">ne moguće kopirati fajl.</string>
+    <string name="error_file_does_not_exists">Datoteka ne postoji.</string>
+    <string name="error_deleting_child_file">Could not delete child file \'%s\'.</string>
+    <string name="error_generic">Error se pojavio:</string>
+    <string name="error_media_scan">Ne mogu promijeniti media scan postavke.</string>
+    
+    <string name="send_not_available">Nema aplikacije dostupne za slanje.</string>
+    
+    <string name="application_not_available">Aplikacije nedostupna.</string>
+    
+	<!-- ***************************
+	     Preferences
+	     *************************** -->
+    <!-- Menu item for Settings -->
+	<string name="settings">Postavke</string>
+	
+    <!-- Category for preferences. -->
+    <string name="preference_advanced_features">Advanced features</string>
+	<string name="preference_mediascan_title">Exclude from media scan</string>
+    <string name="preference_mediascan_summary_on">Show menu item to exclude folders from media scan.</string>
+    <string name="preference_mediascan_summary_off">Hide menu item to exclude folders from media scan.</string>
+    
+    <string name="preference_showallwarning_title">Prikaži sva upozorenja.</string>
+    <string name="preference_showallwarning_summary_on">Prikaži sve upozoravajuće poruke</string>
+    <string name="preference_showallwarning_summary_off">Prekrij poruke upozorenja.</string>
+       
+    <string name="preference_displayhiddenfiles_title">Prikaži skrivene fajlove.</string>
+    <string name="preference_displayhiddenfiles_summary_on">Prikaži skrivene fajlove.</string>
+    <string name="preference_displayhiddenfiles_summary_off">Sakvij skrivene fajlove.</string>
+    
+    <string name="preference_sort_settings">Sortiraj postavke.</string>
+    <string name="preference_sortby">Poredaj po</string>
+    <string name="preference_sortby_ascending">Poredaj Uzlazno</string>
+    <string name="preference_sortby_ascending_summary_on">Sort in ascending order</string>
+    <string name="preference_sortby_ascending_summary_off">Sort in descending order</string>
+    <string-array name="preference_sortby_names">
+        <item>Name</item>
+        <item>Velicina</item>
+        <item>Posljednja izmjena</item>
+    </string-array>
+
+        
+    <!-- ***************************
+   		 Strings for the \'Save as\' feature
+    	 *************************** -->
+    <string name="saveas_no_file_picked">Niste nijedan fajl izabrali</string>
+    <string name="saveas_error">Došlo je do greške.</string>
+    <string name="saveas_file_saved">Fajl uspješno spašen!</string>
+    
+        
+   
+    <string name="bookmarks">Zabilješke</string>
+    <string name="bookmarks_cancel">Cancel</string>
+    <string name="bookmarks_delete">Brisanje</string>
+    <string name="bookmarks_select_to_delete">Select bookmarks to delete</string>
+    <string name="bookmarks_manage">Uredi Zabilješke</string>
+    <string name="bookmark_added">Zabilješka dodana</string>
+    <string name="bookmark_not_found">Bookmarked destination not found.</string>
+    <string name="bookmarks_deleted">Odabrana zabilješka izbrisana</string>
+    <string name="bookmark_already_exists">Fajl je već zabilježen</string>
+
+
+    <!-- ***************************
+             Strings for the \'Compressing\' and \'Extracting\' feature
+          *************************** -->
+    <string name="compressing_success">Predmet uspješno kompresovan</string>
+    <string name="compressing_error">Neuspješno kompresovanje predmeta</string>
+    <string name="compress_into_archive">Kompresuj u arhivu:</string>
+    <string name="extracting_success">Predmet uspješno ekstraktovan</string>
+    <string name="extracting_error">Ne moguće ekstraktovat predmet</string>
+    <string name="extract_into_folder">Extract into folder:</string>
+    <string name="extract_title">Select folder to extract into</string>
+    <string name="extract_button">Raspakuj ovdje</string>
+    <string name="extracting">Extracting...</string>
+    <string name="compressing">Kompresujem...</string>
+    <string name="warning_overwrite">File %s exists. Do you want to overwrite it?</string>
+
+    <string name="change_file_extension">Da li želite promijeniti fajl ekstenziju?</string>
+</resources>
diff --git a/apps/oi-filemanager/FileManager/res/values-ca/strings.xml b/apps/oi-filemanager/FileManager/res/values-ca/strings.xml
index 6b52457..2f758f7 100644
--- a/apps/oi-filemanager/FileManager/res/values-ca/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-ca/strings.xml
@@ -81,7 +81,10 @@
     <string name="move_button_multiselect">Mou</string>
     <string name="copy_button_multiselect">Copia</string>
     <string name="delete_button_multiselect">Suprimeix</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">Seleccioneu múltiples fitxers</string>
     <string name="error_selection">Si us plau seleccioneu un o més fitxer(s)</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-cs/strings.xml b/apps/oi-filemanager/FileManager/res/values-cs/strings.xml
index e6641ee..68368f1 100644
--- a/apps/oi-filemanager/FileManager/res/values-cs/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-cs/strings.xml
@@ -83,7 +83,10 @@
     <string name="move_button_multiselect">Přesunout</string>
     <string name="copy_button_multiselect">Kopírovat</string>
     <string name="delete_button_multiselect">Odstranit</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">PSČ</string>
+
     <string name="multiselect_title">Vybrat více souborů</string>
     <string name="error_selection">Vyberte prosím jeden nebo více souborů.</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-da/strings.xml b/apps/oi-filemanager/FileManager/res/values-da/strings.xml
index 9bcb241..1f2736e 100644
--- a/apps/oi-filemanager/FileManager/res/values-da/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-da/strings.xml
@@ -81,7 +81,10 @@
     <string name="move_button_multiselect">Flyt</string>
     <string name="copy_button_multiselect">Kopier</string>
     <string name="delete_button_multiselect">Slet</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">Select multiple files</string>
     <string name="error_selection">Please select one or more file(s).</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-de/strings.xml b/apps/oi-filemanager/FileManager/res/values-de/strings.xml
index 19f18db..64655a4 100644
--- a/apps/oi-filemanager/FileManager/res/values-de/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-de/strings.xml
@@ -23,6 +23,7 @@
 	<string name="about_translators">Launchpad Contributions:
   Alexander Sapronov https://launchpad.net/~warmonger
   Daniel Winzen https://launchpad.net/~q-d
+  Dennis Baudys https://launchpad.net/~thecondordb
   Flosen https://launchpad.net/~flose
   Giannis Konstantinidis https://launchpad.net/~giankonstantinidis
   Hans https://launchpad.net/~hans-wuerstchen42
@@ -92,7 +93,10 @@
     <string name="move_button_multiselect">Verschieben</string>
     <string name="copy_button_multiselect">Kopieren</string>
     <string name="delete_button_multiselect">Löschen</string>
-    <string name="compress_zip_button_multiselect">PLZ</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
+    <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">Wählen Sie mehrere Dateien aus</string>
     <string name="error_selection">Bitte wählen Sie eine oder mehrere Datei(en) aus.</string>
     
@@ -150,9 +154,9 @@
     <string name="preference_showallwarning_summary_on">Zeige alle Warnmeldungen</string>
     <string name="preference_showallwarning_summary_off">Unterdrücke Warnmeldungen</string>
        
-    <string name="preference_displayhiddenfiles_title">Zeige versteckte Dateien</string>
-    <string name="preference_displayhiddenfiles_summary_on">Zeige versteckte Dateien</string>
-    <string name="preference_displayhiddenfiles_summary_off">Verberge versteckte Dateien</string>
+    <string name="preference_displayhiddenfiles_title">Versteckte Dateien anzeigen</string>
+    <string name="preference_displayhiddenfiles_summary_on">Versteckte Dateien anzeigen</string>
+    <string name="preference_displayhiddenfiles_summary_off">Versteckte Dateien verbergen</string>
     
     <string name="preference_sort_settings">Sortiereinstellungen</string>
     <string name="preference_sortby">Sortieren nach</string>
diff --git a/apps/oi-filemanager/FileManager/res/values-el/strings.xml b/apps/oi-filemanager/FileManager/res/values-el/strings.xml
index 5f4c0a3..8b86e0a 100644
--- a/apps/oi-filemanager/FileManager/res/values-el/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-el/strings.xml
@@ -81,7 +81,10 @@
     <string name="move_button_multiselect">Μετακίνηση</string>
     <string name="copy_button_multiselect">Αντιγραφή</string>
     <string name="delete_button_multiselect">Διαγραφή</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">Επιλογή πολλαπλών αρχείων</string>
     <string name="error_selection">Παρακαλώ επιλέξτε ένα ή περισσότερα αρχεία.</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-en-rGB/strings.xml b/apps/oi-filemanager/FileManager/res/values-en-rGB/strings.xml
index e48e770..e57c12b 100644
--- a/apps/oi-filemanager/FileManager/res/values-en-rGB/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-en-rGB/strings.xml
@@ -81,7 +81,10 @@
     <string name="move_button_multiselect">Move</string>
     <string name="copy_button_multiselect">Copy</string>
     <string name="delete_button_multiselect">Delete</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">Select multiple files</string>
     <string name="error_selection">Please select one or more file(s).</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-es/strings.xml b/apps/oi-filemanager/FileManager/res/values-es/strings.xml
index 0ece597..5d071d5 100644
--- a/apps/oi-filemanager/FileManager/res/values-es/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-es/strings.xml
@@ -61,7 +61,7 @@
     <string name="menu_include_in_media_scan">Incluir en la exploración de archivos multimedia</string>
     <string name="menu_exclude_from_media_scan">Excluir de la exploración de archivos multimedia</string>
     <string name="menu_bookmark">Añadir a marcadores</string>
-    <string name="menu_refresh">Refresh</string>
+    <string name="menu_refresh">Actualizar</string>
     
     <string name="create_new_folder">Crear nueva carpeta</string>
     <string name="folder_name">Nombre de carpeta</string>
@@ -90,7 +90,10 @@
     <string name="move_button_multiselect">Mover</string>
     <string name="copy_button_multiselect">Copiar</string>
     <string name="delete_button_multiselect">Borrar</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">Seleccione varios archivos</string>
     <string name="error_selection">Por favor, seleccione uno o mas archivos</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-fa/strings.xml b/apps/oi-filemanager/FileManager/res/values-fa/strings.xml
index 76e1c6e..bc925b2 100644
--- a/apps/oi-filemanager/FileManager/res/values-fa/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-fa/strings.xml
@@ -81,7 +81,10 @@
     <string name="move_button_multiselect">حرکت نکنید</string>
     <string name="copy_button_multiselect">رونوشت‌</string>
     <string name="delete_button_multiselect">انداختن‌</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">انتخاب چند پرونده</string>
     <string name="error_selection">لطفا انتخاب‌ كردن‌ يكي از پرونده‌ يا بيشتر(s).</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-fo/strings.xml b/apps/oi-filemanager/FileManager/res/values-fo/strings.xml
index 6cb7004..0602c0f 100644
--- a/apps/oi-filemanager/FileManager/res/values-fo/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-fo/strings.xml
@@ -80,7 +80,10 @@
     <string name="move_button_multiselect">Flyt</string>
     <string name="copy_button_multiselect">Copy</string>
     <string name="delete_button_multiselect">Strika</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">Select multiple files</string>
     <string name="error_selection">Please select one or more file(s).</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-fr/strings.xml b/apps/oi-filemanager/FileManager/res/values-fr/strings.xml
index 68fd828..1537c29 100644
--- a/apps/oi-filemanager/FileManager/res/values-fr/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-fr/strings.xml
@@ -23,11 +23,12 @@
 	<string name="about_translators">Launchpad Contributions:
   Abdessamad Derraz https://launchpad.net/~derraz
   Anges https://launchpad.net/~az24
+  Arnaud https://launchpad.net/~arnaud-champollion
   Peli https://launchpad.net/~peli0101
   kawazzzzzz@yahoo.fr https://launchpad.net/~kawazzzzzz</string>
 	
     <!-- Short explanation of the application (max. 80 characters) -->
-    <string name="about_comments">Manage files on the SD card with OI File Manager.</string>  
+    <string name="about_comments">Gérer les fichiers sur la carte SD avec OI File Manager</string>  
 	
 	<!-- ***************************
 	     Applicatio-specific strings
@@ -48,13 +49,13 @@
     <string name="menu_copy">Copier</string>
     <string name="menu_details">Détails</string>
     <string name="menu_more">Plus</string>
-    <string name="menu_compress">Compress (ZIP)</string>
-    <string name="menu_extract">Extract (ZIP)</string>
+    <string name="menu_compress">Compresser (ZIP)</string>
+    <string name="menu_extract">Extraire</string>
     <string name="menu_filter">filtre</string>
     <string name="menu_include_in_media_scan">Inclure dans les recherches</string>
     <string name="menu_exclude_from_media_scan">Exclure des recherches</string>
     <string name="menu_bookmark">Ajouter aux favoris</string>
-    <string name="menu_refresh">Refresh</string>
+    <string name="menu_refresh">Rafraîchir</string>
     
     <string name="create_new_folder">Créer un nouveau dossier</string>
     <string name="folder_name">Nom du dossier</string>
@@ -83,7 +84,10 @@
     <string name="move_button_multiselect">Déplacer</string>
     <string name="copy_button_multiselect">Copier</string>
     <string name="delete_button_multiselect">Supprimer</string>
-    <string name="compress_zip_button_multiselect">ZIP</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
+    <string name="compress_zip_button_multiselect">Code postal</string>
+
     <string name="multiselect_title">Sélectionner plusieurs fichiers</string>
     <string name="error_selection">S\'il vous plaît sélectionner un ou plusieurs fichier(s).</string>
     
@@ -180,17 +184,17 @@
     <!-- ***************************
              Strings for the \'Compressing\' and \'Extracting\' feature
           *************************** -->
-    <string name="compressing_success">Item compressed successfully</string>
-    <string name="compressing_error">Could not compress the item</string>
-    <string name="compress_into_archive">Compress into archive:</string>
-    <string name="extracting_success">Item extracted successfully</string>
-    <string name="extracting_error">Could not extract the item</string>
-    <string name="extract_into_folder">Extract into folder:</string>
-    <string name="extract_title">Select folder to extract into</string>
-    <string name="extract_button">Extract here</string>
-    <string name="extracting">Extracting...</string>
-    <string name="compressing">Compressing...</string>
-    <string name="warning_overwrite">File %s exists. Do you want to overwrite it?</string>
+    <string name="compressing_success">Fichier compressé avec succès</string>
+    <string name="compressing_error">Impossible de compresser ce fichier</string>
+    <string name="compress_into_archive">Compresser dans l\'archive :</string>
+    <string name="extracting_success">Fichier extrait avec succès</string>
+    <string name="extracting_error">Impossible d\'extraire le fichier</string>
+    <string name="extract_into_folder">Extraire vers le dossier :</string>
+    <string name="extract_title">Sélectionnez le dossier de destination</string>
+    <string name="extract_button">Extraire ici</string>
+    <string name="extracting">Extraction en cours ...</string>
+    <string name="compressing">Compression en cours ...</string>
+    <string name="warning_overwrite">Le fichier %s existe déjà. Voulez-vous l\'écraser ?</string>
 
-    <string name="change_file_extension">Do you want to change the file extension?</string>
+    <string name="change_file_extension">Voulez-vous modifier l\'extension du fichier ?</string>
 </resources>
diff --git a/apps/oi-filemanager/FileManager/res/values-hi/strings.xml b/apps/oi-filemanager/FileManager/res/values-hi/strings.xml
index 382505d..49c7e0f 100644
--- a/apps/oi-filemanager/FileManager/res/values-hi/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-hi/strings.xml
@@ -24,6 +24,7 @@
   Abhishek https://launchpad.net/~abhishek9797
   Atharva Lath https://launchpad.net/~atharvalath96
   OpenIntents devs https://launchpad.net/~openintents-devs
+  Prateek Arora https://launchpad.net/~prateekandroid
   happynawani https://launchpad.net/~happynawani</string>
 	
     <!-- Short explanation of the application (max. 80 characters) -->
@@ -54,7 +55,7 @@
     <string name="menu_include_in_media_scan">मीडिया स्कैन में शामिल करें</string>
     <string name="menu_exclude_from_media_scan">मीडिया स्कैन से अपवर्जित करें</string>
     <string name="menu_bookmark">बुकमार्क जोड़ें</string>
-    <string name="menu_refresh">Refresh</string>
+    <string name="menu_refresh">नवीकरण</string>
     
     <string name="create_new_folder">नया फ़ोल्डर बनाएँ</string>
     <string name="folder_name">फ़ोल्डर का नाम</string>
@@ -83,7 +84,10 @@
     <string name="move_button_multiselect">स्थानांतरित करें</string>
     <string name="copy_button_multiselect">प्रतिलिपि बनाएँ</string>
     <string name="delete_button_multiselect">मिटाएँ</string>
-    <string name="compress_zip_button_multiselect">ZIP</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
+    <string name="compress_zip_button_multiselect">सिकोड़िए</string>
+
     <string name="multiselect_title">एकाधिक फ़ाइलों का चयन करें</string>
     <string name="error_selection">एक या एक से अधिक फ़ाइल (ओं) का चयन करें|</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-hu/strings.xml b/apps/oi-filemanager/FileManager/res/values-hu/strings.xml
index 9404c21..5cd50b8 100644
--- a/apps/oi-filemanager/FileManager/res/values-hu/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-hu/strings.xml
@@ -81,7 +81,10 @@
     <string name="move_button_multiselect">Áthelyez</string>
     <string name="copy_button_multiselect">Másol</string>
     <string name="delete_button_multiselect">Töröl</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">Több fájl kiválasztása</string>
     <string name="error_selection">Kérlek, válassz ki egy vagy több fájlt!</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-it/strings.xml b/apps/oi-filemanager/FileManager/res/values-it/strings.xml
index 826f8f3..3cc7b0e 100644
--- a/apps/oi-filemanager/FileManager/res/values-it/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-it/strings.xml
@@ -21,6 +21,7 @@
 	
 	<!-- Automatically filled in by Launchpad: -->
 	<string name="about_translators">Launchpad Contributions:
+  Diego Pierotto https://launchpad.net/~gringo
   Edoardo Maria Elidoro https://launchpad.net/~edoardoelidoro
   Martino Barbon https://launchpad.net/~martins999
   OpenIntents devs https://launchpad.net/~openintents-devs
@@ -51,16 +52,16 @@
     <string name="menu_more">Altro</string>
     <string name="menu_compress">Comprimi (ZIP)</string>
     <string name="menu_extract">Estrai (ZIP)</string>
-    <string name="menu_filter">Filter</string>
+    <string name="menu_filter">Filtro</string>
     <string name="menu_include_in_media_scan">Includi nella scansione dei media</string>
     <string name="menu_exclude_from_media_scan">Escludi dalla scansione dei media.</string>
     <string name="menu_bookmark">Aggiungi ai preferiti</string>
-    <string name="menu_refresh">Refresh</string>
+    <string name="menu_refresh">Aggiorna</string>
     
     <string name="create_new_folder">Crea nuova cartella</string>
     <string name="folder_name">Nome cartella</string>
     <string name="file_name">Nome cartella</string>
-    <string name="extension">Extension (with \'.\')</string>
+    <string name="extension">Estensione (con \'.\')</string>
     <string name="this_folder_is_empty">Questa cartella è vuota.</string>
     <string name="really_delete">Sei sicuro di eliminare %s?</string>
     <string name="file_deleted">Il file è stato eliminato.</string>
@@ -77,27 +78,30 @@
 	<string name="deleting_files">Eliminazione dei file in corso...</string>
     <string name="title_warning_some_may_not_work">Attenzione</string>
     <string name="warning_some_may_not_work">Alcune tra le seguenti opzioni potrebbero non funzionare.</string>
-    <string name="show_warning_again">Show warning again</string>
+    <string name="show_warning_again">Mostra avviso ancora</string>
     
     <!-- Strings for a multi select feature -->
 	<string name="really_delete_multiselect">Vuoi veramente eliminare %d documenti?</string>
     <string name="move_button_multiselect">Sposta</string>
     <string name="copy_button_multiselect">Copia</string>
     <string name="delete_button_multiselect">Elimina</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">Selezione file multipli</string>
     <string name="error_selection">Seleziona uno o più file</string>
     
     <!-- Strings for details table -->
-    <string name="details_type">Type</string>
-    <string name="details_type_folder">Folder</string>
+    <string name="details_type">Tipo</string>
+    <string name="details_type_folder">Cartella</string>
     <string name="details_type_file">File</string>
-    <string name="details_type_other">Other</string>
-    <string name="details_size">Size</string>
-    <string name="details_permissions">Permissions</string>
-    <string name="details_hidden">Hidden</string>
-    <string name="details_lastmodified">Last Modified</string>
-    <string name="details_yes">Yes</string>
+    <string name="details_type_other">Altro</string>
+    <string name="details_size">Dimensione</string>
+    <string name="details_permissions">Permessi</string>
+    <string name="details_hidden">Nascosto</string>
+    <string name="details_lastmodified">Ultima modifica</string>
+    <string name="details_yes">Sì</string>
     <string name="details_no">No</string>
     
     <!-- Construct a unique file name of a file called %s. -->
@@ -135,63 +139,63 @@
     <!-- Category for preferences. -->
     <string name="preference_advanced_features">Opzioni avanzate</string>
 	<string name="preference_mediascan_title">Escludi dalla scansione dei media.</string>
-    <string name="preference_mediascan_summary_on">Show menu item to exclude folders from media scan.</string>
-    <string name="preference_mediascan_summary_off">Hide menu item to exclude folders from media scan.</string>
+    <string name="preference_mediascan_summary_on">Mostra voce menu per escludere cartelle dalla scansione.</string>
+    <string name="preference_mediascan_summary_off">Nascondi voce menu per escludere cartelle dalla scansione.</string>
     
-    <string name="preference_showallwarning_title">Show all warnings</string>
-    <string name="preference_showallwarning_summary_on">Show all warning messages</string>
-    <string name="preference_showallwarning_summary_off">Suppress warning messages</string>
+    <string name="preference_showallwarning_title">Mostra tutti gli avvisi</string>
+    <string name="preference_showallwarning_summary_on">Mostra tutti i messaggi di avviso</string>
+    <string name="preference_showallwarning_summary_off">Rimuovi messaggi di avviso</string>
        
-    <string name="preference_displayhiddenfiles_title">Display hidden files</string>
-    <string name="preference_displayhiddenfiles_summary_on">Display hidden files</string>
-    <string name="preference_displayhiddenfiles_summary_off">Hide hidden files</string>
+    <string name="preference_displayhiddenfiles_title">Mostra files nascosti</string>
+    <string name="preference_displayhiddenfiles_summary_on">Mostra files nascosti</string>
+    <string name="preference_displayhiddenfiles_summary_off">Nascondi files nascosti</string>
     
-    <string name="preference_sort_settings">Sort settings</string>
-    <string name="preference_sortby">Sort by</string>
-    <string name="preference_sortby_ascending">In ascending order</string>
-    <string name="preference_sortby_ascending_summary_on">Sort in ascending order</string>
-    <string name="preference_sortby_ascending_summary_off">Sort in descending order</string>
+    <string name="preference_sort_settings">Impostazioni ordinamento</string>
+    <string name="preference_sortby">Ordina per</string>
+    <string name="preference_sortby_ascending">In ordine crescente</string>
+    <string name="preference_sortby_ascending_summary_on">Ordina in modo crescente</string>
+    <string name="preference_sortby_ascending_summary_off">Ordina in modo decrescente</string>
     <string-array name="preference_sortby_names">
-        <item>Name</item>
-        <item>Size</item>
-        <item>Last modified</item>
+        <item>Nome</item>
+        <item>Dimensione</item>
+        <item>Ultima modifica</item>
     </string-array>
 
         
     <!-- ***************************
    		 Strings for the \'Save as\' feature
     	 *************************** -->
-    <string name="saveas_no_file_picked">You haven\'t picked any file.</string>
-    <string name="saveas_error">An error occured.</string>
-    <string name="saveas_file_saved">File successfully saved!</string>
+    <string name="saveas_no_file_picked">Nessun file è stato selezionato.</string>
+    <string name="saveas_error">Si è verificato un errore.</string>
+    <string name="saveas_file_saved">File salvato con successo!</string>
     
         
    
-    <string name="bookmarks">Bookmarks</string>
-    <string name="bookmarks_cancel">Cancel</string>
+    <string name="bookmarks">Segnalibri</string>
+    <string name="bookmarks_cancel">Annulla</string>
     <string name="bookmarks_delete">Elimina</string>
-    <string name="bookmarks_select_to_delete">Select bookmarks to delete</string>
-    <string name="bookmarks_manage">Manage bookmarks</string>
-    <string name="bookmark_added">Bookmark added</string>
-    <string name="bookmark_not_found">Bookmarked destination not found.</string>
-    <string name="bookmarks_deleted">Selected bookmarks deleted</string>
-    <string name="bookmark_already_exists">This file is already bookmarked</string>
+    <string name="bookmarks_select_to_delete">Seleziona segnalibri da cancellare</string>
+    <string name="bookmarks_manage">Gestione segnalibri</string>
+    <string name="bookmark_added">Segnalibro aggiunto</string>
+    <string name="bookmark_not_found">Destinazione segnalibri non trovata.</string>
+    <string name="bookmarks_deleted">Segnalibri selezionati cancellati</string>
+    <string name="bookmark_already_exists">Questo file è già presente nei segnalibri</string>
 
 
     <!-- ***************************
              Strings for the \'Compressing\' and \'Extracting\' feature
           *************************** -->
-    <string name="compressing_success">Item compressed successfully</string>
-    <string name="compressing_error">Could not compress the item</string>
-    <string name="compress_into_archive">Compress into archive:</string>
-    <string name="extracting_success">Item extracted successfully</string>
-    <string name="extracting_error">Could not extract the item</string>
-    <string name="extract_into_folder">Extract into folder:</string>
-    <string name="extract_title">Select folder to extract into</string>
-    <string name="extract_button">Extract here</string>
-    <string name="extracting">Extracting...</string>
-    <string name="compressing">Compressing...</string>
-    <string name="warning_overwrite">File %s exists. Do you want to overwrite it?</string>
+    <string name="compressing_success">File compresso con successo</string>
+    <string name="compressing_error">Impossibile comprimere il file</string>
+    <string name="compress_into_archive">Comprimi nell\'archivio</string>
+    <string name="extracting_success">File estratto con successo</string>
+    <string name="extracting_error">Impossibile estrarre il file</string>
+    <string name="extract_into_folder">Estrai nella cartella:</string>
+    <string name="extract_title">Seleziona cartella dove estrarre</string>
+    <string name="extract_button">Estrai qui</string>
+    <string name="extracting">Estrazione...</string>
+    <string name="compressing">Compressione...</string>
+    <string name="warning_overwrite">File %s già presente. Vuoi sovrascriverlo?</string>
 
-    <string name="change_file_extension">Do you want to change the file extension?</string>
+    <string name="change_file_extension">Vuoi modificare l\'estensione del file?</string>
 </resources>
diff --git a/apps/oi-filemanager/FileManager/res/values-iw/strings.xml b/apps/oi-filemanager/FileManager/res/values-iw/strings.xml
index fb8e7b2..fce5cae 100644
--- a/apps/oi-filemanager/FileManager/res/values-iw/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-iw/strings.xml
@@ -82,7 +82,10 @@
     <string name="move_button_multiselect">העברה</string>
     <string name="copy_button_multiselect">העתקה</string>
     <string name="delete_button_multiselect">מחיקה</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">בחירת קבצים מרובה</string>
     <string name="error_selection">יש לבחור קובץ אחד או יותר</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-ja/strings.xml b/apps/oi-filemanager/FileManager/res/values-ja/strings.xml
index 48053c2..385e73c 100644
--- a/apps/oi-filemanager/FileManager/res/values-ja/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-ja/strings.xml
@@ -84,7 +84,10 @@
     <string name="move_button_multiselect">移動</string>
     <string name="copy_button_multiselect">コピー</string>
     <string name="delete_button_multiselect">削除</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">複数のファイルを選択する</string>
     <string name="error_selection">一つ以上のふぃあるを選択してください。</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-ko/strings.xml b/apps/oi-filemanager/FileManager/res/values-ko/strings.xml
index 735f7ed..dcde156 100644
--- a/apps/oi-filemanager/FileManager/res/values-ko/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-ko/strings.xml
@@ -82,7 +82,10 @@
     <string name="move_button_multiselect">이동</string>
     <string name="copy_button_multiselect">복사</string>
     <string name="delete_button_multiselect">삭제</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">여러 파일 선택</string>
     <string name="error_selection">최소 한 개의 파일을 선택해 주세요</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-lo/strings.xml b/apps/oi-filemanager/FileManager/res/values-lo/strings.xml
index aa0133b..6247eab 100644
--- a/apps/oi-filemanager/FileManager/res/values-lo/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-lo/strings.xml
@@ -80,7 +80,10 @@
     <string name="move_button_multiselect">ຍ້າຍ</string>
     <string name="copy_button_multiselect">Copy</string>
     <string name="delete_button_multiselect">ລຶບ</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">Select multiple files</string>
     <string name="error_selection">Please select one or more file(s).</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-lv/strings.xml b/apps/oi-filemanager/FileManager/res/values-lv/strings.xml
index 91ee269..2666104 100644
--- a/apps/oi-filemanager/FileManager/res/values-lv/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-lv/strings.xml
@@ -81,7 +81,10 @@
     <string name="move_button_multiselect">Pārvietot</string>
     <string name="copy_button_multiselect">Kopēt</string>
     <string name="delete_button_multiselect">Dzēst</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">Izvēlēties vairākus failus</string>
     <string name="error_selection">Lūdzu, izvēlieties vienu vai vairākus failu(s).</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-nb/strings.xml b/apps/oi-filemanager/FileManager/res/values-nb/strings.xml
index 7b445f6..649b7ed 100644
--- a/apps/oi-filemanager/FileManager/res/values-nb/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-nb/strings.xml
@@ -22,7 +22,8 @@
 	<!-- Automatically filled in by Launchpad: -->
 	<string name="about_translators">Launchpad Contributions:
   Arne Tobias Malkenes Ødegaard https://launchpad.net/~arne-tobias
-  OpenIntents devs https://launchpad.net/~openintents-devs</string>
+  OpenIntents devs https://launchpad.net/~openintents-devs
+  Simen https://launchpad.net/~simen-burud</string>
 	
     <!-- Short explanation of the application (max. 80 characters) -->
     <string name="about_comments">Administrer filer på SD-kortet med OI Filbehandler.</string>  
@@ -81,7 +82,10 @@
     <string name="move_button_multiselect">Flytt</string>
     <string name="copy_button_multiselect">Kopier</string>
     <string name="delete_button_multiselect">Slett</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">Velg flere filer</string>
     <string name="error_selection">Vennligst velg en eller flere fil(er).</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-nl/strings.xml b/apps/oi-filemanager/FileManager/res/values-nl/strings.xml
index a667b39..806a11c 100644
--- a/apps/oi-filemanager/FileManager/res/values-nl/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-nl/strings.xml
@@ -22,6 +22,7 @@
 	<!-- Automatically filled in by Launchpad: -->
 	<string name="about_translators">Launchpad Contributions:
   Henk van der Velden https://launchpad.net/~henkvandervelden86
+  Maarten de Vries https://launchpad.net/~maarten-k-de-vries
   Mark van Kuijk https://launchpad.net/~markvankuyk
   Menno Vogel https://launchpad.net/~mennovogel90
   OpenIntents devs https://launchpad.net/~openintents-devs
@@ -51,19 +52,19 @@
     <string name="menu_move">Verplaatsen</string>
     <string name="menu_copy">Kopieer</string>
     <string name="menu_details">Details</string>
-    <string name="menu_more">More</string>
-    <string name="menu_compress">Compress (ZIP)</string>
-    <string name="menu_extract">Extract (ZIP)</string>
-    <string name="menu_filter">Filter</string>
+    <string name="menu_more">Meer</string>
+    <string name="menu_compress">Comprimeren (ZIP)</string>
+    <string name="menu_extract">Uitpakken (ZIP)</string>
+    <string name="menu_filter">Filteren</string>
     <string name="menu_include_in_media_scan">Meenemen bij media scan</string>
     <string name="menu_exclude_from_media_scan">Negeren bij media scan</string>
-    <string name="menu_bookmark">Add to bookmarks</string>
-    <string name="menu_refresh">Refresh</string>
+    <string name="menu_bookmark">Toevoegen aan favorieten</string>
+    <string name="menu_refresh">Verversen</string>
     
     <string name="create_new_folder">Nieuwe map aanmaken</string>
     <string name="folder_name">Naam van de map</string>
     <string name="file_name">Naam van de map</string>
-    <string name="extension">Extension (with \'.\')</string>
+    <string name="extension">Extensie ( met \'.\')</string>
     <string name="this_folder_is_empty">Deze map is leeg.</string>
     <string name="really_delete">Wil je echt %s verwijderen?</string>
     <string name="file_deleted">Bestand verwijderd.</string>
@@ -78,30 +79,33 @@
     <string name="copy_title">Kies map om naartoe te kopiëren</string>
     <string name="copy_button">Kopieer hier</string>
 	<string name="deleting_files">Bestanden aan het verwijderen...</string>
-    <string name="title_warning_some_may_not_work">Warning</string>
-    <string name="warning_some_may_not_work">Some of the following options may not work.</string>
-    <string name="show_warning_again">Show warning again</string>
+    <string name="title_warning_some_may_not_work">Waarschuwing</string>
+    <string name="warning_some_may_not_work">Mogelijk werkt een aantal van deze opties niet</string>
+    <string name="show_warning_again">Waarschuwing opnieuw tonen</string>
     
     <!-- Strings for a multi select feature -->
 	<string name="really_delete_multiselect">Wilt u echt %d bestanden verwijderen?</string>
     <string name="move_button_multiselect">Verplaatsen</string>
     <string name="copy_button_multiselect">Kopieer</string>
     <string name="delete_button_multiselect">Verwijderen</string>
-    <string name="compress_zip_button_multiselect">ZIP</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
+    <string name="compress_zip_button_multiselect">Postcode</string>
+
     <string name="multiselect_title">Selecteer meerdere bestanden</string>
     <string name="error_selection">Selecteer een of meer bestanden.</string>
     
     <!-- Strings for details table -->
     <string name="details_type">Type</string>
-    <string name="details_type_folder">Folder</string>
-    <string name="details_type_file">File</string>
-    <string name="details_type_other">Other</string>
-    <string name="details_size">Size</string>
-    <string name="details_permissions">Permissions</string>
-    <string name="details_hidden">Hidden</string>
-    <string name="details_lastmodified">Last Modified</string>
-    <string name="details_yes">Yes</string>
-    <string name="details_no">No</string>
+    <string name="details_type_folder">Map</string>
+    <string name="details_type_file">Bestand</string>
+    <string name="details_type_other">Overig</string>
+    <string name="details_size">Grootte</string>
+    <string name="details_permissions">Rechten</string>
+    <string name="details_hidden">Verborgen</string>
+    <string name="details_lastmodified">Laatst gewijzigd</string>
+    <string name="details_yes">Ja</string>
+    <string name="details_no">Nee</string>
     
     <!-- Construct a unique file name of a file called %s. -->
     <string name="copied_file_name">Kopie van %s</string>
@@ -142,59 +146,59 @@
     <string name="preference_mediascan_summary_off">Verberg menu-item om mappen van de media scan uit te sluiten.</string>
     
     <string name="preference_showallwarning_title">Toon alle waarschuwingen</string>
-    <string name="preference_showallwarning_summary_on">Show all warning messages</string>
-    <string name="preference_showallwarning_summary_off">Suppress warning messages</string>
+    <string name="preference_showallwarning_summary_on">Alle waarschuwingen tonen</string>
+    <string name="preference_showallwarning_summary_off">Waarschuwingen verbergen</string>
        
-    <string name="preference_displayhiddenfiles_title">Display hidden files</string>
-    <string name="preference_displayhiddenfiles_summary_on">Display hidden files</string>
-    <string name="preference_displayhiddenfiles_summary_off">Hide hidden files</string>
+    <string name="preference_displayhiddenfiles_title">Verborgen bestanden tonen</string>
+    <string name="preference_displayhiddenfiles_summary_on">Verborgen bestanden tonen</string>
+    <string name="preference_displayhiddenfiles_summary_off">Verborgen bestanden niet tonen</string>
     
-    <string name="preference_sort_settings">Sort settings</string>
-    <string name="preference_sortby">Sort by</string>
-    <string name="preference_sortby_ascending">In ascending order</string>
-    <string name="preference_sortby_ascending_summary_on">Sort in ascending order</string>
+    <string name="preference_sort_settings">Sorteeropties</string>
+    <string name="preference_sortby">Sorteren op</string>
+    <string name="preference_sortby_ascending">Oplopend</string>
+    <string name="preference_sortby_ascending_summary_on">Sorteer in oplopende volgorde</string>
     <string name="preference_sortby_ascending_summary_off">Sorteer in aflopende volgorde</string>
     <string-array name="preference_sortby_names">
-        <item>Name</item>
-        <item>Size</item>
-        <item>Last modified</item>
+        <item>Naam</item>
+        <item>Grootte</item>
+        <item>Laatst gewijzigd</item>
     </string-array>
 
         
     <!-- ***************************
    		 Strings for the \'Save as\' feature
     	 *************************** -->
-    <string name="saveas_no_file_picked">You haven\'t picked any file.</string>
-    <string name="saveas_error">An error occured.</string>
+    <string name="saveas_no_file_picked">U heeft geen bestand geselecteerd</string>
+    <string name="saveas_error">Er is een fout opgetreden.</string>
     <string name="saveas_file_saved">Bestand is succesvol opgeslagen.</string>
     
         
    
-    <string name="bookmarks">Bookmarks</string>
-    <string name="bookmarks_cancel">Cancel</string>
+    <string name="bookmarks">Favorieten</string>
+    <string name="bookmarks_cancel">Annuleren</string>
     <string name="bookmarks_delete">Verwijderen</string>
-    <string name="bookmarks_select_to_delete">Select bookmarks to delete</string>
-    <string name="bookmarks_manage">Manage bookmarks</string>
+    <string name="bookmarks_select_to_delete">Selecteer de bladwijzers om te verwijderen</string>
+    <string name="bookmarks_manage">Favorieten beheren</string>
     <string name="bookmark_added">Bladwijzer toegevoegd</string>
-    <string name="bookmark_not_found">Bookmarked destination not found.</string>
-    <string name="bookmarks_deleted">Selected bookmarks deleted</string>
-    <string name="bookmark_already_exists">This file is already bookmarked</string>
+    <string name="bookmark_not_found">Doel van favoriet niet gevonden</string>
+    <string name="bookmarks_deleted">Geselecteerde favorieten verwijderd</string>
+    <string name="bookmark_already_exists">Dit bestand is al een favoriet</string>
 
 
     <!-- ***************************
              Strings for the \'Compressing\' and \'Extracting\' feature
           *************************** -->
-    <string name="compressing_success">Item compressed successfully</string>
-    <string name="compressing_error">Could not compress the item</string>
-    <string name="compress_into_archive">Compress into archive:</string>
-    <string name="extracting_success">Item extracted successfully</string>
-    <string name="extracting_error">Could not extract the item</string>
-    <string name="extract_into_folder">Extract into folder:</string>
-    <string name="extract_title">Select folder to extract into</string>
-    <string name="extract_button">Extract here</string>
-    <string name="extracting">Extracting...</string>
-    <string name="compressing">Compressing...</string>
-    <string name="warning_overwrite">File %s exists. Do you want to overwrite it?</string>
+    <string name="compressing_success">Bestand gecomprimeerd</string>
+    <string name="compressing_error">Kon bestand niet comprimeren</string>
+    <string name="compress_into_archive">Comprimeer naar archief:</string>
+    <string name="extracting_success">Bestand succesvol uitgepakt</string>
+    <string name="extracting_error">Kon bestand niet uitpakken</string>
+    <string name="extract_into_folder">Uitpakken in map</string>
+    <string name="extract_title">Selecteer de map waar u wilt uitpakken</string>
+    <string name="extract_button">Hier uitpakken</string>
+    <string name="extracting">Bezig met uitpakken...</string>
+    <string name="compressing">Bezig met comprimeren...</string>
+    <string name="warning_overwrite">Het bestand %s bestaat al. Wilt u het vervangen?</string>
 
-    <string name="change_file_extension">Do you want to change the file extension?</string>
+    <string name="change_file_extension">Wilt u de bestandsextensie wijzigen?</string>
 </resources>
diff --git a/apps/oi-filemanager/FileManager/res/values-oc/strings.xml b/apps/oi-filemanager/FileManager/res/values-oc/strings.xml
index addc446..24fe453 100644
--- a/apps/oi-filemanager/FileManager/res/values-oc/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-oc/strings.xml
@@ -80,7 +80,10 @@
     <string name="move_button_multiselect">Desplaçar</string>
     <string name="copy_button_multiselect">Copiar</string>
     <string name="delete_button_multiselect">Suprimir</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">Select multiple files</string>
     <string name="error_selection">Please select one or more file(s).</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-pa/strings.xml b/apps/oi-filemanager/FileManager/res/values-pa/strings.xml
index ff7bcb9..1bcee12 100644
--- a/apps/oi-filemanager/FileManager/res/values-pa/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-pa/strings.xml
@@ -81,7 +81,10 @@
     <string name="move_button_multiselect">ਹਿਲਾਓ</string>
     <string name="copy_button_multiselect">ਕਾਪੀ</string>
     <string name="delete_button_multiselect">ਹਟਾਉ</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">ਕਇ ਫਾਇਲ ਚੁਨੇ</string>
     <string name="error_selection">1 ਯਾ ਜਯਾਦਾ ਫਾਇਲ ਚੁਨੇ</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-pl/strings.xml b/apps/oi-filemanager/FileManager/res/values-pl/strings.xml
index 18cb60b..e2c4335 100644
--- a/apps/oi-filemanager/FileManager/res/values-pl/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-pl/strings.xml
@@ -87,7 +87,10 @@
     <string name="move_button_multiselect">Przenieś</string>
     <string name="copy_button_multiselect">Kopiuj</string>
     <string name="delete_button_multiselect">Usuń</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">Kod pocztowy</string>
+
     <string name="multiselect_title">Zaznacz wiele plików</string>
     <string name="error_selection">Proszę wybrać plik(i).</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-pt-rBR/strings.xml b/apps/oi-filemanager/FileManager/res/values-pt-rBR/strings.xml
index ad0c518..a989922 100644
--- a/apps/oi-filemanager/FileManager/res/values-pt-rBR/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-pt-rBR/strings.xml
@@ -82,7 +82,10 @@
     <string name="move_button_multiselect">Mover</string>
     <string name="copy_button_multiselect">Copiar</string>
     <string name="delete_button_multiselect">Apagar</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">Selecione varios arquivos</string>
     <string name="error_selection">Favor selecionar um ou mais arquivos</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-pt/strings.xml b/apps/oi-filemanager/FileManager/res/values-pt/strings.xml
index ad72cb2..eeb4a68 100644
--- a/apps/oi-filemanager/FileManager/res/values-pt/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-pt/strings.xml
@@ -81,7 +81,10 @@
     <string name="move_button_multiselect">Mover</string>
     <string name="copy_button_multiselect">Copiar</string>
     <string name="delete_button_multiselect">Eliminar</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">Selecionar vários ficheiros</string>
     <string name="error_selection">Por favor, escolha um ou mais ficheiros.</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-ro/strings.xml b/apps/oi-filemanager/FileManager/res/values-ro/strings.xml
index c14ac6f..cf3e65f 100644
--- a/apps/oi-filemanager/FileManager/res/values-ro/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-ro/strings.xml
@@ -85,7 +85,10 @@
     <string name="move_button_multiselect">Mută</string>
     <string name="copy_button_multiselect">Copiază</string>
     <string name="delete_button_multiselect">Șterge</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">Selectează fișiere multiple</string>
     <string name="error_selection">Selectați unul sau mai multe fișiere.</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-ru/strings.xml b/apps/oi-filemanager/FileManager/res/values-ru/strings.xml
index 079bb0d..f6fb4fb 100644
--- a/apps/oi-filemanager/FileManager/res/values-ru/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-ru/strings.xml
@@ -29,7 +29,7 @@
   Peli https://launchpad.net/~peli0101</string>
 	
     <!-- Short explanation of the application (max. 80 characters) -->
-    <string name="about_comments">Manage files on the SD card with OI File Manager.</string>  
+    <string name="about_comments">Управляйте файлами на SD карте с помощью OI File Manager.</string>  
 	
 	<!-- ***************************
 	     Applicatio-specific strings
@@ -50,13 +50,13 @@
     <string name="menu_copy">Копировать</string>
     <string name="menu_details">Подробная информация</string>
     <string name="menu_more">Подробнее</string>
-    <string name="menu_compress">Compress (ZIP)</string>
-    <string name="menu_extract">Extract (ZIP)</string>
+    <string name="menu_compress">Сжать (ZIP)</string>
+    <string name="menu_extract">Извлечь (ZIP)</string>
     <string name="menu_filter">Фильтр</string>
     <string name="menu_include_in_media_scan">Включить в сканирование</string>
     <string name="menu_exclude_from_media_scan">Исключить из сканирования</string>
     <string name="menu_bookmark">Добавить в избранное</string>
-    <string name="menu_refresh">Refresh</string>
+    <string name="menu_refresh">Обновить</string>
     
     <string name="create_new_folder">Создать новую папку</string>
     <string name="folder_name">Имя папки</string>
@@ -85,7 +85,10 @@
     <string name="move_button_multiselect">Переместить</string>
     <string name="copy_button_multiselect">Копировать</string>
     <string name="delete_button_multiselect">Удалить</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">Выберите несколько файлов</string>
     <string name="error_selection">Пожалуйства выберите один или больше файлов.</string>
     
@@ -182,17 +185,17 @@
     <!-- ***************************
              Strings for the \'Compressing\' and \'Extracting\' feature
           *************************** -->
-    <string name="compressing_success">Item compressed successfully</string>
-    <string name="compressing_error">Could not compress the item</string>
-    <string name="compress_into_archive">Compress into archive:</string>
-    <string name="extracting_success">Item extracted successfully</string>
-    <string name="extracting_error">Could not extract the item</string>
-    <string name="extract_into_folder">Extract into folder:</string>
-    <string name="extract_title">Select folder to extract into</string>
-    <string name="extract_button">Extract here</string>
-    <string name="extracting">Extracting...</string>
-    <string name="compressing">Compressing...</string>
-    <string name="warning_overwrite">File %s exists. Do you want to overwrite it?</string>
+    <string name="compressing_success">Элемент успешно сжат</string>
+    <string name="compressing_error">Не удалось сжать элемент</string>
+    <string name="compress_into_archive">Сжать в архив:</string>
+    <string name="extracting_success">Элемент успешно распакован</string>
+    <string name="extracting_error">Не удалось распаковать элемент</string>
+    <string name="extract_into_folder">Распаковать в папку:</string>
+    <string name="extract_title">Выберите папку для извлечения</string>
+    <string name="extract_button">Распаковать здесь</string>
+    <string name="extracting">Распаковка...</string>
+    <string name="compressing">Сжатие...</string>
+    <string name="warning_overwrite">Файл %s уже существует. Вы хотите перезаписать его?</string>
 
-    <string name="change_file_extension">Do you want to change the file extension?</string>
+    <string name="change_file_extension">Вы хотите изменить расширение файла?</string>
 </resources>
diff --git a/apps/oi-filemanager/FileManager/res/values-sc/strings.xml b/apps/oi-filemanager/FileManager/res/values-sc/strings.xml
index 0436231..4eb57cb 100644
--- a/apps/oi-filemanager/FileManager/res/values-sc/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-sc/strings.xml
@@ -81,7 +81,10 @@
     <string name="move_button_multiselect">Moghe</string>
     <string name="copy_button_multiselect">Cópia</string>
     <string name="delete_button_multiselect">Doga</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">Select multiple files</string>
     <string name="error_selection">Please select one or more file(s).</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-sd/strings.xml b/apps/oi-filemanager/FileManager/res/values-sd/strings.xml
index 780d6c8..8c4e22a 100644
--- a/apps/oi-filemanager/FileManager/res/values-sd/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-sd/strings.xml
@@ -83,7 +83,10 @@
     <string name="move_button_multiselect">खिस्कयोस</string>
     <string name="copy_button_multiselect">कापी कयो</string>
     <string name="delete_button_multiselect">मिटायो</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">हिक्क खान वधीक फईलोयूं चुन्द्यो</string>
     <string name="error_selection">कृपा करे हिक्क या  वधीक फईल्यूं चुन्द्यो</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-sk/strings.xml b/apps/oi-filemanager/FileManager/res/values-sk/strings.xml
index 950bfbf..fa965a7 100644
--- a/apps/oi-filemanager/FileManager/res/values-sk/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-sk/strings.xml
@@ -82,7 +82,10 @@
     <string name="move_button_multiselect">Presunúť</string>
     <string name="copy_button_multiselect">Kopírovať</string>
     <string name="delete_button_multiselect">Zmazať</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">Označiť viacero súborov</string>
     <string name="error_selection">Prosím označte jeden alebo viac súborov.</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-sl/strings.xml b/apps/oi-filemanager/FileManager/res/values-sl/strings.xml
index 3e9dbbc..b606623 100644
--- a/apps/oi-filemanager/FileManager/res/values-sl/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-sl/strings.xml
@@ -81,7 +81,10 @@
     <string name="move_button_multiselect">Prestavi</string>
     <string name="copy_button_multiselect">Kopiraj</string>
     <string name="delete_button_multiselect">Izbriši</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">Izberi več datotek</string>
     <string name="error_selection">Prosim izberi eno ali več datotek.</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-sv/strings.xml b/apps/oi-filemanager/FileManager/res/values-sv/strings.xml
new file mode 100644
index 0000000..34deb0e
--- /dev/null
+++ b/apps/oi-filemanager/FileManager/res/values-sv/strings.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+ * Copyright (C) 2007-2008 OpenIntents.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ -->
+<resources>
+	<!-- ***************************
+	     About information
+	     *************************** -->
+	
+	<!-- Automatically filled in by Launchpad: -->
+	<string name="about_translators">Launchpad Contributions:
+  Carl Fredrik Sima https://launchpad.net/~cf-sima</string>
+	
+    <!-- Short explanation of the application (max. 80 characters) -->
+    <string name="about_comments">Hantera filer på SD-kort med OI File Manager.</string>  
+	
+	<!-- ***************************
+	     Applicatio-specific strings
+	     *************************** -->
+	<!-- Name of application. Can be localized. OI = OpenIntents should stay unmodified. -->
+    <string name="app_name">OI File Manager</string>
+    
+    <string name="menu_new_folder">Ny Mapp</string>
+    
+    <!-- Multi select option menu -->
+    <string name="menu_multi_select">Välj Flera</string>
+
+    <string name="menu_delete">Ta Bort</string>
+    <string name="menu_rename">Byt Namn</string>
+    <string name="menu_send">Skicka</string>
+    <string name="menu_open">Öppna</string>
+    <string name="menu_move">Flytta</string>
+    <string name="menu_copy">Kopiera</string>
+    <string name="menu_details">Detaljer</string>
+    <string name="menu_more">Mera</string>
+    <string name="menu_compress">Komprimera (ZIP)</string>
+    <string name="menu_extract">Extrahera (ZIP)</string>
+    <string name="menu_filter">Filtrera</string>
+    <string name="menu_include_in_media_scan">Inkludera i mediasökning</string>
+    <string name="menu_exclude_from_media_scan">Exkludera i mediasökning</string>
+    <string name="menu_bookmark">Lägg till bokmärken</string>
+    <string name="menu_refresh">Uppdatera</string>
+    
+    <string name="create_new_folder">Skapa ny mapp</string>
+    <string name="folder_name">Mappnamn</string>
+    <string name="file_name">Mappnamn</string>
+    <string name="extension">Filändelse (med \'.\')</string>
+    <string name="this_folder_is_empty">Den här mappen är tom.</string>
+    <string name="really_delete">Vill du verkligen ta bort %s?</string>
+    <string name="file_deleted">Fil borttagen.</string>
+    <string name="folder_deleted">Mapp borttagen.</string>
+    <string name="file_renamed">Filnamn ändrat.</string>
+    <string name="folder_renamed">Mappnamn ändrat.</string>
+    <string name="file_moved">Fil flyttad</string>
+    <string name="folder_moved">Mapp flyttad.</string>
+    <string name="file_copied">Fil kopierad.</string>
+    <string name="move_title">Välj mapp att flytta till</string>
+    <string name="move_button">Flytta hit</string>
+    <string name="copy_title">Välj mapp att kopiera till</string>
+    <string name="copy_button">Kopiera hit</string>
+	<string name="deleting_files">Tar bort filer...</string>
+    <string name="title_warning_some_may_not_work">Varning</string>
+    <string name="warning_some_may_not_work">Några av följande alternativ kanske inte fungerar.</string>
+    <string name="show_warning_again">Visa varning igen</string>
+    
+    <!-- Strings for a multi select feature -->
+	<string name="really_delete_multiselect">Vill du verkligen ta bort %d filer?</string>
+    <string name="move_button_multiselect">Flytta</string>
+    <string name="copy_button_multiselect">Kopiera</string>
+    <string name="delete_button_multiselect">Ta Bort</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
+    <string name="compress_zip_button_multiselect">ZIP</string>
+
+    <string name="multiselect_title">Välj flera filer</string>
+    <string name="error_selection">Var god välj en eller fler filer.</string>
+    
+    <!-- Strings for details table -->
+    <string name="details_type">Typ</string>
+    <string name="details_type_folder">Mapp</string>
+    <string name="details_type_file">Fil</string>
+    <string name="details_type_other">Annat</string>
+    <string name="details_size">Storlek</string>
+    <string name="details_permissions">Behörigheter</string>
+    <string name="details_hidden">Dold</string>
+    <string name="details_lastmodified">Senast modifierad</string>
+    <string name="details_yes">Ja</string>
+    <string name="details_no">Nej</string>
+    
+    <!-- Construct a unique file name of a file called %s. -->
+    <string name="copied_file_name">Kopiering av %s</string>
+    
+    <!-- Construct a unique file name with number %1$d of a file called %2$s. -->
+    <string name="copied_file_name_2">Kopierar %1$d av %2$s</string>
+    
+    <string name="media_scan_included">Den här mappen blir inkluderad i nästa multimedia scanning.</string>
+    <string name="media_scan_excluded">Den här mappen blir exkluderad i nästa multimedia scanning.</string>
+    
+    <string name="error_creating_new_folder">Kunde inte skapa ny mapp.</string>
+    <string name="error_deleting_file">Kunde inte ta bort fil.</string>
+    <string name="error_deleting_folder">Kunde inte ta bort mappen \'%s\'.</string>
+    <string name="error_renaming_file">Kunde inte döpa om fil.</string>
+    <string name="error_renaming_folder">Kunde inte döpa om mapp.</string>
+    <string name="error_moving_file">Kunde inte flytta fil.</string>
+    <string name="error_moving_folder">Kunde inte flytta mapp.</string>
+    <string name="error_copying_file">Kunde inte kopiera fil.</string>
+    <string name="error_file_does_not_exists">Filen existerar inte.</string>
+    <string name="error_deleting_child_file">Kunde inte ta bort dotterfilen \'%s\'.</string>
+    <string name="error_generic">Ett fel uppstod:</string>
+    <string name="error_media_scan">Kunde inte ändra media scanningsinställningar.</string>
+    
+    <string name="send_not_available">Ingen applikation tillgänglig för sändning.</string>
+    
+    <string name="application_not_available">Applikationen ej tillgänglig</string>
+    
+	<!-- ***************************
+	     Preferences
+	     *************************** -->
+    <!-- Menu item for Settings -->
+	<string name="settings">Inställningar</string>
+	
+    <!-- Category for preferences. -->
+    <string name="preference_advanced_features">Avancerade funktioner</string>
+	<string name="preference_mediascan_title">Exkludera i mediasökning</string>
+    <string name="preference_mediascan_summary_on">Visa menyknapp för att exkludera mappar från media scanning.</string>
+    <string name="preference_mediascan_summary_off">Dölj menyknapp för att exkludera mappar från media scanning.</string>
+    
+    <string name="preference_showallwarning_title">Visa alla varningar</string>
+    <string name="preference_showallwarning_summary_on">Visa alla varningsmeddelanden</string>
+    <string name="preference_showallwarning_summary_off">Visa ej varningsmeddelanden</string>
+       
+    <string name="preference_displayhiddenfiles_title">Visa dolda filer</string>
+    <string name="preference_displayhiddenfiles_summary_on">Visa dolda filer</string>
+    <string name="preference_displayhiddenfiles_summary_off">Dölj dolda filer</string>
+    
+    <string name="preference_sort_settings">Sorteringsinställningar</string>
+    <string name="preference_sortby">Sortera i</string>
+    <string name="preference_sortby_ascending">Stigande ordning</string>
+    <string name="preference_sortby_ascending_summary_on">Sortera i stigande följd</string>
+    <string name="preference_sortby_ascending_summary_off">Sortera i nedstigande följd</string>
+    <string-array name="preference_sortby_names">
+        <item>Namn</item>
+        <item>Storlek</item>
+        <item>Senast modifierad</item>
+    </string-array>
+
+        
+    <!-- ***************************
+   		 Strings for the \'Save as\' feature
+    	 *************************** -->
+    <string name="saveas_no_file_picked">Du har inte valt någon fil.</string>
+    <string name="saveas_error">Ett fel uppstod.</string>
+    <string name="saveas_file_saved">Fil sparad!</string>
+    
+        
+   
+    <string name="bookmarks">Bokmärken</string>
+    <string name="bookmarks_cancel">Avbryt</string>
+    <string name="bookmarks_delete">Ta Bort</string>
+    <string name="bookmarks_select_to_delete">Välj bokmärken att ta bort</string>
+    <string name="bookmarks_manage">Hantera bokmärken</string>
+    <string name="bookmark_added">Bokmärke tillagt</string>
+    <string name="bookmark_not_found">Bokmärkets destination kunde ej hittas.</string>
+    <string name="bookmarks_deleted">Valda bokmärken borttagna</string>
+    <string name="bookmark_already_exists">Den här filen är redan sparat som ett bokmärke</string>
+
+
+    <!-- ***************************
+             Strings for the \'Compressing\' and \'Extracting\' feature
+          *************************** -->
+    <string name="compressing_success">Komprimering sluförd</string>
+    <string name="compressing_error">Kunde ej komprimera</string>
+    <string name="compress_into_archive">Komprimera till filarkiv</string>
+    <string name="extracting_success">Extrahering slutförd</string>
+    <string name="extracting_error">Kunde ej extrahera</string>
+    <string name="extract_into_folder">Extrahera till mappen:</string>
+    <string name="extract_title">Välj mapp att extrahera till</string>
+    <string name="extract_button">Extrahera hit</string>
+    <string name="extracting">Extraherar...</string>
+    <string name="compressing">Komprimerar...</string>
+    <string name="warning_overwrite">Filen %s existerar redan. Vill du skriva över den?</string>
+
+    <string name="change_file_extension">Vill du ändra filtillägget?</string>
+</resources>
diff --git a/apps/oi-filemanager/FileManager/res/values-tl/strings.xml b/apps/oi-filemanager/FileManager/res/values-tl/strings.xml
index 8099564..03ad8aa 100644
--- a/apps/oi-filemanager/FileManager/res/values-tl/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-tl/strings.xml
@@ -81,7 +81,10 @@
     <string name="move_button_multiselect">Ilipat</string>
     <string name="copy_button_multiselect">Kopyahin</string>
     <string name="delete_button_multiselect">Alisin</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">Pumili ng mga file</string>
     <string name="error_selection">Paki-pili ng isa o madaming mga file.</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-tr/strings.xml b/apps/oi-filemanager/FileManager/res/values-tr/strings.xml
index 383d5e5..349a4df 100644
--- a/apps/oi-filemanager/FileManager/res/values-tr/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-tr/strings.xml
@@ -86,7 +86,10 @@ Launchpad Contributions:
     <string name="move_button_multiselect">Taşı</string>
     <string name="copy_button_multiselect">Kopyala</string>
     <string name="delete_button_multiselect">Sil</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">Dosyaları çoklu seçin</string>
     <string name="error_selection">Lütfen bir veya daha çok dosya seçin.</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-ug/strings.xml b/apps/oi-filemanager/FileManager/res/values-ug/strings.xml
index 641f250..0254490 100644
--- a/apps/oi-filemanager/FileManager/res/values-ug/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-ug/strings.xml
@@ -81,7 +81,10 @@
     <string name="move_button_multiselect">يۆتكە</string>
     <string name="copy_button_multiselect">كۆچۈر</string>
     <string name="delete_button_multiselect">ئۆچۈر</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">كۆپ ھۆججەت تاللاڭ</string>
     <string name="error_selection">بىر ياكى بىر قانچە ھۆججەت تاللاڭ.</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-zh-rCN/strings.xml b/apps/oi-filemanager/FileManager/res/values-zh-rCN/strings.xml
index bff0666..2752e31 100644
--- a/apps/oi-filemanager/FileManager/res/values-zh-rCN/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-zh-rCN/strings.xml
@@ -83,7 +83,10 @@
     <string name="move_button_multiselect">移动</string>
     <string name="copy_button_multiselect">复制</string>
     <string name="delete_button_multiselect">删除</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">选择多个文件</string>
     <string name="error_selection">请选择一个或多个文件。</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values-zh-rTW/strings.xml b/apps/oi-filemanager/FileManager/res/values-zh-rTW/strings.xml
index ce6a454..81ae519 100644
--- a/apps/oi-filemanager/FileManager/res/values-zh-rTW/strings.xml
+++ b/apps/oi-filemanager/FileManager/res/values-zh-rTW/strings.xml
@@ -80,7 +80,10 @@
     <string name="move_button_multiselect">移動</string>
     <string name="copy_button_multiselect">複製</string>
     <string name="delete_button_multiselect">刪除</string>
+
+    <!-- ZIP is the ZIP compression (NOT the ZIP code!) -->
     <string name="compress_zip_button_multiselect">ZIP</string>
+
     <string name="multiselect_title">Select multiple files</string>
     <string name="error_selection">Please select one or more file(s).</string>
     
diff --git a/apps/oi-filemanager/FileManager/res/values/string_not_for_translation2.xml b/apps/oi-filemanager/FileManager/res/values/string_not_for_translation2.xml
new file mode 100644
index 0000000..1c24fe4
--- /dev/null
+++ b/apps/oi-filemanager/FileManager/res/values/string_not_for_translation2.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+ * Copyright (C) 2007-2008 OpenIntents.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ -->
+<resources>
+	<!-- ***************************
+	     About information
+	     *************************** -->
+<!-- dupes
+	<string name="about_copyright">Copyright © 2008-2011 OpenIntents</string> 
+	<string name="about_website_url">http://www.openintents.org</string>
+	<string name="about_email">support@openintents.org</string>
+	
+    <string-array name="about_authors">
+        <item>Peli</item>
+    </string-array>
+    
+    <string-array name="about_documenters">
+    </string-array>
+    
+    <string-array name="about_translators">
+    </string-array>
+    
+    <string-array name="about_artists">
+        <item>Peli</item>
+    </string-array>
+--> 
+	
+	<!-- ***************************
+	     Distribution
+	     *************************** -->
+	<!-- Update -->
+	<string name="oi_distribution_update_checker_package">org.openintents.updatechecker</string>
+    <string name="oi_distribution_update_checker_website">http://www.openintents.org/en/node/203</string><!-- 203 = OI Update -->
+	
+	<!-- About -->
+    <string name="oi_distribution_aboutapp_package">org.openintents.about</string>
+    <string name="oi_distribution_aboutapp_website">http://www.openintents.org/en/node/202</string><!-- 202 = OI About -->
+	
+    <!-- Barcode plugin -->
+    <string name="oi_distribution_barcodescanner_package">org.openintents.barcodescanner</string>
+    <string name="oi_distribution_barcodescanner_website">http://www.openintents.org/en/node/679</string>
+	
+    <!-- File Manager -->
+    <string name="oi_distribution_filemanager_package">org.openintents.filemanager</string>
+    <string name="oi_distribution_filemanager_website">http://www.openintents.org/en/filemanager</string>
+	
+	<!-- Safe -->
+    <string name="oi_distribution_safe_package">org.openintents.safe</string>
+    <string name="oi_distribution_safe_website">http://www.openintents.org/en/safe</string>
+	
+</resources>
diff --git a/apps/oi-filemanager/FileManager/res/values/strings2.xml b/apps/oi-filemanager/FileManager/res/values/strings2.xml
new file mode 100644
index 0000000..8a3ba14
--- /dev/null
+++ b/apps/oi-filemanager/FileManager/res/values/strings2.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="oi_distribution_app_name">OI Distribution Library</string>
+    
+	<!-- ***************************
+	     About information
+	     *************************** -->
+	
+	<!-- Automatically filled in by Launchpad: -->
+	<!-- <string name="about_translators">translator-credits</string> -->
+	
+	<!-- ***************************
+	     Distribution
+	     *************************** -->
+	
+	<!-- EULA -->	
+	<!-- EULA (End user license agreement). %s is an application name, e.g. "OI Notepad EULA". 
+		Translation should be short, since this is a title. -->
+	<string name="oi_distribution_eula_title">%s EULA</string>
+	
+	<!-- EULA welcome message. %s is an application name, e.g. "... (EULA) for OI Notepad".
+		Translation can be as long as required. -->
+	<string name="oi_distribution_eula_message">Please read and accept the following End User License Agreement (EULA) for %s.</string>
+	
+	<!-- Button: Accept terms of EULA. -->
+	<string name="oi_distribution_eula_accept">Accept</string>
+	
+	<!-- Button: Refuse terms of EULA. -->
+	<string name="oi_distribution_eula_refuse">Cancel</string>
+	
+	<!-- New version -->
+	<!-- Application name and version. %1$s is the application name (e.g. "OI Notepad") and %2$s is the version number (e.g. "1.2.0").
+	Keep unmodified, unless your language requires that the version number is displayed first. -->
+	<string name="oi_distribution_name_and_version">%1$s %2$s</string>
+	
+	<!-- Welcome message. %s is an application name. -->
+	<string name="oi_distribution_newversion_message">Welcome to this new version of %s.</string>
+	
+	<string name="oi_distribution_newversion_recent_changes">Recent changes:</string>
+	
+	<!-- Button: Continue to main application. -->
+	<string name="oi_distribution_newversion_continue">Continue</string>
+	
+	<!-- Update -->
+	<!-- Menu command to look for updates. -->
+    <string name="oi_distribution_menu_update">Check updates</string>
+	<string name="oi_distribution_update_box_text">Check manually for updates or install OI Update for automatic notifications.</string>
+	<string name="oi_distribution_update_check_now">Check now</string>
+	<string name="oi_distribution_update_get_updater">Get OI Updater</string>
+	<string name="oi_distribution_update_error">Download application not available.</string>
+	
+    <!-- Name of the application "OI Update". Translations of the application name should be consistent. -->
+    <string name="oi_distribution_update_app">OI Update</string>
+    
+    <!-- About -->
+    <!-- Menu command to open the "about" or "info" dialog. -->
+    <string name="oi_distribution_about">About</string>
+    <!-- %s is the version number (e.g. "1.2.1") -->
+	<string name="oi_distribution_aboutapp_not_available">No compatible extension available to display full info (contact, credits, license).</string>
+    
+    
+    <!-- Button text: Get the application "OI About". Translations of the application name should be consistent. -->
+    <string name="oi_distribution_aboutapp_get">Get OI About</string>
+    
+    <!-- Name of the application "OI About". Translations of the application name should be consistent. -->
+    <string name="oi_distribution_aboutapp">OI About</string>
+    
+    <!-- Name of the application "Barcode OI Plugin". Translations of the application name should be consistent.  -->
+    <string name="oi_distribution_barcodescanner">Barcode OI Plugin</string>
+    <!-- Dialog message. -->
+    <string name="oi_distribution_barcodescanner_not_available">No compatible barcode scanner is available.</string>
+    
+    <!-- Name of the application "OI File Manager". Translations of the application name should be consistent.  -->
+    <string name="oi_distribution_filemanager">OI File Manager</string>
+    <!-- Dialog message. -->
+    <string name="oi_distribution_filemanager_not_available">No compatible file manager is available.</string>
+    
+    <!-- Safe -->
+    <!-- Name of the application "OI Safe". Translations of the application name should be consistent.  -->
+    <string name="oi_distribution_safe">OI Safe</string>
+    <!-- Dialog message. -->
+    <string name="oi_distribution_safe_not_available">No compatible application for encryption is available.</string>
+    <string name="oi_distribution_safe_not_available_decrypt">No compatible application for decryption is available.\n\nNote: You have to restore the master key from a backup file in order to access previously encrypted data.</string>
+    
+    <!-- Dialog message: %s is the name of an application (e.g. "OI Notepad"). -->
+    <string name="oi_distribution_download_market_message">Please download %s from the Market or the OpenIntents website.</string>
+    <!-- Dialog message: %s is the name of an application (e.g. "OI Notepad"). -->
+    <string name="oi_distribution_download_message">Please download %s from the OpenIntents website.</string>
+    <!-- Dialog button: download the suggested application from Android Market. -->
+    <string name="oi_distribution_download_market">Market download</string>
+    <!-- Dialog button: download the suggested application from the developer web site. -->
+    <string name="oi_distribution_download_web">Web download</string>
+	<!-- Dialog title: %s is the name of an application (e.g. "OI Notepad"). -->
+    <string name="oi_distribution_download_title">Download %s</string>
+	
+	<!-- %s is an application name (e.g. "OI About can be used with the following applications:") -->
+	<string name="oi_distribution_info_activity_text">%s can be used with the following applications:</string>
+	<!-- %s is an application name (e.g. "Launch OI Notepad") -->
+    <string name="oi_distribution_info_launch">Launch %s</string>
+    <!-- %1$s is the current application name. %2$s is another application name, and %3$s is the other application's version name
+    (e.g. "OI About requires OI Notepad 1.2.0 or higher.") -->
+	<string name="oi_distribution_info_not_available">%1$s requires %2$s %3$s or higher.</string>
+	<!-- Title of a dialog. -->
+	<string name="oi_distribution_info_instructions">Instructions</string>
+	<!-- Error message -->
+	<string name="oi_distribution_launch_error">Application could not be launched</string>
+	
+</resources>
diff --git a/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/AboutDialog.java b/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/AboutDialog.java
new file mode 100644
index 0000000..7b8a12f
--- /dev/null
+++ b/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/AboutDialog.java
@@ -0,0 +1,67 @@
+/* 
+ * Copyright (C) 2007-2011 OpenIntents.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openintents.filemanager;
+
+import org.openintents.intents.AboutMiniIntents;
+import org.openintents.util.IntentUtils;
+import org.openintents.util.VersionUtils;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+
+/**
+ * About dialog
+ *
+ * @version 2009-02-04
+ * @author Peli
+ *
+ */
+public class AboutDialog extends DownloadAppDialog {
+	private static final String TAG = "About";
+	private static final boolean DEBUG_NO_OI_ABOUT = false;
+	
+	public AboutDialog(Context context) {
+		super(context,
+				R.string.oi_distribution_aboutapp_not_available,
+				R.string.oi_distribution_aboutapp,
+				R.string.oi_distribution_aboutapp_package,
+				R.string.oi_distribution_aboutapp_website);
+
+		String version = VersionUtils.getVersionNumber(mContext);
+        String appname = VersionUtils.getApplicationName(mContext);
+        String appnameversion = mContext.getString(R.string.oi_distribution_name_and_version, appname, version);
+        
+        StringBuilder sb = new StringBuilder();
+        sb.append(appnameversion);
+        sb.append("\n\n");
+        sb.append(mMessageText);
+        setMessage(sb.toString());
+	}
+	
+	public static void showDialogOrStartActivity(Activity activity, int dialogId) {
+		Intent intent = new Intent(AboutMiniIntents.ACTION_SHOW_ABOUT_DIALOG);
+		intent.putExtra(AboutMiniIntents.EXTRA_PACKAGE_NAME, activity.getPackageName());
+		
+		if (IntentUtils.isIntentAvailable(activity, intent)) {
+			activity.startActivity(intent);
+		} else {
+			activity.showDialog(dialogId);
+		}
+	}
+
+}
diff --git a/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/DistributionLibrary.java b/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/DistributionLibrary.java
new file mode 100644
index 0000000..fda8748
--- /dev/null
+++ b/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/DistributionLibrary.java
@@ -0,0 +1,101 @@
+package org.openintents.filemanager;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.view.Menu;
+import android.view.MenuItem;
+
+public class DistributionLibrary {
+
+	public static final int OFFSET_ABOUT = 0;
+	public static final int OFFSET_UPDATE = 1;
+	
+	/** Number of menu IDs that should be reserved
+	 * for DistributionLibrary.
+	 */
+	public static final int MENU_COUNT = 2;
+	public static final int DIALOG_COUNT = MENU_COUNT;
+	
+	
+	Activity mActivity;
+	int mFirstMenuId = 0;
+	int mFirstDialogId = 0;
+	
+	public DistributionLibrary(Activity activity, int firstMenuId, int firstDialogId) {
+		mActivity = activity;
+		mFirstMenuId = firstMenuId;
+		mFirstDialogId = firstDialogId;
+	}
+	
+	public void setFirst(int firstMenuId, int firstDialogId) {
+		mFirstMenuId = firstMenuId;
+		mFirstDialogId = firstDialogId;
+	}
+	
+	/**
+	 * Typical usage:
+	 * Put this code in the beginning of onCreate().
+	 * <pre>
+	 * if (DistributionLibrary.showEulaOrNewVersion(this)) {
+            return;
+       }
+	 * </pre>
+	 * 
+	 * If one of the two activities is shown, they make
+	 * sure that the calling intent is called again afterwards.
+	 * 
+	 * @param activity
+	 * @return true if one of the dialogs is being shown.
+	 *         In this case, onCreate() should be aborted by
+	 *         returning.
+	 */
+	public boolean showEulaOrNewVersion() {
+		return EulaOrNewVersion.showEula(mActivity) 
+			|| EulaOrNewVersion.showNewVersion(mActivity);
+	}
+	
+	public void onCreateOptionsMenu(Menu menu) {
+		// Remove items first so that they don't appear twice:
+		menu.removeItem(mFirstMenuId + OFFSET_UPDATE);
+		menu.removeItem(mFirstMenuId + OFFSET_ABOUT);
+		
+		if (UpdateDialog.isUpdateMenuNecessary(mActivity)) {
+			menu.add(0, mFirstMenuId + OFFSET_UPDATE, 0, R.string.oi_distribution_menu_update).setIcon(
+					android.R.drawable.ic_menu_info_details).setShortcut('9', 'u');
+		}
+		menu.add(0, mFirstMenuId + OFFSET_ABOUT, 0, R.string.oi_distribution_about).setIcon(
+ 				android.R.drawable.ic_menu_info_details).setShortcut('0', 'a');
+	}
+	
+	public boolean onOptionsItemSelected(MenuItem item) {
+		int id = item.getItemId();
+		switch (id - mFirstMenuId) {
+		case OFFSET_UPDATE:
+			mActivity.showDialog(mFirstDialogId + OFFSET_UPDATE);
+			return true;
+		case OFFSET_ABOUT:
+			AboutDialog.showDialogOrStartActivity(mActivity, 
+					mFirstDialogId + OFFSET_ABOUT);
+			return true;
+		}
+		return false;
+	}
+
+	public Dialog onCreateDialog(int id) {
+		switch (id - mFirstDialogId) {
+		case OFFSET_ABOUT:
+			return new AboutDialog(mActivity);
+		case OFFSET_UPDATE:
+			return new UpdateDialog(mActivity);
+		}
+		return null;
+	}
+	
+	public void onPrepareDialog(int id, Dialog dialog) {
+		switch (id - mFirstDialogId) {
+		case OFFSET_ABOUT:
+			AboutDialog.onPrepareDialog(mActivity, dialog);
+			break;
+		}
+	}
+}
diff --git a/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/DistributionLibraryActivity.java b/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/DistributionLibraryActivity.java
new file mode 100644
index 0000000..58b6dcc
--- /dev/null
+++ b/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/DistributionLibraryActivity.java
@@ -0,0 +1,50 @@
+package org.openintents.filemanager;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
+public class DistributionLibraryActivity extends Activity {
+
+	static final int MENU_DISTRIBUTION_START = Menu.FIRST;
+	
+	static final int DIALOG_DISTRIBUTION_START = 1;
+
+	protected DistributionLibrary mDistribution;
+	
+    /** Called when the activity is first created. */
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        
+        mDistribution = new DistributionLibrary(this, MENU_DISTRIBUTION_START, DIALOG_DISTRIBUTION_START);
+    }
+
+ 	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+ 		super.onCreateOptionsMenu(menu);
+ 		mDistribution.onCreateOptionsMenu(menu);
+ 		return true;
+ 	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		if (mDistribution.onOptionsItemSelected(item)) {
+			return true;
+		}
+		return super.onOptionsItemSelected(item);
+	}
+
+	@Override
+	protected Dialog onCreateDialog(int id) {
+		return mDistribution.onCreateDialog(id);
+	}
+
+	@Override
+	protected void onPrepareDialog(int id, Dialog dialog) {
+		super.onPrepareDialog(id, dialog);
+		mDistribution.onPrepareDialog(id, dialog);
+	}
+}
diff --git a/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/DistributionLibraryListActivity.java b/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/DistributionLibraryListActivity.java
new file mode 100644
index 0000000..736a907
--- /dev/null
+++ b/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/DistributionLibraryListActivity.java
@@ -0,0 +1,50 @@
+package org.openintents.filemanager;
+
+import android.app.Dialog;
+import android.app.ListActivity;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
+public class DistributionLibraryListActivity extends ListActivity {
+
+	protected static final int MENU_DISTRIBUTION_START = Menu.FIRST;
+	
+	protected static final int DIALOG_DISTRIBUTION_START = 1;
+
+	protected DistributionLibrary mDistribution;
+
+    /** Called when the activity is first created. */
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        
+        mDistribution = new DistributionLibrary(this, MENU_DISTRIBUTION_START, DIALOG_DISTRIBUTION_START);
+    }
+
+ 	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+ 		super.onCreateOptionsMenu(menu);
+ 		mDistribution.onCreateOptionsMenu(menu);
+ 		return true;
+ 	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		if (mDistribution.onOptionsItemSelected(item)) {
+			return true;
+		}
+		return super.onOptionsItemSelected(item);
+	}
+
+	@Override
+	protected Dialog onCreateDialog(int id) {
+		return mDistribution.onCreateDialog(id);
+	}
+
+	@Override
+	protected void onPrepareDialog(int id, Dialog dialog) {
+		super.onPrepareDialog(id, dialog);
+		mDistribution.onPrepareDialog(id, dialog);
+	}
+}
diff --git a/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/DownloadAppDialog.java b/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/DownloadAppDialog.java
new file mode 100644
index 0000000..42e232b
--- /dev/null
+++ b/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/DownloadAppDialog.java
@@ -0,0 +1,142 @@
+/* 
+ * Copyright (C) 2007-2011 OpenIntents.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openintents.filemanager;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
+import android.content.Intent;
+import android.net.Uri;
+import android.util.Log;
+import android.view.View;
+import android.widget.Toast;
+
+/**
+ * @version 2009-02-04
+ * @version 2011-02-07: Allow for string arguments.
+ * @author Peli
+ */
+public class DownloadAppDialog extends AlertDialog implements OnClickListener {
+	private static final String TAG = "StartSaveActivity";
+
+    Context mContext;
+    String mDownloadAppName;
+    String mDownloadPackageName;
+    String mDownloadWebsite;
+    String mMessageText;
+    
+    boolean mMarketAvailable;
+    
+    public DownloadAppDialog(Context context) {
+        super(context);
+        mContext = context;
+    }
+    
+    public DownloadAppDialog(Context context, int message_id, int download_name_id, int download_package_id, int download_website_id) {
+        super(context);
+        mContext = context;
+        set(message_id, download_name_id, download_package_id, download_website_id);
+    }
+    
+    public DownloadAppDialog(Context context, String message, String download_name, String download_package, String download_website) {
+        super(context);
+        mContext = context;
+        set(message, download_name, download_package, download_website);
+    }
+
+	protected void set(int message_id, int download_name_id,
+			int download_package_id, int download_website_id) {
+		String message = mContext.getString(message_id);
+		String download_name = mContext.getString(download_name_id);
+		String download_package = mContext.getString(download_package_id);
+		String download_website = mContext.getString(download_website_id);
+		set(message, download_name, download_package, download_website);
+	}
+	
+	protected void set(String message, String download_name,
+			String download_package, String download_website) {
+        mDownloadAppName = download_name;
+        mDownloadPackageName = download_package;
+        mDownloadWebsite = download_website;
+        
+        mMarketAvailable = MarketUtils.isMarketAvailable(mContext, mDownloadPackageName);
+        
+        StringBuilder sb = new StringBuilder();
+        sb.append(message);
+        sb.append(" ");
+        if (mMarketAvailable) {
+        	sb.append(mContext.getString(R.string.oi_distribution_download_market_message, 
+        			mDownloadAppName));
+        } else {
+        	sb.append(mContext.getString(R.string.oi_distribution_download_message, 
+        			mDownloadAppName));
+        }
+        mMessageText = sb.toString();
+        setMessage(mMessageText);
+
+        setTitle(mContext.getString(R.string.oi_distribution_download_title,
+        		mDownloadAppName));
+        
+        setButton(mContext.getText(R.string.oi_distribution_download_market), this);
+    	setButton2(mContext.getText(R.string.oi_distribution_download_web), this);
+    	setButton3(mContext.getText(android.R.string.cancel), this);
+	}
+    
+	public void onClick(DialogInterface dialog, int which) {
+		Intent intent;
+		
+		if (which == BUTTON1) {
+			intent = MarketUtils.getMarketDownloadIntent(mDownloadPackageName);
+			startSaveActivity(intent);
+    	} else if (which == BUTTON2) {
+    		intent  = new Intent(Intent.ACTION_VIEW);
+    		Uri uri= Uri.parse(mDownloadWebsite);
+			intent.setData(uri);
+			startSaveActivity(intent);
+    	}
+	}
+
+	public static void onPrepareDialog(Context context, Dialog dialog) {
+		DownloadAppDialog d = (DownloadAppDialog) dialog;
+		
+		boolean has_android_market = MarketUtils.isMarketAvailable(context, d.mDownloadPackageName);
+
+		dialog.findViewById(android.R.id.button1).setVisibility(
+				has_android_market ? View.VISIBLE : View.GONE);
+	}
+	
+	/**
+	 * Start an activity but prompt a toast if activity is not found
+	 * (instead of crashing).
+	 * 
+	 * @param context
+	 * @param intent
+	 */
+	public void startSaveActivity(Intent intent) {
+		try {
+			mContext.startActivity(intent);
+		} catch (ActivityNotFoundException e) {
+			Toast.makeText(mContext,
+					R.string.oi_distribution_update_error,
+					Toast.LENGTH_SHORT).show();
+			Log.e(TAG, "Error starting second activity.", e);
+		}
+	}
+}
diff --git a/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/DownloadOIAppDialog.java b/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/DownloadOIAppDialog.java
new file mode 100644
index 0000000..7e4ad01
--- /dev/null
+++ b/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/DownloadOIAppDialog.java
@@ -0,0 +1,35 @@
+package org.openintents.filemanager;
+
+import android.content.Context;
+
+public class DownloadOIAppDialog extends DownloadAppDialog {
+
+	public static final int OI_FILEMANAGER = 1;
+	public static final int OI_SAFE = 2;
+	public static final int OI_BARCODESCANNER = 3;
+	
+	public DownloadOIAppDialog(Context context, int appId) {
+		super(context);
+		
+		switch(appId) {
+		case OI_BARCODESCANNER:
+			set(R.string.oi_distribution_barcodescanner_not_available,
+			R.string.oi_distribution_barcodescanner,
+			R.string.oi_distribution_barcodescanner_package,
+			R.string.oi_distribution_barcodescanner_website);
+			break;
+		case OI_FILEMANAGER:
+			set(R.string.oi_distribution_filemanager_not_available,
+			R.string.oi_distribution_filemanager,
+			R.string.oi_distribution_filemanager_package,
+			R.string.oi_distribution_filemanager_website);
+			break;
+		case OI_SAFE:
+			set(R.string.oi_distribution_safe_not_available,
+			R.string.oi_distribution_safe,
+			R.string.oi_distribution_safe_package,
+			R.string.oi_distribution_safe_website);
+			break;
+		}
+	}
+}
diff --git a/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/EulaActivity.java b/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/EulaActivity.java
new file mode 100644
index 0000000..f01e3d9
--- /dev/null
+++ b/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/EulaActivity.java
@@ -0,0 +1,191 @@
+/* 
+ * Copyright (C) 2007-2011 OpenIntents.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openintents.filemanager;
+
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+import org.openintents.util.VersionUtils;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+/**
+ * Displays the Eula for the first time, reading it from a raw resource.
+ * 
+ * @author Peli
+ *
+ */
+public class EulaActivity extends Activity {
+	
+	Button mAgree;
+	Button mDisagree;
+	
+	String mLaunchPackage;
+	String mLaunchClass;
+	Intent mLaunchIntent;
+	
+	String mAppName;
+
+	TextView mText1;
+	TextView mText2;
+	TextView mText;
+	ImageView mImage;
+	
+	/** Called when the activity is first created. */
+	@Override
+	public void onCreate(Bundle icicle) {
+		super.onCreate(icicle);
+		
+		setContentView(R.layout.oi_distribution_eula);
+		
+		// Extras are provided by checkEula() below.
+		Intent i = getIntent();
+		Bundle b = i.getExtras();
+		mLaunchPackage = b.getString(EulaOrNewVersion.EXTRA_LAUNCH_ACTIVITY_PACKAGE);
+		mLaunchClass = b.getString(EulaOrNewVersion.EXTRA_LAUNCH_ACTIVITY_CLASS);
+		//mLaunchIntent 
+		mLaunchIntent = b.getParcelable(EulaOrNewVersion.EXTRA_LAUNCH_ACTIVITY_INTENT);
+		
+		//mIntroContinue = (Button) findViewById(R.id.intro_continue);
+		mAgree = (Button) findViewById(R.id.button1);
+		mAgree.setOnClickListener(new View.OnClickListener() {
+			public void onClick(View view) {
+				accept();
+			}
+		});
+		
+		mDisagree = (Button) findViewById(R.id.button2);
+		mDisagree.setOnClickListener(new View.OnClickListener() {
+			public void onClick(View view) {
+				refuse();
+			}
+		});
+
+		mText1 = (TextView) findViewById(R.id.text1);
+		mText2 = (TextView) findViewById(R.id.text2);
+		mText = (TextView) findViewById(R.id.text);
+		mImage = (ImageView) findViewById(R.id.imageview);
+		
+		mAppName = VersionUtils.getApplicationName(this);
+		int iconRes = VersionUtils.getApplicationIcon(this);
+		
+		setTitle(mAppName);
+		mImage.setImageResource(iconRes);
+
+		String title = getString(R.string.oi_distribution_eula_title, 
+				mAppName);
+		String message = getString(R.string.oi_distribution_eula_message, 
+				mAppName);
+		
+		mText1.setText(title);
+		mText2.setText(message);
+		mText.setText(readTextFromRawResource(R.raw.license_short, false));
+	}
+	
+	
+	/**
+	 * Accept EULA and proceed with main application.
+	 */
+	void accept() {
+		EulaOrNewVersion.storeEulaAccepted(this);
+		
+		startOriginalActivity();
+	}
+
+
+
+
+	void startOriginalActivity() {
+		// Call the activity that originally called checkEula()
+		// or checkNewVersion()
+		Intent i;
+		if (mLaunchIntent != null) {
+			i = mLaunchIntent;
+			
+			// Android 2.3: category LAUNCHER needs to be removed,
+			// otherwise main activity is not called.
+			i.removeCategory(Intent.CATEGORY_LAUNCHER);
+		} else {
+			i = new Intent();
+			i.setClassName(mLaunchPackage, mLaunchClass);
+		}
+		i.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
+		startActivity(i);
+		finish();
+	}
+	
+	/**
+	 * Refuse EULA.
+	 */
+	void refuse() {
+		finish();
+	}
+
+	
+	/**
+	 * Read license from raw resource.
+	 * @param resourceid ID of the raw resource.
+	 * @return
+	 */
+	String readTextFromRawResource(int resourceid, boolean preserveLineBreaks) {
+
+		// Retrieve license from resource:
+		String license = "";
+		Resources resources = getResources();
+    		
+		//Read in the license file as a big String
+		BufferedReader in
+		   = new BufferedReader(new InputStreamReader(
+				resources.openRawResource(resourceid)));
+		String line;
+		StringBuilder sb = new StringBuilder();
+		try {
+			while ((line = in.readLine()) != null) { // Read line per line.
+				if (TextUtils.isEmpty(line)) {
+					// Empty line: Leave line break
+					sb.append("\n\n");
+				} else {
+					sb.append(line);
+					if (preserveLineBreaks) {
+						sb.append("\n");
+					} else {
+						sb.append(" ");
+					}
+				}
+			}
+			license = sb.toString();
+		} catch (IOException e) {
+			//Should not happen.
+			e.printStackTrace();
+		}
+		
+    	
+    	return license;
+	}
+}
diff --git a/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/EulaOrNewVersion.java b/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/EulaOrNewVersion.java
new file mode 100644
index 0000000..06cba6e
--- /dev/null
+++ b/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/EulaOrNewVersion.java
@@ -0,0 +1,131 @@
+/* 
+ * Copyright (C) 2007-2011 OpenIntents.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openintents.filemanager;
+
+import org.openintents.util.VersionUtils;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.util.Log;
+
+
+
+/**
+ * Displays the Eula for the first time, reading it from a raw resource.
+ * 
+ * @author Peli
+ *
+ */
+public class EulaOrNewVersion {
+	/** TAG for log messages. */
+	private static final String TAG = "EulaOrNewVersion";
+	private static final boolean debug = false;
+	
+	public static final String PREFERENCES_EULA_ACCEPTED = "eula_accepted";
+
+	public static final String PREFERENCES_VERSION_NUMBER = "org.openintents.distribution.version_number_check";
+	
+	/**
+	 * Extra for main intent.
+	 * Specifies activity that should be launched after Eula has been accepted.
+	 */
+	static final String EXTRA_LAUNCH_ACTIVITY_PACKAGE = "org.openintents.extra.launch_activity_package";
+	static final String EXTRA_LAUNCH_ACTIVITY_CLASS = "org.openintents.extra.launch_activity_class";
+	static final String EXTRA_LAUNCH_ACTIVITY_INTENT = "org.openintents.extra.launch_activity_intent";
+	
+	/**
+	 * Test whether EULA has been accepted. Otherwise display EULA.
+	 * 
+	 * @return True if Eula needs to be shown.
+	 */
+	static boolean showEula(Activity activity) {
+		SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(activity);
+		boolean accepted = sp.getBoolean(PREFERENCES_EULA_ACCEPTED, false);
+		
+		if (accepted) {
+			if (debug) Log.d(TAG, "Eula has been accepted.");
+			return false;
+		} else {
+			if (debug) Log.d(TAG, "Eula has not been accepted yet.");
+			
+			startForwardActivity(activity, EulaActivity.class);
+			return true;
+		}
+	}
+	
+	static void storeEulaAccepted(Context context) {
+		SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
+		SharedPreferences.Editor e = sp.edit();
+		e.putBoolean(PREFERENCES_EULA_ACCEPTED, true);
+		e.commit();
+	}
+	
+	/**
+	 * Test whether version code changed.
+	 * 
+	 * @return True if version code changed and recent changes are being shown.
+	 */
+	static boolean showNewVersion(Activity activity) {
+		SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(activity);
+		int lastVersion = sp.getInt(PREFERENCES_VERSION_NUMBER, 0);
+		int thisVersion = VersionUtils.getVersionCode(activity);
+		
+		if (lastVersion == thisVersion) {
+			if (debug) Log.i(TAG, "Same version " + lastVersion + " as last launch.");
+			return false;
+		} else {
+			if (debug) Log.i(TAG, "Newer version " + thisVersion + " since last launch " + lastVersion + ". Show recent changes.");
+			
+			startForwardActivity(activity, NewVersionActivity.class);
+			return true;
+		}
+	}
+	
+	static void storeCurrentVersionCode(Context context) {
+		SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
+		int thisVersion = VersionUtils.getVersionCode(context);
+		SharedPreferences.Editor e = sp.edit();
+		e.putInt(PREFERENCES_VERSION_NUMBER, thisVersion);
+		e.commit();
+	}
+
+	private static void startForwardActivity(Activity activity, Class launchClass) {
+		// Launch Eula activity
+		Intent forwardIntent = activity.getIntent();
+		
+		Intent i = new Intent(activity, launchClass);
+		ComponentName ci = activity.getComponentName();
+		
+		// Specify in intent extras which activity should be called
+		// after Eula has been accepted.
+		if (debug) Log.d(TAG, "Local package name: " + ci.getPackageName());
+		if (debug) Log.d(TAG, "Local class name: " + ci.getClassName());
+		i.putExtra(EXTRA_LAUNCH_ACTIVITY_PACKAGE, ci.getPackageName());
+		i.putExtra(EXTRA_LAUNCH_ACTIVITY_CLASS, ci.getClassName());
+		if (forwardIntent != null) {
+			i.putExtra(EXTRA_LAUNCH_ACTIVITY_INTENT, forwardIntent);
+		}
+		i.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
+		activity.startActivity(i);
+		activity.finish();
+	}
+	
+}
diff --git a/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/FileManagerActivity.java b/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/FileManagerActivity.java
index 348f2c3..1ba53de 100644
--- a/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/FileManagerActivity.java
+++ b/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/FileManagerActivity.java
@@ -28,7 +28,7 @@ import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.openintents.distribution.DistributionLibraryListActivity;
+import org.openintents.filemanager.DistributionLibraryListActivity;
 import org.openintents.filemanager.util.CompressManager;
 import org.openintents.filemanager.util.ExtractManager;
 import org.openintents.filemanager.util.FileUtils;
@@ -1167,7 +1167,7 @@ public class FileManagerActivity extends DistributionLibraryListActivity impleme
  		}
  		MenuItem item = menu.add(0, MENU_NEW_FOLDER, 0, R.string.menu_new_folder).setIcon(
  				icon).setShortcut('0', 'f');
- 		MenuCompat.setShowAsAction(item, MenuItem.SHOW_AS_ACTION_IF_ROOM);
+ 		MenuCompat.setShowAsAction(item, 0/*MenuItem.SHOW_AS_ACTION_IF_ROOM*/);
  
  		if (mState == STATE_BROWSE) {
  		// Multi select option menu.
diff --git a/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/InfoActivity.java b/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/InfoActivity.java
new file mode 100644
index 0000000..9709b27
--- /dev/null
+++ b/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/InfoActivity.java
@@ -0,0 +1,225 @@
+package org.openintents.filemanager;
+
+import org.openintents.util.VersionUtils;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+public class InfoActivity extends DistributionLibraryListActivity implements OnItemClickListener {
+
+	// Override the following variables in init()
+    protected int[] mApplications = {};
+    protected String[] mPackageNames = {};
+    protected int[] mMinVersionCodes = {};
+    protected String[] mMinVersionName = {};
+    protected int[] mInfoText = {};
+    protected String[] mDeveloperUris = {};
+    protected String[] mIntentAction = {};
+    protected String[] mIntentData = {};
+    
+    //
+	
+	private static final int MENU_DISTRIBUTION_START = Menu.FIRST + 100; // MUST BE LAST
+
+	public static final int DIALOG_INFO = 0;
+	public static final int DIALOG_GET_FROM_MARKET = 100;
+	private static final int DIALOG_DISTRIBUTION_START = 200; // MUST BE LAST
+
+	
+    private String[] mApplicationStrings;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mDistribution.setFirst(MENU_DISTRIBUTION_START, DIALOG_DISTRIBUTION_START);
+        
+        // Check whether EULA has been accepted
+        // or information about new version can be presented.
+        if (mDistribution.showEulaOrNewVersion()) {
+            return;
+        }
+        
+        setContentView(R.layout.oi_distribution_infoactivity);
+
+        init();
+        
+        mApplicationStrings = new String[mApplications.length];
+        for (int i = 0; i < mApplications.length; i++) {
+        	mApplicationStrings[i] = getString(mApplications[i]);
+        }
+        setListAdapter(new FontArrayAdapter<String>(this,
+                android.R.layout.simple_list_item_1, mApplicationStrings));
+        ListView listview = getListView();
+        
+        listview.setOnItemClickListener(this);
+        
+        // Set message of activity
+        String appname = VersionUtils.getApplicationName(this);
+		String message = getString(R.string.oi_distribution_info_activity_text, 
+				appname);
+        TextView tv = (TextView) findViewById(R.id.text);
+        tv.setText(message);
+        
+        /*
+        TypedArray a = obtainStyledAttributes(mTheme, R.styleable.ShoppingList);
+		String typefaceName = a.getString(R.styleable.ShoppingList_textTypeface);
+	    mTextSizeMedium = a.getDimensionPixelOffset(R.styleable.ShoppingList_textSizeMedium, 23);
+	    mTextSizeLarge = a.getDimensionPixelOffset(R.styleable.ShoppingList_textSizeLarge, 28);
+	    mTextColor = a.getColor(R.styleable.ShoppingList_textColor, Color.BLACK);
+	    Drawable background = a.getDrawable(R.styleable.ShoppingList_background);
+
+	    
+	    View v = findViewById(R.id.background);
+	    v.setBackgroundDrawable(background);
+	    
+		mTypeface = Typeface.createFromAsset(getResources().getAssets(), typefaceName);
+        
+        TextView tv = (TextView) findViewById(R.id.text);
+        tv.setTypeface(mTypeface);
+        tv.setTextSize(mTextSizeMedium);
+        tv.setTextColor(mTextColor);
+	    */
+    }
+
+    public void init() {
+    	
+    }
+
+	public void onItemClick(AdapterView<?> parent, View view, int pos, long id) {
+		if (VersionUtils.isPackageAvailable(this, mPackageNames[pos], mMinVersionCodes[pos])) {
+			showDialog(DIALOG_INFO + pos);
+		} else {
+			showDialog(DIALOG_GET_FROM_MARKET + pos);
+		}
+	}
+	
+	private class FontArrayAdapter<T> extends ArrayAdapter<T> {
+
+		public FontArrayAdapter(Context context, int textViewResourceId,
+				T[] objects) {
+			super(context, textViewResourceId, objects);
+		}
+
+		@Override
+		public View getView(int position, View convertView, ViewGroup parent) {
+			// TODO Auto-generated method stub
+			TextView tv = (TextView) super.getView(position, convertView, parent);
+			/*
+			tv.setTypeface(mTypeface);
+			tv.setTextSize(mTextSizeLarge);
+	        tv.setTextColor(mTextColor);
+			*/
+			return tv;
+		}
+	}
+
+
+	@Override
+	protected Dialog onCreateDialog(int id) {
+		Dialog dialog = super.onCreateDialog(id);
+		
+		if (dialog != null) {
+			return dialog;
+		}
+		
+		if (id >= DIALOG_INFO && id < DIALOG_GET_FROM_MARKET) {
+			dialog = buildInfoDialog(id - DIALOG_INFO);
+		} else if (id >= DIALOG_GET_FROM_MARKET && id < DIALOG_DISTRIBUTION_START){
+			dialog = buildGetFromMarketDialog(id - DIALOG_GET_FROM_MARKET);
+		}
+		/*if (dialog == null) {
+			dialog = super.onCreateDialog(id);
+		}*/
+		return dialog;
+	}
+
+	@Override
+	protected void onPrepareDialog(int id, Dialog dialog) {
+		super.onPrepareDialog(id, dialog);
+		if (id >= DIALOG_INFO && id < DIALOG_GET_FROM_MARKET) {
+			dialog.findViewById(android.R.id.button1).setVisibility(View.GONE);
+		} else if (id >= DIALOG_GET_FROM_MARKET && id < DIALOG_DISTRIBUTION_START){
+			DownloadAppDialog.onPrepareDialog(this, dialog);
+		}
+		
+	}
+
+	private AlertDialog buildInfoDialog(final int pos) {
+		String infotext = getString(mInfoText[pos], mApplicationStrings[pos]);
+		String infolaunch = getString(R.string.oi_distribution_info_launch, mApplicationStrings[pos]);
+		
+		// Trick for Android 2.3:
+		// To achieve the visual trick of extending the button over the whole width,
+		// we first set a positive button, and then set its visibility to GONE in 
+		// onPrepareDialog().
+		
+		return new AlertDialog.Builder(this)
+			.setIcon(android.R.drawable.ic_dialog_info)
+			.setTitle(R.string.oi_distribution_info_instructions)
+			.setMessage(infotext)
+			.setPositiveButton("", null)
+			.setNegativeButton(infolaunch,
+					new DialogInterface.OnClickListener() {
+						public void onClick(DialogInterface dialog,
+								int whichButton) {
+							// click Ok
+							launchApplication(pos);
+						}
+					})
+			.create();
+	}
+
+	void launchApplication(int pos) {
+		Intent intent = new Intent();
+		intent.setAction(mIntentAction[pos]);
+		if (mIntentAction[pos].equals(Intent.ACTION_MAIN)) {
+			// Exception for ACTION_MAIN:
+			// Use data as class name.
+			if (mPackageNames[pos] != null && mIntentData[pos] != null) {
+				intent.setClassName(mPackageNames[pos], mIntentData[pos]);
+			}
+		} else {
+			if (mIntentData[pos] != null) {
+				intent.setData(Uri.parse(mIntentData[pos]));
+			}
+		}
+		
+		try {
+			startActivity(intent);
+		} catch (ActivityNotFoundException e) {
+
+			Toast.makeText(this,
+					R.string.oi_distribution_launch_error,
+					Toast.LENGTH_SHORT).show();
+		}
+	}
+
+	private AlertDialog buildGetFromMarketDialog(int pos) {
+		String this_appname = VersionUtils.getApplicationName(this);
+		String info_not_available = getString(R.string.oi_distribution_info_not_available, 
+				this_appname, mApplicationStrings[pos], mMinVersionName[pos]);
+		String download_appname = getString(mApplications[pos]);
+		
+		return new DownloadAppDialog(this, 
+				info_not_available, 
+				download_appname, 
+				mPackageNames[pos], 
+				mDeveloperUris[pos]);
+	}
+}
diff --git a/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/MarketUtils.java b/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/MarketUtils.java
new file mode 100644
index 0000000..224496c
--- /dev/null
+++ b/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/MarketUtils.java
@@ -0,0 +1,30 @@
+package org.openintents.filemanager;
+
+import org.openintents.util.IntentUtils;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+
+/**
+ * @author Peli
+ * @author Karl Ostmo
+ */
+public class MarketUtils {
+    
+	/**
+	 * URI prefix to a package name to bring up the download page on the Android Market
+	 */
+    public static final String MARKET_PACKAGE_DETAILS_PREFIX = "market://details?id=";
+    
+
+	public static boolean isMarketAvailable(Context context, String packageName) {
+		return IntentUtils.isIntentAvailable(context, getMarketDownloadIntent(packageName));
+	}
+	
+
+    public static Intent getMarketDownloadIntent(String packageName) {
+        Uri marketUri = Uri.parse(MARKET_PACKAGE_DETAILS_PREFIX + packageName);
+        return new Intent(Intent.ACTION_VIEW, marketUri);
+    }
+}
diff --git a/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/NewVersionActivity.java b/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/NewVersionActivity.java
new file mode 100644
index 0000000..0c3f56e
--- /dev/null
+++ b/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/NewVersionActivity.java
@@ -0,0 +1,66 @@
+/* 
+ * Copyright (C) 2007-2011 OpenIntents.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openintents.filemanager;
+
+
+import org.openintents.util.VersionUtils;
+
+import android.os.Bundle;
+import android.view.View;
+
+/**
+ * Displays the recent changes, reading them from a raw resource.
+ * 
+ * @author Peli
+ *
+ */
+public class NewVersionActivity extends EulaActivity {
+	
+	/** Called when the activity is first created. */
+	@Override
+	public void onCreate(Bundle icicle) {
+		super.onCreate(icicle);
+
+		// Modifications to convert EulaActivity into
+		// NewVersionActivity:
+		String version = VersionUtils.getVersionNumber(this);
+		String title = getString(R.string.oi_distribution_name_and_version, 
+				mAppName, version);
+		String message = getString(R.string.oi_distribution_newversion_message, 
+				mAppName);
+		message += "\n\n" + getString(R.string.oi_distribution_newversion_recent_changes);
+		
+		mText1.setText(title);
+		mText2.setText(message);
+		mText.setText(readTextFromRawResource(R.raw.recent_changes, true));
+		
+		mAgree.setText(R.string.oi_distribution_newversion_continue);
+		mDisagree.setVisibility(View.GONE);
+		View v = findViewById(R.id.space);
+		v.setVisibility(View.GONE);
+	}
+	
+
+	/**
+	 * Accept EULA and proceed with main application.
+	 */
+	void accept() {
+		EulaOrNewVersion.storeCurrentVersionCode(this);
+		
+		startOriginalActivity();
+	}
+}
diff --git a/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/UpdateDialog.java b/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/UpdateDialog.java
new file mode 100644
index 0000000..fb97ba0
--- /dev/null
+++ b/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/UpdateDialog.java
@@ -0,0 +1,117 @@
+/* 
+ * Copyright (C) 2008-2011 OpenIntents.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openintents.filemanager;
+
+import org.openintents.util.VersionUtils;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.net.Uri;
+
+/**
+ * @version 2009-10-23: support Market and aTrackDog
+ * @version 2009-02-04
+ * @author Peli
+ *
+ */
+public class UpdateDialog extends DownloadAppDialog {
+	
+	private static final String TAG = "UpdateMenu";
+	private static final boolean DEBUG_NO_MARKET = false;
+	
+	/**
+	 * If any of the following applications is installed,
+	 * there is no need for a manual "Update" menu entry.
+	 */
+	public static final String[] UPDATE_CHECKER = new String[]
+	    {
+			"org.openintents.updatechecker", // OI Update
+			"com.android.vending", // Google's Android Market
+			"com.a0soft.gphone.aTrackDog" // aTrackDog
+	    };
+    
+    public UpdateDialog(Context context) {
+        super(context, 
+        		R.string.oi_distribution_update_box_text, 
+        		R.string.oi_distribution_update_app, 
+        		R.string.oi_distribution_update_checker_package, 
+        		R.string.oi_distribution_update_checker_website);
+        mContext = context;
+
+        String version = VersionUtils.getVersionNumber(mContext);
+        String appname = VersionUtils.getApplicationName(mContext);
+        String appnameversion = mContext.getString(R.string.oi_distribution_name_and_version, appname, version);
+        
+        StringBuilder sb = new StringBuilder();
+        sb.append(appnameversion);
+        sb.append("\n\n");
+        sb.append(mMessageText);
+        setMessage(sb.toString());
+        
+        setButton(mContext.getText(R.string.oi_distribution_update_check_now), this);
+    }
+
+	public void onClick(DialogInterface dialog, int which) {
+		final Intent intent  = new Intent(Intent.ACTION_VIEW);
+		
+    	if (which == BUTTON1) {
+    		
+    		// TODO: Obtain this resId properly from
+    		// Manifest or about.xml
+    		int resId = R.string.about_website_url;
+    		
+			intent.setData(Uri.parse(mContext.getString(resId)));
+			startSaveActivity(intent);
+    	} else {
+    		// BUTTON2 is handled by parent.
+    		super.onClick(dialog, which);
+    	}
+		
+	}
+	
+	/**
+	 * Check if no updater application is installed.
+	 * 
+	 * @param context
+	 * @return
+	 */
+	public static boolean isUpdateMenuNecessary(Context context) {
+		PackageInfo pi = null;
+		
+		// Test for existence of all known update checker applications.
+		for (int i = 0; i < UPDATE_CHECKER.length; i++) {
+			try {
+				pi = context.getPackageManager().getPackageInfo(
+						UPDATE_CHECKER[i], 0);
+			} catch (NameNotFoundException e) {
+				// ignore
+			}
+			if (pi != null && !DEBUG_NO_MARKET) {
+				// At least one kind of update checker exists,
+				// so there is no need to add a menu item.
+				return false;
+			}
+		}
+		
+		// If we reach this point, we add a menu item for manual update.
+		return true; 
+	}
+
+}
diff --git a/apps/oi-filemanager/FileManager/src/org/openintents/intents/AboutMiniIntents.java b/apps/oi-filemanager/FileManager/src/org/openintents/intents/AboutMiniIntents.java
new file mode 100644
index 0000000..d66c9f5
--- /dev/null
+++ b/apps/oi-filemanager/FileManager/src/org/openintents/intents/AboutMiniIntents.java
@@ -0,0 +1,72 @@
+/* 
+ * Copyright (C) 2008-2009 OpenIntents.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openintents.intents;
+
+/**
+ * Intents definition belonging to OI About.
+ * 
+ * @version 2009-Jan-08
+ * 
+ * @author pjv
+ * @author Peli
+ *
+ */
+public final class AboutMiniIntents {
+	
+	/**
+	 * Empty, preventing instantiation.
+	 */
+	private AboutMiniIntents() {
+		//Empty, preventing instantiation.
+	}
+
+	/**
+	 * Activity Action: Show an about dialog to display
+	 * information about the application.
+	 * 
+	 * The application information is retrieved from the
+	 * application's manifest. In order to send the package
+	 * you have to launch this activity through
+	 * startActivityForResult().
+	 * 
+	 * Alternatively, you can specify the package name 
+	 * manually through the extra EXTRA_PACKAGE.
+	 * 
+	 * All data can be replaced using optional intent extras.
+	 * 
+	 * <p>
+	 * Constant Value: "org.openintents.action.SHOW_ABOUT_DIALOG"
+	 * </p>
+	 */
+	public static final String ACTION_SHOW_ABOUT_DIALOG = 
+		"org.openintents.action.SHOW_ABOUT_DIALOG";
+
+	/**
+	 * Optional intent extra: Specify your application package name.
+	 * 
+	 * If you start the About dialog through startActivityForResult()
+	 * then the application package is sent automatically and does
+	 * not need to be supplied here.
+	 * 
+	 * <p>
+	 * Constant Value: "org.openintents.extra.PACKAGE_NAME"
+	 * </p>
+	 */
+	public static final String EXTRA_PACKAGE_NAME = 
+		"org.openintents.extra.PACKAGE_NAME";
+	
+}
diff --git a/apps/oi-filemanager/FileManager/src/org/openintents/util/IntentUtils.java b/apps/oi-filemanager/FileManager/src/org/openintents/util/IntentUtils.java
new file mode 100644
index 0000000..e4f71b9
--- /dev/null
+++ b/apps/oi-filemanager/FileManager/src/org/openintents/util/IntentUtils.java
@@ -0,0 +1,43 @@
+
+
+/**
+ * Original method retrieved from:
+ * http://android-developers.blogspot.com/2009/01/can-i-use-this-intent.html
+ */
+package org.openintents.util;
+
+import java.util.List;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+
+/**
+ * 
+ * @author romainguy
+ * @author Peli
+ *
+ */
+public class IntentUtils {
+	
+	/**
+	 * Indicates whether the specified action can be used as an intent. This
+	 * method queries the package manager for installed packages that can
+	 * respond to the specified intent. If no suitable package is
+	 * found, this method returns false.
+	 *
+	 * @param context The application's environment.
+	 * @param intent The Intent to check for availability.
+	 *
+	 * @return True if an Intent with the specified action can be sent and
+	 *         responded to, false otherwise.
+	 */
+	public static boolean isIntentAvailable(final Context context, final Intent intent) {
+	    final PackageManager packageManager = context.getPackageManager();
+	    List<ResolveInfo> list =
+	            packageManager.queryIntentActivities(intent,
+	                    PackageManager.MATCH_DEFAULT_ONLY);
+	    return list.size() > 0;
+	}
+}
diff --git a/apps/oi-filemanager/FileManager/src/org/openintents/util/VersionUtils.java b/apps/oi-filemanager/FileManager/src/org/openintents/util/VersionUtils.java
new file mode 100644
index 0000000..714cfbb
--- /dev/null
+++ b/apps/oi-filemanager/FileManager/src/org/openintents/util/VersionUtils.java
@@ -0,0 +1,123 @@
+/* 
+ * Copyright (C) 2007-2009 OpenIntents.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openintents.util;
+
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.Build;
+import android.util.Log;
+
+/**
+ * 
+ * @version 2011-01-22
+ * @author Peli
+ *
+ */
+public class VersionUtils {
+	
+	private static final String TAG = "VersionUtils";
+
+	/**
+	 * Get current version code.
+	 * 
+	 * @return
+	 */
+	public static int getVersionCode(Context context) {
+		int version = 0;
+		try {
+			PackageInfo pi = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
+			version = pi.versionCode;
+		} catch (PackageManager.NameNotFoundException e) {
+			Log.e(TAG, "Package name not found", e);
+		};
+		return version;
+	}
+	
+	/**
+	 * Get current version number.
+	 * 
+	 * @return
+	 */
+	public static String getVersionNumber(Context context) {
+		String version = "?";
+		try {
+			PackageInfo pi = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
+			version = pi.versionName;
+		} catch (PackageManager.NameNotFoundException e) {
+			Log.e(TAG, "Package name not found", e);
+		};
+		return version;
+	}
+	
+	/**
+	 * Get application name.
+	 * 
+	 * Since API level 4 this routine could be replaced by
+	 * appname = getString(getApplicationInfo().labelRes);
+	 * 
+	 * @return
+	 */
+	public static String getApplicationName(Context context) {
+		String name = "?";
+		try {
+			PackageInfo pi = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
+			name = context.getString(pi.applicationInfo.labelRes);
+		} catch (PackageManager.NameNotFoundException e) {
+			Log.e(TAG, "Package name not found", e);
+		};
+		return name;
+	}
+
+	/**
+	 * Get application icon.
+	 * 
+	 * Since API level 4 this routine could be replaced by
+	 * icon = getApplicationInfo().icon;
+	 * 
+	 * @return
+	 */
+	public static int getApplicationIcon(Context context) {
+		int icon = 0;
+		try {
+			PackageInfo pi = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
+			icon = pi.applicationInfo.icon;
+		} catch (PackageManager.NameNotFoundException e) {
+			Log.e(TAG, "Package name not found", e);
+		};
+		return icon;
+	}
+
+	/**
+	 * Indicates whether a specific package with minimum version code is available.
+	 */
+	public static boolean isPackageAvailable(final Context context, final String packageName,
+			final int minVersionCode) {
+		boolean result = false;
+		try {
+			PackageInfo pi = context.getPackageManager().getPackageInfo(
+					packageName, 0);
+			if (pi.versionCode >= minVersionCode) {
+				result = true;
+			}
+	    } catch (PackageManager.NameNotFoundException e) {
+	    	
+	    }
+	    return result;
+	}
+}
diff --git a/apps/oi-filemanager/promotion/description/translations/application_names.txt b/apps/oi-filemanager/promotion/description/translations/application_names.txt
index ae8a500..804582a 100644
--- a/apps/oi-filemanager/promotion/description/translations/application_names.txt
+++ b/apps/oi-filemanager/promotion/description/translations/application_names.txt
@@ -7,6 +7,7 @@ OI Dateimanager
 OI Dosya Yöneticisi
 OI Failu pārvaldnieks
 OI Fájlkezelő
+OI Fajl Meneger
 OI Filbehandler
 OI File Manager
 OI File Manedyer
diff --git a/apps/oi-filemanager/promotion/description/translations/description-ar.txt b/apps/oi-filemanager/promotion/description/translations/description-ar.txt
index 0b4be89..459773f 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-ar.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-ar.txt
@@ -38,7 +38,7 @@ http://code.google.com/p/openintents
 * المقاصد مفتوحة OI, IO, OpenIntents
 
 الإصدارات الدولية: 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 سلاسل البحث للسوق: 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-be.txt b/apps/oi-filemanager/promotion/description/translations/description-be.txt
index c2269e7..acec49b 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-be.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-be.txt
@@ -38,7 +38,7 @@ http://code.google.com/p/openintents
 * OI, IO, OpenIntents, Open Intents
 
 Перекладзеныя версіі: 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 Пошук у Market: 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-bg.txt b/apps/oi-filemanager/promotion/description/translations/description-bg.txt
index 9d5eda9..2d15353 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-bg.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-bg.txt
@@ -39,7 +39,7 @@ http://code.google.com/p/openintents
 * OI, IO, OpenIntents, Open Intents
 
 Международни версии: 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 Стрингове за търсенето в Market 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-bs.txt b/apps/oi-filemanager/promotion/description/translations/description-bs.txt
new file mode 100644
index 0000000..fe9375b
--- /dev/null
+++ b/apps/oi-filemanager/promotion/description/translations/description-bs.txt
@@ -0,0 +1,7 @@
+# Application:
+OI Fajl Meneger
+
+# Promo text:
+Upravljanje Fajlovima na SD kartici sa OI File Manager.
+
+# Description:
diff --git a/apps/oi-filemanager/promotion/description/translations/description-ca.txt b/apps/oi-filemanager/promotion/description/translations/description-ca.txt
index f7ac285..0a1751c 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-ca.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-ca.txt
@@ -38,7 +38,7 @@ Paraules clau:
 * OI, IO, OpenIntents, Open Intents
 
 Versions internacionals: 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 Cerca cadenes al Mercat: 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-cs.txt b/apps/oi-filemanager/promotion/description/translations/description-cs.txt
index f97225e..19cbd19 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-cs.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-cs.txt
@@ -38,7 +38,7 @@ Klíčová slova:
 * OI, IO, OpenIntents, Open Intents
 
 Mezinárodní verze: 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 Prohledat řetězce pro Market: 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-da.txt b/apps/oi-filemanager/promotion/description/translations/description-da.txt
index f5360ea..c4d1208 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-da.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-da.txt
@@ -38,7 +38,7 @@ Keywords:
 * OI, IO, OpenIntents, Open Intents
 
 International versions: 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 Search strings for Market: 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-de.txt b/apps/oi-filemanager/promotion/description/translations/description-de.txt
index 176f129..034bad6 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-de.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-de.txt
@@ -18,7 +18,7 @@ https://translations.launchpad.net/openintents/trunk
 Der Quellcode dieser kostenlosen und quelloffenen Applikation ist verfügbar auf: 
 http://code.google.com/p/openintents
 
-Eigentschaften: 
+Leistungsmerkmale: 
 * Zeigt eine Liste der Dateien mit Vorschauen für Bilder.
 * Dateien verschieben, kopieren, umbennen oder löschen
 * Erstellt und löscht Ordner.
@@ -38,7 +38,7 @@ Schlüsselwörter:
 * OI, IO, OpenIntents, Open Intents
 
 Internationale Versionen: 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 Im Market suchen nach: 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-el.txt b/apps/oi-filemanager/promotion/description/translations/description-el.txt
index ae798c9..04faf0d 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-el.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-el.txt
@@ -38,7 +38,7 @@ http://code.google.com/p/openintents
 * OI, IO, OpenIntents, Open Intents
 
 Διεθνείς εκδόσεις: 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 Αναζήτηση συμβολοσειρών για το Market: 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-en-rGB.txt b/apps/oi-filemanager/promotion/description/translations/description-en-rGB.txt
index 36b225e..e91b861 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-en-rGB.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-en-rGB.txt
@@ -38,7 +38,7 @@ Keywords:
 * OI, IO, OpenIntents, Open Intents
 
 International versions: 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 Search strings for Market: 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-en.txt b/apps/oi-filemanager/promotion/description/translations/description-en.txt
index abbd692..28af26b 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-en.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-en.txt
@@ -38,7 +38,7 @@ Keywords:
 * OI, IO, OpenIntents, Open Intents
 
 International versions: 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 Search strings for Market: 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-es.txt b/apps/oi-filemanager/promotion/description/translations/description-es.txt
index 9e05010..34b93fc 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-es.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-es.txt
@@ -38,7 +38,7 @@ Palabras clave:
 * OI, IO, OpenIntents, Open Intents
 
 Versiones internacionales: 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 Buscar en el Market: 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-fa.txt b/apps/oi-filemanager/promotion/description/translations/description-fa.txt
index 05794d1..6505716 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-fa.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-fa.txt
@@ -38,7 +38,7 @@ http://code.google.com/p/openintents
 * OI، IO ها، مفاهیم باز، مفاهیم باز
 
 نسخه بین المللی : 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 جستجو در رشته ها در بازار : 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-fi.txt b/apps/oi-filemanager/promotion/description/translations/description-fi.txt
index bf94839..769fe25 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-fi.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-fi.txt
@@ -31,7 +31,7 @@ Avainsanat:
 * OI, IO, OpenIntents, Open Intents
 
 Kansainvälinen versiot: 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 Etsintä jousille Markkinoiden: 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-fr.txt b/apps/oi-filemanager/promotion/description/translations/description-fr.txt
index f14a0c6..d816f1c 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-fr.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-fr.txt
@@ -2,7 +2,7 @@
 OI File Manager
 
 # Promo text:
-Manage files on the SD card with OI File Manager.
+Gérer les fichiers sur la carte SD avec OI File Manager
 
 # Description:
 OI File Manager vous permet de naviguer sur votre carte SD, créer des répertoires, renommer, copier, déplacer et supprimer le gestionnaire de fichiers files.OI vous permet de parcourir votre carte SD, créer des répertoires, renommer, copier, déplacer et supprimer des fichiers. Il agit aussi comme une extension à d'autres applications à afficher  "Ouvrir " et  "Sauvegarder " dialogues. 
@@ -38,7 +38,7 @@ Mots-clés:
 * OI, IO, OpenIntents, Open Intents
 
 Les versions internationales: 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 Les chaînes de recherche pour le marché: 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-hi.txt b/apps/oi-filemanager/promotion/description/translations/description-hi.txt
index 743fe3a..ba73c4c 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-hi.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-hi.txt
@@ -38,7 +38,7 @@ http://code.google.com/p/openintents
 * OI, IO, OpenIntents, Open Intents
 
 अंतर्राष्ट्रीय संस्करण: 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 बाजार के लिए स्ट्रिंग्स को  खोजें : 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-hr.txt b/apps/oi-filemanager/promotion/description/translations/description-hr.txt
index cff3e59..3ee80d8 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-hr.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-hr.txt
@@ -31,7 +31,7 @@ Ključne riječi:
 * OI, IO, OpenIntents, Open Intents
 
 Internacionalna verzija: 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 Pretraži tekst na Marketu: 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-it.txt b/apps/oi-filemanager/promotion/description/translations/description-it.txt
index 6a31e15..bcf56ae 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-it.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-it.txt
@@ -38,7 +38,7 @@ Le parole chiave:
 * OI, IO, OpenIntents, Open Intents
 
 Versioni internazionali: 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 Cerca le stringhe per Market: 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-iw.txt b/apps/oi-filemanager/promotion/description/translations/description-iw.txt
index ca29569..e2c08d9 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-iw.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-iw.txt
@@ -39,7 +39,7 @@ http://code.google.com/p/openintents
 * OI, IO, OpenIntents, Open Intents
 
 גרסאות בין-לאומיות: 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 חפש מחרוזות לשוק: 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-ja.txt b/apps/oi-filemanager/promotion/description/translations/description-ja.txt
index cfec88f..440400d 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-ja.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-ja.txt
@@ -38,7 +38,7 @@ http://code.google.com/p/openintents
 * OI, IO, OpenIntents, Open Intents
 
 国際バージョン： 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 マーケット用に文字列を検索： 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-ko.txt b/apps/oi-filemanager/promotion/description/translations/description-ko.txt
index 2f11763..b4fac42 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-ko.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-ko.txt
@@ -38,7 +38,7 @@ http://code.google.com/p/openintents
 * OI, IO, OpenIntents, Open Intents
 
 국제 버전들: 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 마켓에서 검색하기: 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-lv.txt b/apps/oi-filemanager/promotion/description/translations/description-lv.txt
index 402742f..1b32aaa 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-lv.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-lv.txt
@@ -38,7 +38,7 @@ Atslēgvārdi:
 * OI, IO, OpenIntents, Open Intents
 
 Starptautiskās versijas: 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 Meklēt rindiņas tirgum: 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-mk.txt b/apps/oi-filemanager/promotion/description/translations/description-mk.txt
index 7177f19..87e788d 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-mk.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-mk.txt
@@ -31,7 +31,7 @@ http://code.google.com/p/openintents
 * OI, IO, OpenIntents, Open Intents, Отворени Намери
 
 Меѓународни верзии: 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 Барај стрингови за Пазар: 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-nb.txt b/apps/oi-filemanager/promotion/description/translations/description-nb.txt
index 9a2aec5..dd853af 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-nb.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-nb.txt
@@ -38,7 +38,7 @@ Nøkkelord:
 * OI, IO, OpenIntents, Open Intents
 
 Internasjonal versjoner: 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 Søkestrenger for Marked: 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-nl.txt b/apps/oi-filemanager/promotion/description/translations/description-nl.txt
index 18d5702..da0b206 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-nl.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-nl.txt
@@ -28,7 +28,7 @@ Eigenschappen:
 * Ondersteunt PICK_FILE en PICK_DIRECTORY intents, waardoor andere programma's OI File Manager ook kunnen gebruiken.
 
 Beschikbare extensies voor "OI File Manager" 
-* Show the license information with "OI About".
+* Toon licentie-informatie met OI About
 
 Applicaties die werken met "OI File Manager" 
 * Open en bewaar tekstbestanden in "OI Notepad"
@@ -38,10 +38,10 @@ Sleutelwoorden:
 * OI, IO, OpenIntents, Open Intents
 
 Internationale versies 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
-Search strings for Market: 
+Zoektekst voor Market: 
 * uses OI About
 * extension for OI Notepad
 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-oc.txt b/apps/oi-filemanager/promotion/description/translations/description-oc.txt
index 2d70120..8b24d13 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-oc.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-oc.txt
@@ -38,7 +38,7 @@ Mots claus :
 * OI, IO, OpenIntents, Open Intents
 
 International versions: 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 Search strings for Market: 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-pa.txt b/apps/oi-filemanager/promotion/description/translations/description-pa.txt
index de650c2..afb94c5 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-pa.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-pa.txt
@@ -38,7 +38,7 @@ OI ਫਾਇਲ ਪ੍ਰਬੰਧਕ ਲਈ ਉਪਲੱਬਧ ਏਕਸਟੇ
 * OI, IO, OpenIntents, Open Intents
 
 ਅੰਤਰਰਾਸ਼ਟਰੀ ਸੰਸਕਰਣ : 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 ਬਾਜ਼ਾਰ ਲਈ ਖੋਜ ਤਾਰ : 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-pl.txt b/apps/oi-filemanager/promotion/description/translations/description-pl.txt
index 173029f..2dc0c11 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-pl.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-pl.txt
@@ -38,7 +38,7 @@ Słowa kluczowe:
 * OI, IO, OpenIntents, Open Intents
 
 Wersje międzynarodowe: 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 Szukaj ciągów znaków w Markecie: 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-pt.txt b/apps/oi-filemanager/promotion/description/translations/description-pt.txt
index 0539f5a..367a1c6 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-pt.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-pt.txt
@@ -38,7 +38,7 @@ Palavras-chave:
 * OI, IO, OpenIntents, Open Intents
 
 Versões internacionais: 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 Linhas de procura no Market: 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-ro.txt b/apps/oi-filemanager/promotion/description/translations/description-ro.txt
index 5c4e72e..ab4692c 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-ro.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-ro.txt
@@ -38,7 +38,7 @@ Cuvinte cheie:
 * OI, IO, OpenIntents, Open Intents
 
 Versiuni internaționale: 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 Caută șiruri pentru Market: 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-ru.txt b/apps/oi-filemanager/promotion/description/translations/description-ru.txt
index 1c2e063..e2a1bd7 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-ru.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-ru.txt
@@ -2,7 +2,7 @@
 OI File Manager
 
 # Promo text:
-Manage files on the SD card with OI File Manager.
+Управляйте файлами на SD карте с помощью OI File Manager.
 
 # Description:
 OI File Manager позволяет работать с SD-картой, создавать каталоги, переименовывать, копировать, перемещать, и удалять файлы Также выступает в качестве дополнения к другим приложениям для отображения диалогов "Открыть" и "Сохранить" 
@@ -38,7 +38,7 @@ http://code.google.com/p/openintents
 * Copy text 	 OI, IO, OpenIntents, Open Intents
 
 Переведенные версии: 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 Search strings for Market: 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-sd.txt b/apps/oi-filemanager/promotion/description/translations/description-sd.txt
index 5475c4d..6001ea9 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-sd.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-sd.txt
@@ -38,7 +38,7 @@ http://code.google.com/p/openintents
 * OI, IO, OpenIntents, Open Intents
 
 अंतर्राष्ट्रीय संस्करण: 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 बाजार जे लाये स्ट्रिंग्स खोजयो  : 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-sk.txt b/apps/oi-filemanager/promotion/description/translations/description-sk.txt
index b63b95d..bd84c87 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-sk.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-sk.txt
@@ -38,7 +38,7 @@ Kľúčové slová
 * OI, IO, OpenIntents, Open Intents, openintents, openIntents, Openintents
 
 Medzinárodné verzie: 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 Vyhľadávanie reťazcov pre Obchod: 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-sv.txt b/apps/oi-filemanager/promotion/description/translations/description-sv.txt
new file mode 100644
index 0000000..c6c8eb5
--- /dev/null
+++ b/apps/oi-filemanager/promotion/description/translations/description-sv.txt
@@ -0,0 +1,47 @@
+# Application:
+OI File Manager
+
+# Promo text:
+Hantera filer på SD-kort med OI File Manager.
+
+# Description:
+OI File Manager allows you to browse your SD card, create directories, rename, copy, move, and delete files. It also acts as an extension to other applications to display "Open" and "Save" dialogs. 
+
+This application is ad free and does not require the internet permission. 
+
+For the complete list of changes and a list of frequently asked questions, please visit: 
+http://www.openintents.org
+
+You can help to improve the translation into your language at Launchpad: 
+https://translations.launchpad.net/openintents/trunk
+
+The source code of this free and open source application is available at: 
+http://code.google.com/p/openintents
+
+Features: 
+* Show list of files with thumbnails for images.
+* Move, copy, rename, and delete files.
+* Create and delete directories (folders).
+* Send files by email.
+* Acts as an extension to other applications, like GMail, to attach files.
+* Support for many file endings and mime types.
+* Supports PICK_FILE and PICK_DIRECTORY intents so that other applications can use OI File Manager.
+
+Available extensions for "OI File Manager": 
+* Show the license information with "OI About".
+
+Applications that work with "OI File Manager": 
+* Open and save text files in "OI Notepad".
+
+Keywords: 
+* file manager, filemanager, file explorer
+* OI, IO, OpenIntents, Open Intents
+
+International versions: 
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+
+
+Search strings for Market: 
+* uses OI About
+* extension for OI Notepad
+
diff --git a/apps/oi-filemanager/promotion/description/translations/description-tl.txt b/apps/oi-filemanager/promotion/description/translations/description-tl.txt
index 0ff7713..a780231 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-tl.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-tl.txt
@@ -38,7 +38,7 @@ Keywords:
 * OI, IO, OpenIntents, Bukas na mga Layunin
 
 Internasyonal na mga bersyon: 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 Search strings para sa Merkado: 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-tr.txt b/apps/oi-filemanager/promotion/description/translations/description-tr.txt
index ab56cc2..fc0d044 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-tr.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-tr.txt
@@ -38,7 +38,7 @@ Anahtar kelimeler:
 * OI, IO, OpenIntents, Open Intents
 
 Uluslararası versiyonlar: 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 Market için arama metinleri: 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-ug.txt b/apps/oi-filemanager/promotion/description/translations/description-ug.txt
index 4314d34..2d95a34 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-ug.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-ug.txt
@@ -38,7 +38,7 @@ http://code.google.com/p/openintents
 * OI, IO, OpenIntents, Open Intents
 
 خەلقئارا نەشرى: 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 بازاردا ئىزدەش ئۇچۇرى: 
diff --git a/apps/oi-filemanager/promotion/description/translations/description-zh-rCN.txt b/apps/oi-filemanager/promotion/description/translations/description-zh-rCN.txt
index 30ad875..4809b56 100644
--- a/apps/oi-filemanager/promotion/description/translations/description-zh-rCN.txt
+++ b/apps/oi-filemanager/promotion/description/translations/description-zh-rCN.txt
@@ -38,7 +38,7 @@ Applications that work with "OI File Manager":
 * OI, IO, OpenIntents, Open Intents
 
 国际版本： 
-Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
+Gestor de fitxers d'OI., OI 파일 관리자, OI ແຟ້ມ ບໍລີຫານ, OI ファイルマネージャー, OI Bestandsbeheer, OI Dateimanager, OI Dosya Yöneticisi, OI Failu pārvaldnieks, OI Fájlkezelő, OI Fajl Meneger, OI Filbehandler, OI File Manager, OI File Manedyer, OI Gestore File, OI Menedżer plików, OI Správca Súborov, OI Správce souborů, OI ھۆججەت باشقۇرغۇچ, OI مدير پرونده‌, OI Διαχειριστής Αρχείων, OI Файл-мэнэджар, OI Файлов Мениджър, OI फ़ाइल प्रबंधक, OI ਫਾਇਲ ਮੈਨਿਜਰ, OI文件管理器, مدير الملفات OI, מנהל קבצים OI, 檔案總管
 
 
 Search strings for Market: