From b1c13831053b24fd5b8f2d482a8bfd1434c4251f Mon Sep 17 00:00:00 2001
From: Peli <peli0101@googlemail.com>
Date: Fri, 5 Mar 2010 19:21:07 +0800
Subject: [PATCH] update to r2544

OI File Manager: version 1.1.1.

More translations.
---
 AndroidManifest.xml                                |  14 +--
 readme.txt                                         |  12 +++
 res/values-de/strings.xml                          |   8 +-
 res/values-es/strings.xml                          |   4 +-
 res/values-fo/strings.xml                          |   3 +-
 res/values-fr/strings.xml                          |  23 ++---
 res/values-it/strings.xml                          |   3 +-
 res/values-ja/strings.xml                          |   7 +-
 res/values-ko/strings.xml                          | 102 +++++++++++++++++++++
 res/values-lo/strings.xml                          |   7 +-
 res/values-nl/strings.xml                          |   3 +-
 res/values-ro/strings.xml                          | 100 ++++++++++++++++++++
 res/values-ru/strings.xml                          | 100 ++++++++++++++++++++
 res/values-zh-rCN/strings.xml                      |   3 +-
 res/values-zh-rTW/strings.xml                      |   3 +-
 .../filemanager/FileManagerActivity.java           |  29 ++++++
 16 files changed, 389 insertions(+), 32 deletions(-)
 create mode 100644 res/values-ko/strings.xml
 create mode 100644 res/values-ro/strings.xml
 create mode 100644 res/values-ru/strings.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8eda711..d6a54bf 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,9 +16,11 @@
  -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.openintents.filemanager"
-	android:versionName="1.1.0"
-	android:versionCode="5">
+	android:versionName="1.1.1"
+	android:versionCode="6">
 	<!-- History:
+	[7] 1.1.1:     2009-12-26
+	[6] 1.1.1-rc1: 2009-12-19
 	[5] 1.1.0:     2009-10-30
 	[4] 1.1.0-rc1: 2009-10-24
 	[3] 1.0.2:     2009-10-15
@@ -28,9 +30,9 @@
 
 
         <uses-sdk android:minSdkVersion="2"
-            android:targetSdkVersion="4"
-
-     />
+            android:targetSdkVersion="4" />
+        <!-- If targetSdkVersion is increased, the following needs to be adjusted:
+             * FileManagerActivity: onKeyDown(): New way how "back" key is handled. -->
 
 <supports-screens android:smallScreens="true"
                   android:normalScreens="true"
@@ -42,7 +44,7 @@
 
         <!-- aTrackDog metadata -->
         <meta-data android:name="com.a0soft.gphone.aTrackDog.testVersion"
-           android:value="4" />
+           android:value="6" />
 
 		<meta-data android:name="org.openintents.metadata.COMMENTS"
                        android:value="@string/about_comments" />
diff --git a/readme.txt b/readme.txt
index 05158b2..6b46a85 100644
--- a/readme.txt
+++ b/readme.txt
@@ -21,6 +21,18 @@ seamlessly cooperates with other applications.
 To obtain the current release, visit
   http://www.openintents.org
 
+
+---------------------------------------------------------
+release: 1.1.2
+date: 2010-?-?
+- translations: Russian
+
+---------------------------------------------------------
+release: 1.1.1
+date: 2009-12-26
+- recursive delete
+- translations: Dutch, Faroese, Korean, Lao, Romanian
+
 ---------------------------------------------------------
 release: 1.1.0
 date: 2009-10-30
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index f357c95..b4ef1c2 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -21,6 +21,7 @@
 	
 	<!-- Automatically filled in by Launchpad: -->
 	<string name="about_translators">Launchpad Contributions:
+  Flosen https://launchpad.net/~flose
   Peli https://launchpad.net/~peli0101
   marco.jahn https://launchpad.net/~accounts+launchpad-net</string>
 	
@@ -62,16 +63,17 @@
 
     <string name="error_creating_new_folder">Neuer Ordner konnte nicht erstellt werden.</string>
     <string name="error_deleting_file">Datei konnte nicht gelöscht werden.</string>
