mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-20 16:02:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

Change the wording

Browse source
This commit is contained in:
Mario Danic 2017-01-23 12:47:30 +01:00 committed by AndyScherzinger
parent 1eeb4efc1e
commit d9fa7b616b
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
res/values-en-rGB/strings.xml
View file

@ -313,9 +313,10 @@
<string name="conflict_keep_both">Keep both</string> <string name="conflict_keep_both">Keep both</string>
<string name="conflict_use_local_version">local version</string> <string name="conflict_use_local_version">local version</string>
<string name="conflict_use_server_version">server version</string> <string name="conflict_use_server_version">server version</string>
<string name="preview_sorry">Sorry about that!</string>
<string name="preview_image_description">Image preview</string> <string name="preview_image_description">Image preview</string>
<string name="preview_image_error_unknown_format">This image cannot be shown</string> <string name="preview_image_error_unknown_format">Image can\'t be shown</string>
<string name="error__upload__local_file_not_copied">%1$s could not be copied to %2$s local folder</string> <string name="error__upload__local_file_not_copied">%1$s could not be copied to %2$s local folder</string>
<string name="prefs_instant_upload_path_title">Instant upload folder</string> <string name="prefs_instant_upload_path_title">Instant upload folder</string>

5
res/values/strings.xml
View file

@ -313,9 +313,10 @@
<string name="conflict_keep_both">Keep both</string> <string name="conflict_keep_both">Keep both</string>
<string name="conflict_use_local_version">local version</string> <string name="conflict_use_local_version">local version</string>
<string name="conflict_use_server_version">server version</string> <string name="conflict_use_server_version">server version</string>
<string name="preview_sorry">Sorry about that!</string>
<string name="preview_image_description">Image preview</string> <string name="preview_image_description">Image preview</string>
<string name="preview_image_error_unknown_format">This image cannot be shown</string> <string name="preview_image_error_unknown_format">Image can\'t be shown</string>
<string name="error__upload__local_file_not_copied">%1$s could not be copied to %2$s local folder</string> <string name="error__upload__local_file_not_copied">%1$s could not be copied to %2$s local folder</string>
<string name="prefs_instant_upload_path_title">Instant upload folder</string> <string name="prefs_instant_upload_path_title">Instant upload folder</string>

5
src/com/owncloud/android/ui/preview/PreviewImageFragment.java
View file

@ -554,7 +554,7 @@ public class PreviewImageFragment extends FileFragment {
if (getActivity() != null && (getActivity() instanceof PreviewImageActivity)) { if (getActivity() != null && (getActivity() instanceof PreviewImageActivity)) {
((PreviewImageActivity) getActivity()).toggleFullScreen(); ((PreviewImageActivity) getActivity()).toggleFullScreen();
} }
setMessageForMultiList(mErrorMessageId, R.drawable.file_image); setMessageForMultiList(mErrorMessageId, R.string.preview_sorry, R.drawable.file_image);
} }
} }
@ -568,9 +568,10 @@ public class PreviewImageFragment extends FileFragment {
} }
} }
public void setMessageForMultiList(@StringRes int headline, @DrawableRes int icon) { public void setMessageForMultiList(@StringRes int headline, @StringRes int message, @DrawableRes int icon) {
if (mMultiListContainer != null && mMultiListMessage != null) { if (mMultiListContainer != null && mMultiListMessage != null) {
mMultiListHeadline.setText(headline); mMultiListHeadline.setText(headline);
mMultiListMessage.setText(message);
mMultiListIcon.setImageResource(icon); mMultiListIcon.setImageResource(icon);
mMultiListIcon.setVisibility(View.VISIBLE); mMultiListIcon.setVisibility(View.VISIBLE);