re-added values-tzl

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / dialog / ConflictsResolveDialog.java

diff --git a/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java b/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
index d322a8e..3849407 100644 (file)
--- a/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
+++ b/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
@@ -63,7 +63,7 @@ public class ConflictsResolveDialog extends DialogFragment {
                    .setIcon(DisplayUtils.getSeasonalIconId())
                    .setTitle(R.string.conflict_title)
                    .setMessage(String.format(getString(R.string.conflict_message), remotepath))
                    .setIcon(DisplayUtils.getSeasonalIconId())
                    .setTitle(R.string.conflict_title)
                    .setMessage(String.format(getString(R.string.conflict_message), remotepath))

-                   .setPositiveButton(R.string.conflict_overwrite,
+                   .setPositiveButton(R.string.conflict_use_local_version,

                        new DialogInterface.OnClickListener() {
 
                            @Override
                        new DialogInterface.OnClickListener() {
 
                            @Override


@@ -80,7 +80,7 @@ public class ConflictsResolveDialog extends DialogFragment {
                                     mListener.conflictDecisionMade(Decision.KEEP_BOTH);
                             }
                         })
                                     mListener.conflictDecisionMade(Decision.KEEP_BOTH);
                             }
                         })

-                   .setNegativeButton(R.string.conflict_dont_upload,
+                   .setNegativeButton(R.string.conflict_use_server_version,

                        new DialogInterface.OnClickListener() {
                            @Override
                            public void onClick(DialogInterface dialog, int which) {
                        new DialogInterface.OnClickListener() {
                            @Override
                            public void onClick(DialogInterface dialog, int which) {