-    <string name="error_folder_not_empty">Ordner ist nicht leer.</string>
+    <string name="error_deleting_folder">Ordner '%s' kann nicht gelöscht werden.</string>
     <string name="error_renaming_file">Datei konnte nicht umbenannt werden.</string>
     <string name="error_renaming_folder">Ordner konnte nicht umbenannt werden.</string>
     <string name="error_moving_file">Datei konnte nicht verschoben werden.</string>
     <string name="error_moving_folder">Ordner konnte nicht verschoben werden.</string>
     <string name="error_copying_file">Datei kann nicht kopiert werden.</string>
     <string name="error_file_does_not_exists">Datei existiert nicht.</string>
-    
+    <string name="error_deleting_child_file">Konnte Unterdatei %s nicht löschen</string>
+
     <string name="send_not_available">Keine Anwendung zum Senden vorhanden.</string>
-    
+
     <string name="application_not_available">Anwendung nicht vorhanden.</string>
 
 	<!-- ***************************
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index d6fd849..98f9bb3 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -22,6 +22,7 @@
 	<!-- Automatically filled in by Launchpad: -->
 	<string name="about_translators">Launchpad Contributions:
   DiegoJ https://launchpad.net/~diegojromerolopez
+  Paco Molinero https://launchpad.net/~franciscomol
   miwie https://launchpad.net/~mw-miwie</string>
 
     <string name="about_comments">OI File Manager es un gestor abierto de archivos que cooperar fluidamente con otras aplicaciones.</string>
@@ -62,13 +63,14 @@
 
     <string name="error_creating_new_folder">No se puede crear la carpeta nueva.</string>
     <string name="error_deleting_file">No se puede borrar el fichero.</string>
-    <string name="error_folder_not_empty">Carpeta no es vacia.</string>
+    <string name="error_deleting_folder">No se puede borrar la carpeta «'%sx.</string>
     <string name="error_renaming_file">No se puede cambiar de nombre del fichero.</string>
     <string name="error_renaming_folder">No se puede cambiar de nombre de la carpeta.</string>
     <string name="error_moving_file">No se puede mover el fichero.</string>
     <string name="error_moving_folder">No se puede mover la carpeta.</string>
     <string name="error_copying_file">No se pudo copiar el archivo.</string>
     <string name="error_file_does_not_exists">El archivo no existe.</string>
+    <string name="error_deleting_child_file">No se puede borrar el archivo hijo «%s».</string>
 
     <string name="send_not_available">Aplicación no disponible para enviar.</string>
 
diff --git a/res/values-fo/strings.xml b/res/values-fo/strings.xml
index 13a6ab4..a4647d7 100644
--- a/res/values-fo/strings.xml
+++ b/res/values-fo/strings.xml
@@ -62,13 +62,14 @@
 
     <string name="error_creating_new_folder">Kundi ikki stovna nýggja skjáttu.</string>
     <string name="error_deleting_file">Kundi ikki strika fílu.</string>
-    <string name="error_folder_not_empty">Skjáttan er ikki tóm</string>
+    <string name="error_deleting_folder">Could not delete folder '%s'.</string>
     <string name="error_renaming_file">Kundi ikki nýnevna fílu.</string>
     <string name="error_renaming_folder">Kundi ikki nýnevna skjáttu.</string>
     <string name="error_moving_file">Kundi ikki flýta fílu.</string>
     <string name="error_moving_folder">Kundi ikki flyta.</string>
     <string name="error_copying_file">Could not copy file.</string>
     <string name="error_file_does_not_exists">Fíla finnst ei.</string>
+    <string name="error_deleting_child_file">Could not delete child file '%s'.</string>
 
     <string name="send_not_available">Eingin nýtsluskipan tøk til varpingar</string>
 
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index bae9498..9c091a8 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -38,7 +38,7 @@
     <string name="menu_send">Envoyer</string>
     <string name="menu_open">Ouvrir</string>
     <string name="menu_move">Déplacer</string>
-    <string name="menu_copy">Copy</string>
+    <string name="menu_copy">Copier</string>
     
     <string name="create_new_folder">Créer un nouveau dossier</string>
     <string name="folder_name">Nom du dossier</string>
@@ -51,27 +51,28 @@
     <string name="folder_renamed">Dossier renommé.</string>
     <string name="file_moved">Fichier déplacé.</string>
     <string name="folder_moved">Dossier déplacé.</string>
