diff --git a/SMBSync2/src/main/java/com/sentaroh/android/SMBSync2/SyncTaskEditor.java b/SMBSync2/src/main/java/com/sentaroh/android/SMBSync2/SyncTaskEditor.java
index 8406d822..0e5fd23f 100644
--- a/SMBSync2/src/main/java/com/sentaroh/android/SMBSync2/SyncTaskEditor.java
+++ b/SMBSync2/src/main/java/com/sentaroh/android/SMBSync2/SyncTaskEditor.java
@@ -3463,29 +3463,6 @@ private void setSpinnerSyncTaskType(Spinner spinnerSyncOption, SyncTaskItem n_st
         adapterSyncOption.notifyDataSetChanged();
     }
 
-    private void setSpinnerTwoWaySyncConflictRule(Spinner spinner, String cv) {
-        CommonUtilities.setSpinnerBackground(mContext, spinner, mGp.isScreenThemeIsLight());
-        final CustomSpinnerAdapter adapter =
-                new CustomSpinnerAdapter(mContext, android.R.layout.simple_spinner_item);
-        adapter.setDropDownViewResource(android.R.layout.select_dialog_singlechoice);
-        spinner.setPrompt(mContext.getString(R.string.msgs_main_sync_profile_dlg_wifi_option_prompt));
-        spinner.setAdapter(adapter);
-        adapter.add(mContext.getString(R.string.msgs_profile_twoway_sync_conflict_copy_rurle_ask_user));
-        adapter.add(mContext.getString(R.string.msgs_profile_twoway_sync_conflict_copy_rurle_copy_newer));
-        adapter.add(mContext.getString(R.string.msgs_profile_twoway_sync_conflict_copy_rurle_copy_older));
-        adapter.add(mContext.getString(R.string.msgs_profile_twoway_sync_conflict_copy_rurle_skip_sync_file));
-
-        int sel = 0;
-        if (cv.equals(SyncTaskItem.SYNC_TASK_TWO_WAY_OPTION_ASK_USER)) sel = 0;
-        else if (cv.equals(SyncTaskItem.SYNC_TASK_TWO_WAY_OPTION_COPY_NEWER)) sel = 1;
-        else if (cv.equals(SyncTaskItem.SYNC_TASK_TWO_WAY_OPTION_COPY_OLDER)) sel = 2;
-        else if (cv.equals(SyncTaskItem.SYNC_TASK_TWO_WAY_OPTION_SKIP_SYNC_FILE)) sel = 3;
-
-        spinner.setSelection(sel);
-
-        adapter.notifyDataSetChanged();
-    }
-
     private void setSpinnerSyncTaskWifiOption(Spinner spinner, String cv) {
         CommonUtilities.setSpinnerBackground(mContext, spinner, mGp.isScreenThemeIsLight());
         final CustomSpinnerAdapter adapter =
@@ -5068,19 +5045,6 @@ static public void showFieldHelp(Activity a, GlobalParameters gp, String title,
         dialog.show();
     }
 
-    private void setTwoWaySyncConflictRuleFromSpinnere(Spinner spinner, SyncTaskItem n_stli) {
-        String so = mContext.getString(R.string.msgs_profile_twoway_sync_conflict_copy_rurle_copy_newer);
-        if (spinner.getSelectedItemPosition()<spinner.getAdapter().getCount()) so=spinner.getSelectedItem().toString();
-        if (so.equals(mContext.getString(R.string.msgs_profile_twoway_sync_conflict_copy_rurle_ask_user)))
-            n_stli.setSyncTwoWayConflictFileRule(SyncTaskItem.SYNC_TASK_TWO_WAY_OPTION_ASK_USER);
-        else if (so.equals(mContext.getString(R.string.msgs_profile_twoway_sync_conflict_copy_rurle_copy_newer)))
-            n_stli.setSyncTwoWayConflictFileRule(SyncTaskItem.SYNC_TASK_TWO_WAY_OPTION_COPY_NEWER);
-        else if (so.equals(mContext.getString(R.string.msgs_profile_twoway_sync_conflict_copy_rurle_copy_older)))
-            n_stli.setSyncTwoWayConflictFileRule(SyncTaskItem.SYNC_TASK_TWO_WAY_OPTION_COPY_OLDER);
-        else if (so.equals(mContext.getString(R.string.msgs_profile_twoway_sync_conflict_copy_rurle_skip_sync_file)))
-            n_stli.setSyncTwoWayConflictFileRule(SyncTaskItem.SYNC_TASK_TWO_WAY_OPTION_SKIP_SYNC_FILE);
-    }
-
     private void setSyncTaskTypeFromSpinnere(Spinner spinner, SyncTaskItem n_stli) {
         String so = null;
 
diff --git a/SMBSync2/src/main/res/values-fr/fr_string_resource.xml b/SMBSync2/src/main/res/values-fr/fr_string_resource.xml
index 5d85d3df..353ee363 100644
--- a/SMBSync2/src/main/res/values-fr/fr_string_resource.xml
+++ b/SMBSync2/src/main/res/values-fr/fr_string_resource.xml
@@ -489,12 +489,6 @@
         <string name="msgs_profile_sync_task_sync_sub_directory_specific">Sélectionner les sous-dossiers</string>
         <string name="msgs_profile_sync_task_sync_use_small_ioarea">Limiter le cache SMB E/S en écriture à 16Ko</string>
         <string name="msgs_progress_spin_dlg_sync_cancel">Annuler</string>
-        <string name="msgs_profile_twoway_sync_conflict_keep_conflict_file">En cas de conflit, garder une copie du fichier remplacé</string>
-        <string name="msgs_profile_twoway_sync_conflict_copy_rurle">Règles de conflit de la sync bidirectionnelle</string>
-        <string name="msgs_profile_twoway_sync_conflict_copy_rurle_ask_user">Demander</string>
-        <string name="msgs_profile_twoway_sync_conflict_copy_rurle_skip_sync_file">Ignorer le fichier</string>
-        <string name="msgs_profile_twoway_sync_conflict_copy_rurle_copy_newer">Garder le fichier le plus récent</string>
-        <string name="msgs_profile_twoway_sync_conflict_copy_rurle_copy_older">Garder le fichier le plus ancien</string>
         <string name="msgs_remote_profile_dlg_logon_cancel">Connexion annulée</string>
         <string name="msgs_remote_profile_dlg_logon_error">Connexion échouée</string>
         <string name="msgs_remote_profile_dlg_logon_success">Connexion réussie</string>
diff --git a/SMBSync2/src/main/res/values-it/it_string_resource.xml b/SMBSync2/src/main/res/values-it/it_string_resource.xml
index b092c360..d68e5d12 100644
--- a/SMBSync2/src/main/res/values-it/it_string_resource.xml
+++ b/SMBSync2/src/main/res/values-it/it_string_resource.xml
@@ -489,12 +489,6 @@
         <string name="msgs_profile_sync_task_sync_sub_directory_specific">Seleziona sottocartelle</string>
         <string name="msgs_profile_sync_task_sync_use_small_ioarea">Limita buffer scrittura SMB I/O a 16 KB</string>
         <string name="msgs_progress_spin_dlg_sync_cancel">Annulla</string>
-        <string name="msgs_profile_twoway_sync_conflict_keep_conflict_file">In sync doppia-via, mantieni una copia dei file sovrascritti in caso di conflitti</string>
-        <string name="msgs_profile_twoway_sync_conflict_copy_rurle">Regole sync Doppia-via in caso di conflitto file</string>
-        <string name="msgs_profile_twoway_sync_conflict_copy_rurle_ask_user">Chiedi all\'utente</string>
-        <string name="msgs_profile_twoway_sync_conflict_copy_rurle_skip_sync_file">Ignora il file</string>
-        <string name="msgs_profile_twoway_sync_conflict_copy_rurle_copy_newer">Mantieni nuovi file</string>
-        <string name="msgs_profile_twoway_sync_conflict_copy_rurle_copy_older">Mantieni vecchi file</string>
         <string name="msgs_remote_profile_dlg_logon_cancel">Logon annullato</string>
         <string name="msgs_remote_profile_dlg_logon_error">Logon fallito</string>
         <string name="msgs_remote_profile_dlg_logon_success">Logon riuscito</string>
diff --git a/SMBSync2/src/main/res/values-ja/ja_string_resource.xml b/SMBSync2/src/main/res/values-ja/ja_string_resource.xml
index 927efd1b..f73af26a 100644
--- a/SMBSync2/src/main/res/values-ja/ja_string_resource.xml
+++ b/SMBSync2/src/main/res/values-ja/ja_string_resource.xml
@@ -489,12 +489,6 @@
         <string name="msgs_profile_sync_task_sync_sub_directory_specific">サブディレクトリーを選択する</string>
         <string name="msgs_profile_sync_task_sync_use_small_ioarea">SMBフォルダー書き込み時のIOバッファーを16KBに制限する</string>
         <string name="msgs_progress_spin_dlg_sync_cancel">キャンセル</string>
-        <string name="msgs_profile_twoway_sync_conflict_keep_conflict_file">双方向同期の競合ファイルを保存する</string>
-        <string name="msgs_profile_twoway_sync_conflict_copy_rurle">双方向同期ルール</string>
-        <string name="msgs_profile_twoway_sync_conflict_copy_rurle_ask_user">ユーザーに問い合わせる</string>
-        <string name="msgs_profile_twoway_sync_conflict_copy_rurle_skip_sync_file">ファイル同期をスキップする</string>
-        <string name="msgs_profile_twoway_sync_conflict_copy_rurle_copy_newer">新しい日付のファイルをコピーする</string>
-        <string name="msgs_profile_twoway_sync_conflict_copy_rurle_copy_older">古い日付のファイルをコピーする</string>
         <string name="msgs_remote_profile_dlg_logon_cancel">ログオンが中止されました</string>
         <string name="msgs_remote_profile_dlg_logon_error">ログオンエラーが発生しました</string>
         <string name="msgs_remote_profile_dlg_logon_success">ログオンが正常に完了しました</string>
diff --git a/SMBSync2/src/main/res/values-ru/ru_string_resource.xml b/SMBSync2/src/main/res/values-ru/ru_string_resource.xml
index 004523b4..05844525 100644
--- a/SMBSync2/src/main/res/values-ru/ru_string_resource.xml
+++ b/SMBSync2/src/main/res/values-ru/ru_string_resource.xml
@@ -489,12 +489,6 @@
         <string name="msgs_profile_sync_task_sync_sub_directory_specific">Выберите подкаталоги</string>
         <string name="msgs_profile_sync_task_sync_use_small_ioarea">Ограничить буфер записи ввода / вывода SMB 16 КБ</string>
         <string name="msgs_progress_spin_dlg_sync_cancel">Отмена</string>
-        <string name="msgs_profile_twoway_sync_conflict_keep_conflict_file">Хранить файл конфликта двусторонней синхронизации</string>
-        <string name="msgs_profile_twoway_sync_conflict_copy_rurle">Правила двусторонней синхронизации</string>
-        <string name="msgs_profile_twoway_sync_conflict_copy_rurle_ask_user">Спросите пользователя</string>
-        <string name="msgs_profile_twoway_sync_conflict_copy_rurle_skip_sync_file">Пропустить синхронизацию файлов</string>
-        <string name="msgs_profile_twoway_sync_conflict_copy_rurle_copy_newer">Copy new date files</string>
-        <string name="msgs_profile_twoway_sync_conflict_copy_rurle_copy_older">Copy old date files</string>
         <string name="msgs_remote_profile_dlg_logon_cancel">Вход отменен</string>
         <string name="msgs_remote_profile_dlg_logon_error">Ошибка входа</string>
         <string name="msgs_remote_profile_dlg_logon_success">Вход успешный</string>
diff --git a/SMBSync2/src/main/res/values-zh/zh_string_resource.xml b/SMBSync2/src/main/res/values-zh/zh_string_resource.xml
index ebc4b8fa..72032f26 100644
--- a/SMBSync2/src/main/res/values-zh/zh_string_resource.xml
+++ b/SMBSync2/src/main/res/values-zh/zh_string_resource.xml
@@ -489,12 +489,6 @@
         <string name="msgs_profile_sync_task_sync_sub_directory_specific">选择子目录</string>
         <string name="msgs_profile_sync_task_sync_use_small_ioarea">将SMB I / O写缓冲区限制为16 KB</string>
         <string name="msgs_progress_spin_dlg_sync_cancel">取消</string>
-        <string name="msgs_profile_twoway_sync_conflict_keep_conflict_file">在双向同步中，如果发生冲突，请保留覆盖文件的副本</string>
-        <string name="msgs_profile_twoway_sync_conflict_copy_rurle">文件冲突时的双向同步规则</string>
-        <string name="msgs_profile_twoway_sync_conflict_copy_rurle_ask_user">询问用户</string>
-        <string name="msgs_profile_twoway_sync_conflict_copy_rurle_skip_sync_file">忽略文件</string>
-        <string name="msgs_profile_twoway_sync_conflict_copy_rurle_copy_newer">保留较新的文件</string>
-        <string name="msgs_profile_twoway_sync_conflict_copy_rurle_copy_older">保留较旧的文件</string>
         <string name="msgs_remote_profile_dlg_logon_cancel">登录已取消</string>
         <string name="msgs_remote_profile_dlg_logon_error">登录失败</string>
         <string name="msgs_remote_profile_dlg_logon_success">登录成功</string>
diff --git a/SMBSync2/src/main/res/values/en_string_resource.xml b/SMBSync2/src/main/res/values/en_string_resource.xml
index 514e7e7c..a324a520 100644
--- a/SMBSync2/src/main/res/values/en_string_resource.xml
+++ b/SMBSync2/src/main/res/values/en_string_resource.xml
@@ -489,12 +489,6 @@
         <string name="msgs_profile_sync_task_sync_sub_directory_specific">Select subdirectories</string>
         <string name="msgs_profile_sync_task_sync_use_small_ioarea">Limit SMB I/O write buffer to 16 KB</string>
         <string name="msgs_progress_spin_dlg_sync_cancel">Cancel</string>
-        <string name="msgs_profile_twoway_sync_conflict_keep_conflict_file">In two-way sync, keep a copy of the overwritten file in case of conflict</string>
-        <string name="msgs_profile_twoway_sync_conflict_copy_rurle">Two-way sync rules in case of conflicting files</string>
-        <string name="msgs_profile_twoway_sync_conflict_copy_rurle_ask_user">Ask user</string>
-        <string name="msgs_profile_twoway_sync_conflict_copy_rurle_skip_sync_file">Ignore the file</string>
-        <string name="msgs_profile_twoway_sync_conflict_copy_rurle_copy_newer">Keep newer file</string>
-        <string name="msgs_profile_twoway_sync_conflict_copy_rurle_copy_older">Keep older file</string>
         <string name="msgs_remote_profile_dlg_logon_cancel">Logon cancelled</string>
         <string name="msgs_remote_profile_dlg_logon_error">Logon Failed</string>
         <string name="msgs_remote_profile_dlg_logon_success">Logon Successful</string>
diff --git a/debug_apk/SMBSync2_debug.apk b/debug_apk/SMBSync2_debug.apk
index f83df6dc..70fc9fdf 100644
Binary files a/debug_apk/SMBSync2_debug.apk and b/debug_apk/SMBSync2_debug.apk differ
diff --git a/message_translation.xlsm b/message_translation.xlsm
index e393b848..063542ea 100644
Binary files a/message_translation.xlsm and b/message_translation.xlsm differ