mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 15:15:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

Conflict Dialog Fix

Browse source
This commit is contained in:
Andy Scherzinger 2015-08-18 13:57:09 +02:00
parent a393531774
commit e79f92f566
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
res/values-de-rDE/strings.xml
View file

@ -256,9 +256,9 @@
<string name="instant_upload_path">/SofortUpload</string>
<string name="conflict_title">Dateikonflikt</string>
<string name="conflict_message">Welche Datei möchtest du behalten? Wenn du beide Versionen auswählst, wird der lokalen Datei eine Zahl am Ende Ihres Dateiname angehangen.</string>
<string name="conflict_keep_both">Beide behalten</string>
<string name="conflict_use_local_version">Benutze lokale Version</string>
<string name="conflict_use_server_version">Benutze Version auf dem Server</string>
<string name="conflict_keep_both">Beide</string>
<string name="conflict_use_local_version">lokale Version</string>
<string name="conflict_use_server_version">Server Version</string>
<string name="preview_image_description">Bildvorschau</string>
<string name="preview_image_error_unknown_format">Dieses Bild kann nicht angezeigt werden</string>
<string name="error__upload__local_file_not_copied">%1$s konnte nicht in den lokalen %2$s Ordner kopiert werden</string>

4
res/values/strings.xml
View file

@ -269,8 +269,8 @@
<string name="conflict_title">File conflict</string>
<string name="conflict_message">Which files do you want to keep? If you select both versions, the local file will have a number added to its name.</string>
<string name="conflict_keep_both">Keep both</string>
<string name="conflict_use_local_version">Use local version</string>
<string name="conflict_use_server_version">Use server version</string>
<string name="conflict_use_local_version">local version</string>
<string name="conflict_use_server_version">server version</string>
<string name="preview_image_description">Image preview</string>
<string name="preview_image_error_unknown_format">This image cannot be shown</string>

4
src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
View file

@ -60,8 +60,8 @@ public class ConflictsResolveDialog extends DialogFragment {
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
String remotepath = getArguments().getString("remotepath");
return new AlertDialog.Builder(getActivity())
.setIcon(DisplayUtils.getSeasonalIconId())
return new AlertDialog.Builder(getActivity(), R.style.Theme_ownCloud_Dialog)
.setIcon(R.drawable.ic_warning)
.setTitle(R.string.conflict_title)
.setMessage(String.format(getString(R.string.conflict_message), remotepath))
.setPositiveButton(R.string.conflict_use_local_version,