-    <string name="file_copied">File copied.</string>
+    <string name="file_copied">Fichier copié.</string>
     <string name="move_title">Sélectionner un dossier vers lequel déplacer</string>
     <string name="move_button">Déplacer ici</string>
-    <string name="copy_title">Select folder to copy to</string>
-    <string name="copy_button">Copy here</string>
-    
-    <string name="copied_file_name">Copy of %s</string>
-    <string name="copied_file_name_2">Copy %d of %s</string>
+    <string name="copy_title">Sélectionner le dossier à copier sur</string>
+    <string name="copy_button">Copier ici</string>
+
+    <string name="copied_file_name">Copie de %s</string>
+    <string name="copied_file_name_2">Copie de %s sur %s</string>
 
     <string name="error_creating_new_folder">Impossible de créer le nouveau dossier.</string>
     <string name="error_deleting_file">Impossible de supprimer le fichier.</string>
-    <string name="error_folder_not_empty">Le dossier n'est pas vide.</string>
+    <string name="error_deleting_folder">Impossible de supprimer le dossier «%s».</string>
     <string name="error_renaming_file">Impossible de renommer le fichier.</string>
     <string name="error_renaming_folder">Impossible de renommer le dossier.</string>
     <string name="error_moving_file">Impossible de déplacer le fichier.</string>
     <string name="error_moving_folder">Impossible de déplacer le dossier.</string>
-    <string name="error_copying_file">Could not copy file.</string>
+    <string name="error_copying_file">Impossible de copier le fichier.</string>
     <string name="error_file_does_not_exists">Le fichier n'existe pas.</string>
-    
+    <string name="error_deleting_child_file">Impossible de supprimer le fichier enfant «%s».</string>
+
     <string name="send_not_available">Pas d'application disponible pour l'envoi</string>
-    
+
     <string name="application_not_available">Application non disponible</string>
 
 	<!-- ***************************
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index af829b5..d22456d 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -60,13 +60,14 @@
 
     <string name="error_creating_new_folder">Could not create new folder.</string>
     <string name="error_deleting_file">Could not delete file.</string>
-    <string name="error_folder_not_empty">Folder is not empty.</string>
+    <string name="error_deleting_folder">Could not delete folder '%s'.</string>
     <string name="error_renaming_file">Could not rename file.</string>
     <string name="error_renaming_folder">Could not rename folder.</string>
     <string name="error_moving_file">Could not move file.</string>
     <string name="error_moving_folder">Could not move folder.</string>
     <string name="error_copying_file">Could not copy file.</string>
     <string name="error_file_does_not_exists">File does not exist.</string>
+    <string name="error_deleting_child_file">Could not delete child file '%s'.</string>
 
     <string name="send_not_available">No application available for sending.</string>
 
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 8eb0a6e..b1cfce7 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -61,16 +61,17 @@
 
     <string name="error_creating_new_folder">新規フォルダーを作成できませんでした。</string>
     <string name="error_deleting_file">ファイルを削除できませんでした。</string>
-    <string name="error_folder_not_empty">フォルダーが空ではありません。</string>
+    <string name="error_deleting_folder">Could not delete folder '%s'.</string>
     <string name="error_renaming_file">ファイル名を変更できませんでした。</string>
     <string name="error_renaming_folder">フォルダ名を変更できませんでした。</string>
     <string name="error_moving_file">ファイルを移動できませんでした。</string>
     <string name="error_moving_folder">フォルダーを移動できませんでした。</string>
     <string name="error_copying_file">Could not copy file.</string>
     <string name="error_file_does_not_exists">ファイルが存在しません。</string>
-    
+    <string name="error_deleting_child_file">Could not delete child file '%s'.</string>
+
     <string name="send_not_available">利用できる送信用アプリがありません。</string>
-    
+
     <string name="application_not_available">アプリが利用できません</string>
 
 	<!-- ***************************
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
new file mode 100644
index 0000000..ad74523
--- /dev/null
+++ b/res/values-ko/strings.xml
@@ -0,0 +1,102 @@
+<?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:
+  CSro https://launchpad.net/~choongsan</string>
+
+    <string name="about_comments">OI File Manager is an open file manager that seamlessly cooperates with other applications.</string>
+	<string name="about_website_label">OpenIntents의 OI 파일 관리자</string>
+
+	<!-- ***************************
+	     Applicatio-specific strings
+	     *************************** -->
+    <string name="app_name">OI 파일 관리자</string>
+
+    <string name="menu_new_folder">새 폴더</string>
+    <string name="menu_delete">삭제</string>
+    <string name="menu_rename">이름 변경</string>
+    <string name="menu_send">보내기</string>
+    <string name="menu_open">열기</string>
+    <string name="menu_move">이동</string>
+    <string name="menu_copy">복사</string>
+
+    <string name="create_new_folder">새 폴더 생성</string>
+    <string name="folder_name">폴더 이름</string>
+    <string name="file_name">폴더 이름</string>
+    <string name="this_folder_is_empty">This folder is empty.</string>
+    <string name="really_delete">Do you really want to delete %s?</string>
+    <string name="file_deleted">파일이 삭제되었습니다.</string>
+    <string name="folder_deleted">폴더가 삭제되었습니다.</string>
+    <string name="file_renamed">파일 이름이 변경되었습니다.</string>
+    <string name="folder_renamed">폴더 이름이 변경되었습니다.</string>
+    <string name="file_moved">File moved.</string>
+    <string name="folder_moved">폴더가 이동되었습니다.</string>
+    <string name="file_copied">폴더가 복사되었습니다.</string>
+    <string name="move_title">이동할 폴더 선택</string>
+    <string name="move_button">여기로 옮기기</string>
+    <string name="copy_title">복사할 폴더 선택</string>
+    <string name="copy_button">여기로 복사</string>
+
+    <string name="copied_file_name">%s의 복사</string>
+    <string name="copied_file_name_2">Copy %d of %s</string>
+
+    <string name="error_creating_new_folder">새 폴더를 생성할 수 없습니다.</string>
+    <string name="error_deleting_file">파일을 삭제할 수 없습니다.</string>
+    <string name="error_deleting_folder">Could not delete folder '%s'.</string>
+    <string name="error_renaming_file">파일의 이름을 변경할 수 없습니다.</string>
+    <string name="error_renaming_folder">폴더의 이름을 변경할 수 없습니다.</string>
+    <string name="error_moving_file">파일을 이동할 수 없습니다.</string>
+    <string name="error_moving_folder">폴더를 이동할 수 없습니다.</string>
+    <string name="error_copying_file">파일을 복사할 수 없습니다.</string>
+    <string name="error_file_does_not_exists">파일이 존재하지 않습니다.</string>
+    <string name="error_deleting_child_file">Could not delete child file '%s'.</string>
+
+    <string name="send_not_available">No application available for sending.</string>
+
+    <string name="application_not_available">Application not available</string>
+
+	<!-- ***************************
+	     Distribution
+	     *************************** -->
+
+	<!-- EULA -->
+	<string name="eula_title">OI File Manager EULA</string>
+	<string name="eula_accept">수락</string>
+	<string name="eula_refuse">취소</string>
+
+	<!-- Update -->
+	<string name="update_box_text">Please check manually for updates or install OI Update
+for automatic notifications.
+Current version: %s
+	</string>
+	<string name="update_check_now">지금 확인</string>
+	<string name="update_get_updater">OI 업데이트기 가져오기</string>
+	<string name="update_error">Download application not available.</string>
+	<string name="update">업데이트 확인</string>
+
+    <!-- About -->
+    <string name="about">프로그램 정보</string>
+	<string name="aboutapp_not_available">Version %s\n\nNo compatible extension available to display full info (contact, credits, license).</string>
+    <string name="aboutapp_get">Get OI About</string>
+
+
+</resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index a593602..2f10794 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -61,16 +61,17 @@
 
     <string name="error_creating_new_folder">Could not create new folder.</string>
     <string name="error_deleting_file">Could not delete file.</string>
-    <string name="error_folder_not_empty">Folder is not empty.</string>
+    <string name="error_deleting_folder">Could not delete folder '%s'.</string>
     <string name="error_renaming_file">Could not rename file.</string>
     <string name="error_renaming_folder">Could not rename folder.</string>
     <string name="error_moving_file">Could not move file.</string>
     <string name="error_moving_folder">Could not move folder.</string>
     <string name="error_copying_file">Could not copy file.</string>
     <string name="error_file_does_not_exists">File does not exist.</string>
-    
+    <string name="error_deleting_child_file">Could not delete child file '%s'.</string>
+
     <string name="send_not_available">No application available for sending.</string>
-    
+
     <string name="application_not_available">Application not available</string>
 
 	<!-- ***************************
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 800a8ba..6eb37b3 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -62,13 +62,14 @@
 
     <string name="error_creating_new_folder">Could not create new folder.</string>
     <string name="error_deleting_file">Could not delete file.</string>
-    <string name="error_folder_not_empty">Folder is not empty.</string>
+    <string name="error_deleting_folder">Could not delete folder '%s'.</string>
     <string name="error_renaming_file">Could not rename file.</string>
     <string name="error_renaming_folder">Could not rename folder.</string>
     <string name="error_moving_file">Could not move file.</string>
     <string name="error_moving_folder">Could not move folder.</string>
     <string name="error_copying_file">Could not copy file.</string>
     <string name="error_file_does_not_exists">File does not exist.</string>
+    <string name="error_deleting_child_file">Could not delete child file '%s'.</string>
 
     <string name="send_not_available">No application available for sending.</string>
 
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
new file mode 100644
index 0000000..779f4bb
--- /dev/null
+++ b/res/values-ro/strings.xml
@@ -0,0 +1,100 @@
+<?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:
+  Peli https://launchpad.net/~peli0101
+  iulargsb https://launchpad.net/~iulargsb</string>
+
+    <string name="about_comments">OI File Manager is an open file manager that seamlessly cooperates with other applications.</string>
+	<string name="about_website_label">OI File Manager pe OpenIntents</string>
+
+	<!-- ***************************
+	     Applicatio-specific strings
+	     *************************** -->
+    <string name="app_name">OI File Manager</string>
+
+    <string name="menu_new_folder">Dosar nou</string>
+    <string name="menu_delete">Șterge</string>
+    <string name="menu_rename">Redenumește</string>
+    <string name="menu_send">Trimite</string>
+    <string name="menu_open">Deschide</string>
+    <string name="menu_move">Mută</string>
+    <string name="menu_copy">Copy</string>
+
+    <string name="create_new_folder">Crează un dosar nou</string>
+    <string name="folder_name">Numele dosarului</string>
+    <string name="file_name">Numele dosarului</string>
+    <string name="this_folder_is_empty">Dosarul este gol.</string>
+    <string name="really_delete">Doriți sa ștergeți %s?</string>
+    <string name="file_deleted">Fișier sters.</string>
+    <string name="folder_deleted">Dosar șters.</string>
+    <string name="file_renamed">Fișier redenumit.</string>
+    <string name="folder_renamed">Dosar redenumit.</string>
+    <string name="file_moved">Fișier mutat.</string>
+    <string name="folder_moved">Dosar mutat.</string>
+    <string name="file_copied">Fișier copiat.</string>
+    <string name="move_title">Selectați dosarul destinație</string>
+    <string name="move_button">Mută aici</string>
+    <string name="copy_title">Selectați dosarul destinație</string>
+    <string name="copy_button">Copiază aici</string>
+
+    <string name="copied_file_name">Copie a %s</string>
+    <string name="copied_file_name_2">Copie %d a %s</string>
+
+    <string name="error_creating_new_folder">Nu am putut crea un dosar nou.</string>
+    <string name="error_deleting_file">Nu am putut șterge fișierul.</string>
+    <string name="error_deleting_folder">Could not delete folder '%s'.</string>
+    <string name="error_renaming_file">Nu am putut redenumi fișierul.</string>
+    <string name="error_renaming_folder">Nu am putut redenumi dosarul.</string>
+    <string name="error_moving_file">Nu am putut muta fișierul.</string>
+    <string name="error_moving_folder">Nu am putut muta dosarul.</string>
+    <string name="error_copying_file">Nu am putut copia fișierul.</string>
+    <string name="error_file_does_not_exists">Fișierul nu există.</string>
+    <string name="error_deleting_child_file">Could not delete child file '%s'.</string>
+
+    <string name="send_not_available">Nu există aplicație pentru trimitere.</string>
+
+    <string name="application_not_available">Aplicație indisponibilă</string>
+
+	<!-- ***************************
+	     Distribution
+	     *************************** -->
+
+	<!-- EULA -->
+	<string name="eula_title">OI File Manager ALUF</string>
+	<string name="eula_accept">Acceptă</string>
+	<string name="eula_refuse">Renunță</string>
+
+	<!-- Update -->
+	<string name="update_box_text">Verificați manual existența versiunilor noi sau instalați OI Update pentru noitificări automate. Versiunea curentă: %s</string>
+	<string name="update_check_now">Verifică acum</string>
+	<string name="update_get_updater">Instalează OI Updater</string>
+	<string name="update_error">Download application not available.</string>
+	<string name="update">Verifică versiuni noi</string>
+
+    <!-- About -->
+    <string name="about">Despre</string>
+	<string name="aboutapp_not_available">Version %s\n\nNo compatible extension available to display full info (contact, credits, license).</string>
+    <string name="aboutapp_get">Instalează OI About</string>
+
+
+</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
new file mode 100644
index 0000000..a1360a7
--- /dev/null
+++ b/res/values-ru/strings.xml
@@ -0,0 +1,100 @@
+<?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:
+  Peli https://launchpad.net/~peli0101
+  Vasily Bogantsev https://launchpad.net/~bas-eurogym</string>
+
+    <string name="about_comments">OI File Manager - открытый менеджер файлов интегрирующийся с дргими приложениями.</string>
+	<string name="about_website_label">OI File Manager на OpenIntents</string>
+
+	<!-- ***************************
+	     Applicatio-specific strings
+	     *************************** -->
+    <string name="app_name">OI File Manager</string>
+
+    <string name="menu_new_folder">Новая папка</string>
+    <string name="menu_delete">Удалить</string>
+    <string name="menu_rename">Переименовать</string>
+    <string name="menu_send">Отправить</string>
+    <string name="menu_open">Открыть</string>
+    <string name="menu_move">Переместить</string>
+    <string name="menu_copy">Копировать</string>
+
+    <string name="create_new_folder">Создать новую папку</string>
+    <string name="folder_name">Имя папки</string>
+    <string name="file_name">Имя папки</string>
+    <string name="this_folder_is_empty">Эта папка пуста.</string>
+    <string name="really_delete">Вы точно хотите удалить %s?</string>
+    <string name="file_deleted">Файл удалён.</string>
+    <string name="folder_deleted">Папка удалена.</string>
+    <string name="file_renamed">Файл переименован.</string>
+    <string name="folder_renamed">Папка переименована.</string>
+    <string name="file_moved">Файл перемещён.</string>
+    <string name="folder_moved">Папка перемещена.</string>
+    <string name="file_copied">Файл скопирован.</string>
+    <string name="move_title">Выберите папку куда переместить</string>
+    <string name="move_button">Переместить сюда</string>
+    <string name="copy_title">Выберите папку куда скопировать</string>
+    <string name="copy_button">Скопировать сюда</string>
+
+    <string name="copied_file_name">Копия %s</string>
+    <string name="copied_file_name_2">Копия %d из %s</string>
+
+    <string name="error_creating_new_folder">Невозможно создать новую папку.</string>
+    <string name="error_deleting_file">Невозможно удалить файл.</string>
+    <string name="error_deleting_folder">Невозможно удалить папку '%s'.</string>
+    <string name="error_renaming_file">Невозможно переименовать файл.</string>
+    <string name="error_renaming_folder">Невозможно переименовать папку.</string>
+    <string name="error_moving_file">Невозможно переместить файл.</string>
+    <string name="error_moving_folder">Невозможно переместить папку.</string>
+    <string name="error_copying_file">Невозможно скопировать файл.</string>
+    <string name="error_file_does_not_exists">Файл не существует.</string>
+    <string name="error_deleting_child_file">Невозможно удалить вложенный файл '%s'.</string>
+
+    <string name="send_not_available">Нет приложения для отправки.</string>
+
+    <string name="application_not_available">Приложение недоступно.</string>
+
+	<!-- ***************************
+	     Distribution
+	     *************************** -->
+
+	<!-- EULA -->
+	<string name="eula_title">Лицензионное соглашение OI File Manager</string>
+	<string name="eula_accept">Принять</string>
+	<string name="eula_refuse">Отменить</string>
+
+	<!-- Update -->
+	<string name="update_box_text">Проверяйте обновления вручную или установите OI Update для автоматического уведомления. Текущая версия: %s</string>
+	<string name="update_check_now">Проверить сейчас</string>
+	<string name="update_get_updater">Получить OI Updater.</string>
+	<string name="update_error">Приложение загрузчик отсутствует</string>
+	<string name="update">Проверить обновления</string>
+
+    <!-- About -->
+    <string name="about">О программе</string>
+	<string name="aboutapp_not_available">Версия %s\n\n Отсутствует совместимое расширение для отображения полной информации (контакты, авторы, лицензия).</string>
+    <string name="aboutapp_get">Получить OI About</string>
+
+
+</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 328fb3b..48d4fc3 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -61,13 +61,14 @@
     
     <string name="error_creating_new_folder">无法建立新文件夹</string>
     <string name="error_deleting_file">无法删除文件</string>
-    <string name="error_folder_not_empty">文件夹不为空</string>
+    <string name="error_deleting_folder">Could not delete folder '%s'.</string>
     <string name="error_renaming_file">无法重命名文件</string>
     <string name="error_renaming_folder">无法重命名文件夹</string>
     <string name="error_moving_file">无法移动文件</string>
     <string name="error_moving_folder">无法移动文件夹</string>
     <string name="error_copying_file">无法复制文件</string>
     <string name="error_file_does_not_exists">文件不存在</string>
+    <string name="error_deleting_child_file">Could not delete child file '%s'.</string>
     
     <string name="send_not_available">无法找到用于传送的应用程序</string>
     
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 4d0fbf8..4f9ccbf 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -61,13 +61,14 @@
     
     <string name="error_creating_new_folder">無法建立新資料夾。</string>
     <string name="error_deleting_file">無法刪除檔案。</string>
-    <string name="error_folder_not_empty">資料夾不是空的。</string>
+    <string name="error_deleting_folder">Could not delete folder '%s'.</string>
     <string name="error_renaming_file">檔案無法重新命名。</string>
     <string name="error_renaming_folder">資料夾無法重新命名。</string>
     <string name="error_moving_file">無法移動檔案。</string>
     <string name="error_moving_folder">無法移動資料夾。</string>
     <string name="error_copying_file">無法複製檔案。</string>
     <string name="error_file_does_not_exists">檔案不存在。</string>
+    <string name="error_deleting_child_file">Could not delete child file '%s'.</string>
     
     <string name="send_not_available">找不到傳送用的應用程式。</string>
     
diff --git a/src/org/openintents/filemanager/FileManagerActivity.java b/src/org/openintents/filemanager/FileManagerActivity.java
index b376a21..c3b3109 100644
--- a/src/org/openintents/filemanager/FileManagerActivity.java
+++ b/src/org/openintents/filemanager/FileManagerActivity.java
@@ -1338,6 +1338,35 @@ public class FileManagerActivity extends ListActivity {
 		return super.onKeyDown(keyCode, event);
 	}
 	
+	// For targetSdkVersion="5" or higher, one needs to use the following code instead of the one above:
+	// (See http://android-developers.blogspot.com/2009/12/back-and-other-hard-keys-three-stories.html )
+
+	/*
+	//@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event)  {
+	    if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.ECLAIR
+	            && keyCode == KeyEvent.KEYCODE_BACK
+	            && event.getRepeatCount() == 0) {
+	        // Take care of calling this method on earlier versions of
+	        // the platform where it doesn't exist.
+	        onBackPressed();
+	    }
+
+	    return super.onKeyDown(keyCode, event);
+	}
+
+	//@Override
+	public void onBackPressed() {
+	    // This will be called either automatically for you on 2.0
+	    // or later, or by the code above on earlier versions of the
+	    // platform.
+		if (mStepsBack > 0) {
+			upOneLevel();
+		} else {
+			finish();
+		}
+	}
+	*/
 
     /**
      * This is called after the file manager finished.
-- 
2.11.0