diff --git a/.gitignore b/.gitignore index 7195b9c5a63..dcc628af0b1 100644 --- a/.gitignore +++ b/.gitignore @@ -8,19 +8,11 @@ # Java class files *.class -# generated files -bin/ -build/ -*.iml -gen/ -target/ - # Local configuration files (sdk path, etc) local.properties oc_framework/local.properties oc_framework-test-project/local.properties tests/local.properties -lint.xml # Mac .DS_Store files .DS_Store @@ -33,13 +25,15 @@ tests/proguard-project.txt # Android Studio and Gradle specific entries .gradle -.idea *.iml build # android sdk captures folder captures +# ignore lint html and xml output +lint-*ml + !.idea/ .idea/* !.idea/codeStyles/ diff --git a/owncloud-android-library b/owncloud-android-library index 400a726b3df..66c8b906fac 160000 --- a/owncloud-android-library +++ b/owncloud-android-library @@ -1 +1 @@ -Subproject commit 400a726b3df4187dc982a7cb0d8d353a09a5bbdb +Subproject commit 66c8b906fac5565199f753242b215009a62cab5f diff --git a/owncloudApp/build.gradle b/owncloudApp/build.gradle index 34deddc9660..cfa14e11623 100644 --- a/owncloudApp/build.gradle +++ b/owncloudApp/build.gradle @@ -130,8 +130,11 @@ android { } lintOptions { - abortOnError false - disable 'MissingTranslation' + abortOnError true + ignoreWarnings false + + xmlReport false + htmlOutput file("../lint-app-report.html") } packagingOptions { diff --git a/owncloudApp/lint.xml b/owncloudApp/lint.xml new file mode 100644 index 00000000000..db997a5369e --- /dev/null +++ b/owncloudApp/lint.xml @@ -0,0 +1,4 @@ + + + + diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/camerauploads/OCSettingsCameraUploadsTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/camerauploads/OCSettingsCameraUploadsTest.kt index b279a948879..83210ec37f5 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/camerauploads/OCSettingsCameraUploadsTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/camerauploads/OCSettingsCameraUploadsTest.kt @@ -53,8 +53,8 @@ class OCSettingsCameraUploadsTest { private val context = InstrumentationRegistry.getInstrumentation().targetContext - private val CAMERA_PICTURE_UPLOADS = "camera_picture_uploads" - private val CAMERA_VIDEO_UPLOADS = "camera_video_uploads" + private val cameraPictureUploads = "camera_picture_uploads" + private val cameraVideoUploads = "camera_video_uploads" private lateinit var mPrefCameraPictureUploads: CheckBoxPreference private lateinit var mPrefCameraVideoUploads: CheckBoxPreference @@ -62,11 +62,11 @@ class OCSettingsCameraUploadsTest { @Before fun setUp() { - mPrefCameraPictureUploads = activityRule.activity.findPreference(CAMERA_PICTURE_UPLOADS) as CheckBoxPreference - mPrefCameraVideoUploads = activityRule.activity.findPreference(CAMERA_VIDEO_UPLOADS) as CheckBoxPreference + mPrefCameraPictureUploads = activityRule.activity.findPreference(cameraPictureUploads) as CheckBoxPreference + mPrefCameraVideoUploads = activityRule.activity.findPreference(cameraVideoUploads) as CheckBoxPreference //Only interested in "Camera Uploads" section, so we can get rid of the other categories. - val preferenceScreen = activityRule.activity.getPreferenceScreen() as PreferenceScreen + val preferenceScreen = activityRule.activity.preferenceScreen as PreferenceScreen val securityCategory = activityRule.activity.findPreference("security_category") as PreferenceCategory val moreCategory = @@ -123,7 +123,7 @@ class OCSettingsCameraUploadsTest { @Test fun enablePictureUploads() { - onView(withText(R.string.prefs_camera_picture_upload)).perform(click()); + onView(withText(R.string.prefs_camera_picture_upload)).perform(click()) onView(withText(android.R.string.ok)).perform(click()) //Asserts assertTrue(mPrefCameraPictureUploads.isChecked) @@ -133,7 +133,7 @@ class OCSettingsCameraUploadsTest { @Test fun enableVideoUploads() { - onView(withText(R.string.prefs_camera_video_upload)).perform(click()); + onView(withText(R.string.prefs_camera_video_upload)).perform(click()) onView(withText(android.R.string.ok)).perform(click()) //Asserts assertTrue(mPrefCameraVideoUploads.isChecked) @@ -144,8 +144,8 @@ class OCSettingsCameraUploadsTest { @Test fun disablePictureUploadsAccept() { enableCameraPictureUploads() - onView(withText(R.string.prefs_camera_picture_upload)).perform(click()); - onView(withText(R.string.common_yes)).perform(click()); + onView(withText(R.string.prefs_camera_picture_upload)).perform(click()) + onView(withText(R.string.common_yes)).perform(click()) //Asserts assertFalse(mPrefCameraPictureUploads.isChecked) onView(withText(R.string.prefs_camera_picture_upload_path_title)).check(doesNotExist()) @@ -155,8 +155,8 @@ class OCSettingsCameraUploadsTest { @Test fun disablePictureUploadsRefuse() { enableCameraPictureUploads() - onView(withText(R.string.prefs_camera_picture_upload)).perform(click()); - onView(withText(R.string.common_no)).perform(click()); + onView(withText(R.string.prefs_camera_picture_upload)).perform(click()) + onView(withText(R.string.common_no)).perform(click()) //Asserts assertTrue(mPrefCameraPictureUploads.isChecked) onView(withText(R.string.prefs_camera_picture_upload_path_title)).check(matches(isDisplayed())) @@ -166,8 +166,8 @@ class OCSettingsCameraUploadsTest { @Test fun disableVideoUploadsAccept() { enableCameraVideoUploads() - onView(withText(R.string.prefs_camera_video_upload)).perform(click()); - onView(withText(R.string.common_yes)).perform(click()); + onView(withText(R.string.prefs_camera_video_upload)).perform(click()) + onView(withText(R.string.common_yes)).perform(click()) //Asserts assertFalse(mPrefCameraVideoUploads.isChecked) onView(withText(R.string.prefs_camera_video_upload_path_title)).check(doesNotExist()) @@ -177,8 +177,8 @@ class OCSettingsCameraUploadsTest { @Test fun disableVideoUploadsRefuse() { enableCameraVideoUploads() - onView(withText(R.string.prefs_camera_video_upload)).perform(click()); - onView(withText(R.string.common_no)).perform(click()); + onView(withText(R.string.prefs_camera_video_upload)).perform(click()) + onView(withText(R.string.common_no)).perform(click()) //Asserts assertTrue(mPrefCameraVideoUploads.isChecked) onView(withText(R.string.prefs_camera_video_upload_path_title)).check(matches(isDisplayed())) @@ -205,7 +205,7 @@ class OCSettingsCameraUploadsTest { enableCameraPictureUploads() val cameraFolder = Environment.getExternalStoragePublicDirectory( Environment.DIRECTORY_DCIM - ).absolutePath + "/Camera"; + ).absolutePath + "/Camera" Intents.init() //Asserts onView( @@ -226,19 +226,19 @@ class OCSettingsCameraUploadsTest { @Test fun switchOriginalFileWillBe() { enableCameraPictureUploads() - onData(PreferenceMatchers.withTitle(R.string.prefs_camera_upload_behaviour_title)).perform(click()); + onData(PreferenceMatchers.withTitle(R.string.prefs_camera_upload_behaviour_title)).perform(click()) onView(withText(R.string.pref_behaviour_entries_move)).perform(click()) //Asserts onView(withText(R.string.pref_behaviour_entries_move)).check(matches(isDisplayed())) } - fun enableCameraPictureUploads() { - onView(withText(R.string.prefs_camera_picture_upload)).perform(click()); + private fun enableCameraPictureUploads() { + onView(withText(R.string.prefs_camera_picture_upload)).perform(click()) onView(withText(android.R.string.ok)).perform(click()) } - fun enableCameraVideoUploads() { - onView(withText(R.string.prefs_camera_video_upload)).perform(click()); + private fun enableCameraVideoUploads() { + onView(withText(R.string.prefs_camera_video_upload)).perform(click()) onView(withText(android.R.string.ok)).perform(click()) } } diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/camerauploads/OCSettingsLocalFolderPickerTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/camerauploads/OCSettingsLocalFolderPickerTest.kt index 6bbac84d3d0..d7ca263f6cf 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/camerauploads/OCSettingsLocalFolderPickerTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/camerauploads/OCSettingsLocalFolderPickerTest.kt @@ -40,7 +40,7 @@ class OCSettingsLocalFolderPickerTest { @JvmField val activityRule = ActivityTestRule(LocalFolderPickerActivity::class.java, true, true) - val errorMessage = "Activity not finished" + private val errorMessage = "Activity not finished" @Test fun localFolderPickerView() { diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/more/OCSettingsMoreTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/more/OCSettingsMoreTest.kt index fd0abd64ff7..e38e5de7459 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/more/OCSettingsMoreTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/more/OCSettingsMoreTest.kt @@ -61,7 +61,7 @@ class OCSettingsMoreTest { Intents.init() //Only interested in "More" section, so we can get rid of the other categories. SmoothScroll is not //working fine to reach the bottom of the screen, so this approach was taken to display the section - val preferenceScreen = activityRule.activity.getPreferenceScreen() as PreferenceScreen + val preferenceScreen = activityRule.activity.preferenceScreen as PreferenceScreen val cameraUploadsCategory = activityRule.activity.findPreference("camera_uploads_category") as PreferenceCategory val securityCategory = @@ -84,7 +84,7 @@ class OCSettingsMoreTest { fun helpOptionOpensWeb() { onView(withText(R.string.prefs_help)).perform(click()) val intentResult = ActivityResult(Activity.RESULT_OK, Intent()) - intending(hasAction(Intent.ACTION_VIEW)).respondWith(intentResult); + intending(hasAction(Intent.ACTION_VIEW)).respondWith(intentResult) intended(hasData(activityRule.activity.getString(R.string.url_help))) } @@ -97,7 +97,7 @@ class OCSettingsMoreTest { @Test fun davx5OpensLink() { val intentResult = ActivityResult(Activity.RESULT_OK, Intent()) - intending(hasAction(Intent.ACTION_VIEW)).respondWith(intentResult); + intending(hasAction(Intent.ACTION_VIEW)).respondWith(intentResult) onView(withText(R.string.prefs_sync_calendar_contacts)).perform(click()) intended(hasData(activityRule.activity.getString(R.string.url_sync_calendar_contacts))) } @@ -110,7 +110,7 @@ class OCSettingsMoreTest { @Test fun recommendOpenSender() { val intentResult = ActivityResult(Activity.RESULT_OK, Intent()) - intending(hasAction(Intent.ACTION_SENDTO)).respondWith(intentResult); + intending(hasAction(Intent.ACTION_SENDTO)).respondWith(intentResult) onView(withText(R.string.prefs_recommend)).perform(click()) intended( allOf( @@ -143,7 +143,7 @@ class OCSettingsMoreTest { @Test fun feedbackOpenSender() { val intentResult = ActivityResult(Activity.RESULT_OK, Intent()) - intending(hasAction(Intent.ACTION_SENDTO)).respondWith(intentResult); + intending(hasAction(Intent.ACTION_SENDTO)).respondWith(intentResult) onView(withText(R.string.drawer_feedback)).perform(click()) intended( allOf( diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/OCSettingsPasscodeTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/OCSettingsPasscodeTest.kt index cdfa1041a84..a656fc03b4f 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/OCSettingsPasscodeTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/OCSettingsPasscodeTest.kt @@ -50,14 +50,14 @@ class OCSettingsPasscodeTest { @JvmField val activityRule = ActivityTestRule(PassCodeActivity::class.java, true, false) - val intent = Intent() - val errorMessage = "PassCode Activity error" - private val KEY_PASSCODE = "KEY_PASSCODE" + private val intent = Intent() + private val errorMessage = "PassCode Activity error" + private val keyPassCode = "KEY_PASSCODE" private val context = InstrumentationRegistry.getInstrumentation().targetContext - private val DEFAULT_PASSCODE = arrayOf('1', '1', '1', '1') - private val WRONG_PASSCODE = arrayOf('1', '1', '1', '2') - private val PASSCODE_TOSAVE = "1111" + private val defaultPassCode = arrayOf('1', '1', '1', '1') + private val wrongPassCode = arrayOf('1', '1', '1', '2') + private val passCodeToSave = "1111" @After fun tearDown() { @@ -87,7 +87,7 @@ class OCSettingsPasscodeTest { openPasscodeActivity(PassCodeActivity.ACTION_REQUEST_WITH_RESULT) //First typing - typePasscode(DEFAULT_PASSCODE) + typePasscode(defaultPassCode) onView(withText(R.string.pass_code_reenter_your_pass_code)).check(matches(isDisplayed())) onView(withText(R.string.pass_code_configure_your_pass_code)).check(doesNotExist()) @@ -99,13 +99,13 @@ class OCSettingsPasscodeTest { openPasscodeActivity(PassCodeActivity.ACTION_REQUEST_WITH_RESULT) //First typing - typePasscode(DEFAULT_PASSCODE) + typePasscode(defaultPassCode) //Second typing - typePasscode(DEFAULT_PASSCODE) + typePasscode(defaultPassCode) //Checking that the setResult returns the typed passcode assertThat(activityRule.activityResult, hasResultCode(Activity.RESULT_OK)) - assertThat(activityRule.activityResult, hasResultData(hasExtra(KEY_PASSCODE, PASSCODE_TOSAVE))) + assertThat(activityRule.activityResult, hasResultData(hasExtra(keyPassCode, passCodeToSave))) assertTrue(errorMessage, activityRule.activity.isFinishing) } @@ -117,9 +117,9 @@ class OCSettingsPasscodeTest { openPasscodeActivity(PassCodeActivity.ACTION_REQUEST_WITH_RESULT) //First typing - typePasscode(DEFAULT_PASSCODE) + typePasscode(defaultPassCode) //Second typing - typePasscode(WRONG_PASSCODE) + typePasscode(wrongPassCode) onView(withText(R.string.pass_code_reenter_your_pass_code)).check(doesNotExist()) onView(withText(R.string.pass_code_configure_your_pass_code)).check(matches(isDisplayed())) @@ -146,7 +146,7 @@ class OCSettingsPasscodeTest { openPasscodeActivity(PassCodeActivity.ACTION_REQUEST_WITH_RESULT) //First typing - typePasscode(DEFAULT_PASSCODE) + typePasscode(defaultPassCode) onView(withId(R.id.txt0)).perform(replaceText("1")) onView(withId(R.id.txt1)).perform(replaceText("1")) @@ -169,13 +169,13 @@ class OCSettingsPasscodeTest { @Test fun deletePasscodeCorrect() { //Save a passcode in Preferences - storePasscode(PASSCODE_TOSAVE) + storePasscode(passCodeToSave) //Open Activity in passcode deletion mode openPasscodeActivity(PassCodeActivity.ACTION_CHECK_WITH_RESULT) //Type correct passcode - typePasscode(DEFAULT_PASSCODE) + typePasscode(defaultPassCode) assertTrue(errorMessage, activityRule.activity.isFinishing) } @@ -183,13 +183,13 @@ class OCSettingsPasscodeTest { @Test fun deletePasscodeIncorrect() { //Save a passcode in Preferences - storePasscode(PASSCODE_TOSAVE) + storePasscode(passCodeToSave) //Open Activity in passcode deletion mode openPasscodeActivity(PassCodeActivity.ACTION_CHECK_WITH_RESULT) //Type incorrect passcode - typePasscode(WRONG_PASSCODE) + typePasscode(wrongPassCode) onView(withText(R.string.pass_code_enter_pass_code)).check(matches(isDisplayed())) } @@ -206,8 +206,8 @@ class OCSettingsPasscodeTest { onView(withId(R.id.txt3)).perform(replaceText(digits[3].toString())) } - private fun storePasscode(passcode: String = PASSCODE_TOSAVE) { - val appPrefs = PreferenceManager.getDefaultSharedPreferences(context).edit(); + private fun storePasscode(passcode: String = passCodeToSave) { + val appPrefs = PreferenceManager.getDefaultSharedPreferences(context).edit() for (i in 1..4) { appPrefs.putString( PassCodeActivity.PREFERENCE_PASSCODE_D + i, diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/OCSettingsPatternLockTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/OCSettingsPatternLockTest.kt index 5069a789e52..98cfd81a51d 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/OCSettingsPatternLockTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/OCSettingsPatternLockTest.kt @@ -39,11 +39,10 @@ class OCSettingsPatternLockTest { @Rule @JvmField val activityRule = ActivityTestRule(PatternLockActivity::class.java, true, false) - val errorMessage = "PatternLock Activity error" - val intent = Intent() + private val intent = Intent() private val context = InstrumentationRegistry.getInstrumentation().targetContext - private val PATTERN_TOSAVE = "1234" + private val patternToSave = "1234" @After fun tearDown() { @@ -75,8 +74,8 @@ class OCSettingsPatternLockTest { } private fun storePattern() { - val appPrefs = PreferenceManager.getDefaultSharedPreferences(context).edit(); - appPrefs.putString(PatternLockActivity.KEY_PATTERN, PATTERN_TOSAVE) + val appPrefs = PreferenceManager.getDefaultSharedPreferences(context).edit() + appPrefs.putString(PatternLockActivity.KEY_PATTERN, patternToSave) appPrefs.putBoolean(PatternLockActivity.PREFERENCE_SET_PATTERN, true) appPrefs.apply() } diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/OCSettingsSecurityTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/OCSettingsSecurityTest.kt index 286d99b6048..03e2be5eeac 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/OCSettingsSecurityTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/OCSettingsSecurityTest.kt @@ -63,19 +63,19 @@ class OCSettingsSecurityTest { private val context = InstrumentationRegistry.getInstrumentation().targetContext - private val KEY_CHECK_RESULT = "KEY_CHECK_RESULT" - private val KEY_PASSCODE = "KEY_PASSCODE" - private val KEY_PATTERN = "KEY_PATTERN" - private val KEY_CHECK_PATTERN_RESULT = "KEY_CHECK_PATTERN_RESULT" + private val keyCheckResult = "KEY_CHECK_RESULT" + private val keyPassCode = "KEY_PASSCODE" + private val keyPattern = "KEY_PATTERN" + private val keyCheckPatternResult = "KEY_CHECK_PATTERN_RESULT" - private val PASSCODE_VALUE = "1111" - private val PATTERN_VALUE = "1234" + private val passCodeValue = "1111" + private val patternValue = "1234" @Before fun setUp() { //Only interested in "More" section, so we can get rid of the other categories. SmoothScroll is not //working fine to reach the bottom of the screen, so this approach was taken to display the section - val preferenceScreen = activityRule.activity.getPreferenceScreen() as PreferenceScreen + val preferenceScreen = activityRule.activity.preferenceScreen as PreferenceScreen val cameraUploadsCategory = activityRule.activity.findPreference("camera_uploads_category") as PreferenceCategory val moreCategory = @@ -124,9 +124,9 @@ class OCSettingsSecurityTest { @Test fun passcodeLockEnabled() { val result = Intent() - result.putExtra(KEY_PASSCODE, PASSCODE_VALUE) + result.putExtra(keyPassCode, passCodeValue) val intentResult = Instrumentation.ActivityResult(Activity.RESULT_OK, result) - intending(hasAction(PassCodeActivity.ACTION_REQUEST_WITH_RESULT)).respondWith(intentResult); + intending(hasAction(PassCodeActivity.ACTION_REQUEST_WITH_RESULT)).respondWith(intentResult) onView(withText(R.string.prefs_passcode)).perform(click()) assertTrue(mPrefPasscode.isChecked) onView(withText(R.string.pass_code_stored)).check(matches(isDisplayed())) @@ -135,7 +135,7 @@ class OCSettingsSecurityTest { @Test fun patternLockEnabled() { val result = Intent() - result.putExtra(KEY_PATTERN, PATTERN_VALUE) + result.putExtra(keyPattern, patternValue) val intentResult = Instrumentation.ActivityResult(Activity.RESULT_OK, result) intending(hasAction(PatternLockActivity.ACTION_REQUEST_WITH_RESULT)).respondWith(intentResult) onView(withText(R.string.prefs_pattern)).perform(click()) @@ -173,7 +173,7 @@ class OCSettingsSecurityTest { fun disablePasscode() { firstEnablePasscode() val result = Intent() - result.putExtra(KEY_CHECK_RESULT, true) + result.putExtra(keyCheckResult, true) val intentResult = Instrumentation.ActivityResult(Activity.RESULT_OK, result) intending(hasAction(PatternLockActivity.ACTION_CHECK_WITH_RESULT)).respondWith(intentResult) onView(withText(R.string.prefs_passcode)).perform(click()) @@ -186,7 +186,7 @@ class OCSettingsSecurityTest { fun disablePattern() { firstEnablePattern() val result = Intent() - result.putExtra(KEY_CHECK_PATTERN_RESULT, true) + result.putExtra(keyCheckPatternResult, true) val intentResult = Instrumentation.ActivityResult(Activity.RESULT_OK, result) intending(hasAction(PatternLockActivity.ACTION_CHECK_WITH_RESULT)).respondWith(intentResult) onView(withText(R.string.prefs_pattern)).perform(click()) @@ -228,15 +228,15 @@ class OCSettingsSecurityTest { private fun firstEnablePasscode() { val result = Intent() - result.putExtra(KEY_PASSCODE, PASSCODE_VALUE) + result.putExtra(keyPassCode, passCodeValue) val intentResult = Instrumentation.ActivityResult(Activity.RESULT_OK, result) - intending(hasAction(PassCodeActivity.ACTION_REQUEST_WITH_RESULT)).respondWith(intentResult); + intending(hasAction(PassCodeActivity.ACTION_REQUEST_WITH_RESULT)).respondWith(intentResult) onView(withText(R.string.prefs_passcode)).perform(click()) } private fun firstEnablePattern() { val result = Intent() - result.putExtra(KEY_PATTERN, PATTERN_VALUE) + result.putExtra(keyPattern, patternValue) val intentResult = Instrumentation.ActivityResult(Activity.RESULT_OK, result) intending(hasAction(PatternLockActivity.ACTION_REQUEST_WITH_RESULT)).respondWith(intentResult) onView(withText(R.string.prefs_pattern)).perform(click()) diff --git a/owncloudApp/src/debug/java/com/owncloud/android/testing/SingleFragmentActivity.kt b/owncloudApp/src/debug/java/com/owncloud/android/testing/SingleFragmentActivity.kt index 62f6f88255f..9b8e947e8b9 100644 --- a/owncloudApp/src/debug/java/com/owncloud/android/testing/SingleFragmentActivity.kt +++ b/owncloudApp/src/debug/java/com/owncloud/android/testing/SingleFragmentActivity.kt @@ -19,7 +19,6 @@ package com.owncloud.android.testing import android.os.Bundle import android.view.ViewGroup import android.widget.FrameLayout -import androidx.fragment.app.Fragment import com.owncloud.android.R import com.owncloud.android.ui.activity.BaseActivity diff --git a/owncloudApp/src/main/assets/available_offline.svg b/owncloudApp/src/main/assets/available_offline.svg deleted file mode 100644 index fef24125a2b..00000000000 --- a/owncloudApp/src/main/assets/available_offline.svg +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - diff --git a/owncloudApp/src/main/assets/download_pin.svg b/owncloudApp/src/main/assets/download_pin.svg deleted file mode 100644 index ee2777bffb5..00000000000 --- a/owncloudApp/src/main/assets/download_pin.svg +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff --git a/owncloudApp/src/main/assets/ic_file_download_white_24px.svg b/owncloudApp/src/main/assets/ic_file_download_white_24px.svg deleted file mode 100644 index e75399c80d3..00000000000 --- a/owncloudApp/src/main/assets/ic_file_download_white_24px.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/owncloudApp/src/main/assets/offline_pin.svg b/owncloudApp/src/main/assets/offline_pin.svg deleted file mode 100644 index fa399c05bab..00000000000 --- a/owncloudApp/src/main/assets/offline_pin.svg +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff --git a/owncloudApp/src/main/assets/uncheck_av.svg b/owncloudApp/src/main/assets/uncheck_av.svg deleted file mode 100644 index b97ea0e6610..00000000000 --- a/owncloudApp/src/main/assets/uncheck_av.svg +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/owncloudApp/src/main/java/com/owncloud/android/authentication/AccountUtils.java b/owncloudApp/src/main/java/com/owncloud/android/authentication/AccountUtils.java index 2270ad56c15..d64d57a92ae 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/authentication/AccountUtils.java +++ b/owncloudApp/src/main/java/com/owncloud/android/authentication/AccountUtils.java @@ -33,7 +33,6 @@ import com.owncloud.android.lib.common.accounts.AccountTypeUtils; import com.owncloud.android.lib.common.accounts.AccountUtils.Constants; import com.owncloud.android.lib.common.utils.Log_OC; -import com.owncloud.android.lib.resources.status.RemoteCapability; import com.owncloud.android.lib.resources.status.OwnCloudVersion; import java.util.Locale; diff --git a/owncloudApp/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.kt b/owncloudApp/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.kt index 05cf9ceea84..0d1b926bcc1 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.kt @@ -66,10 +66,8 @@ import java.util.Vector class FileDataStorageManager { - var contentResolver: ContentResolver? = null - private set + private var contentResolver: ContentResolver? = null private var contentProviderClient: ContentProviderClient? = null - private set var account: Account private var mContext: Context? = null @@ -181,9 +179,9 @@ class FileDataStorageManager { val sharedByLinkFilesFromCurrentAccount: Vector get() { - val allSharedFiles = Vector(); - val result = Vector(); - var cursorOnShared: Cursor? = null; + val allSharedFiles = Vector() + val result = Vector() + var cursorOnShared: Cursor? = null try { cursorOnShared = contentResolver?.query( CONTENT_URI, @@ -193,33 +191,33 @@ class FileDataStorageManager { null ) if (cursorOnShared != null && cursorOnShared.moveToFirst()) { - var file: OCFile?; + var file: OCFile? do { - file = createFileInstance(cursorOnShared); - allSharedFiles.add(file); - } while (cursorOnShared.moveToNext()); + file = createFileInstance(cursorOnShared) + allSharedFiles.add(file) + } while (cursorOnShared.moveToNext()) } } catch (exception: Exception) { - Log_OC.e(TAG, "Exception retrieving all the shared by link files", exception); + Log_OC.e(TAG, "Exception retrieving all the shared by link files", exception) } finally { cursorOnShared?.close() } if (allSharedFiles.isNotEmpty()) { - val allSharedDirs = Vector(); + val allSharedDirs = Vector() for (file in allSharedFiles) { if (file.isFolder) { - allSharedDirs.add(file.fileId); + allSharedDirs.add(file.fileId) } } for (file in allSharedFiles) { if (file.isFolder || (!file.isFolder && !allSharedDirs.contains(file.parentId))) { - result.add(file); + result.add(file) } } } - result.sort(); - return result; + result.sort() + return result } fun getFileByPath(path: String): OCFile? { @@ -916,7 +914,7 @@ class FileDataStorageManager { val reqUri = Uri.withAppendedPath(CONTENT_URI_DIR, parentId.toString()) - val selection: String = "$FILE_PARENT=?" + val selection = "$FILE_PARENT=?" val selectionArgs: Array = arrayOf(parentId.toString()) val c: Cursor? = try { diff --git a/owncloudApp/src/main/java/com/owncloud/android/extensions/ThrowableExt.kt b/owncloudApp/src/main/java/com/owncloud/android/extensions/ThrowableExt.kt index 8c5daff7d08..d4753239db7 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/extensions/ThrowableExt.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/extensions/ThrowableExt.kt @@ -66,10 +66,10 @@ fun Throwable.parseError(genericErrorMessage: String, resources: Resources): Cha else -> resources.getString(R.string.common_error_unknown) } - if (reason.isEmpty()) { - return genericErrorMessage + return if (reason.isEmpty()) { + genericErrorMessage } else { - return "$genericErrorMessage ${resources.getString(R.string.error_reason)} $reason" + "$genericErrorMessage ${resources.getString(R.string.error_reason)} $reason" } } } diff --git a/owncloudApp/src/main/java/com/owncloud/android/media/MediaService.java b/owncloudApp/src/main/java/com/owncloud/android/media/MediaService.java index cacedca6ce4..75842a8b8a2 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/media/MediaService.java +++ b/owncloudApp/src/main/java/com/owncloud/android/media/MediaService.java @@ -552,7 +552,7 @@ private void stopFileObserver() { /** Called when media player is done playing current song. */ public void onCompletion(MediaPlayer player) { - Toast.makeText(this, String.format(getString(R.string.media_event_done, mFile.getFileName())), + Toast.makeText(this, String.format(getString(R.string.media_event_done), mFile.getFileName()), Toast.LENGTH_LONG).show(); if (mMediaController != null) { // somebody is still bound to the service diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/adapters/sharing/SharePublicLinkListAdapter.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/adapters/sharing/SharePublicLinkListAdapter.kt index 140e4f8ce03..50007b3b565 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/presentation/adapters/sharing/SharePublicLinkListAdapter.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/adapters/sharing/SharePublicLinkListAdapter.kt @@ -32,7 +32,6 @@ import com.owncloud.android.R import com.owncloud.android.domain.sharing.shares.model.OCShare import com.owncloud.android.utils.PreferenceUtils import kotlinx.android.synthetic.main.share_public_link_item.view.* -import java.util.ArrayList /** * Adapter to show a list of public links @@ -44,7 +43,7 @@ class SharePublicLinkListAdapter( private val listener: SharePublicLinkAdapterListener ) : ArrayAdapter(mContext, resource) { init { - publicLinks = ArrayList(publicLinks?.sortedWith(compareBy { it.name })) + publicLinks = publicLinks?.sortedBy { it.name } } override fun getCount(): Int = publicLinks?.size ?: 0 diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/providers/sharing/UsersAndGroupsSearchProvider.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/providers/sharing/UsersAndGroupsSearchProvider.kt index b8c0689d0bb..516786eb6e2 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/presentation/providers/sharing/UsersAndGroupsSearchProvider.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/providers/sharing/UsersAndGroupsSearchProvider.kt @@ -212,12 +212,12 @@ class UsersAndGroupsSearchProvider : ContentProvider() { ShareType.FEDERATED.value -> { if (federatedShareAllowed) { icon = R.drawable.ic_user - if (userName == shareWith) { - displayName = context.getString(R.string.share_remote_clarification, userName) + displayName = if (userName == shareWith) { + context.getString(R.string.share_remote_clarification, userName) } else { val uriSplitted = shareWith.split("@".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray() - displayName = context.getString( + context.getString( R.string.share_known_remote_clarification, userName, uriSplitted[uriSplitted.size - 1] ) @@ -266,7 +266,6 @@ class UsersAndGroupsSearchProvider : ContentProvider() { /** * Show error genericErrorMessage * - * @param resource Resource with the failure information. */ private fun showErrorMessage(genericErrorMessage: String, throwable: Throwable?) { val errorMessage = throwable?.parseError(genericErrorMessage, context.resources) diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/ShareActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/ShareActivity.kt index 3abedab0c13..2377c47a79a 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/ShareActivity.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/ShareActivity.kt @@ -104,6 +104,7 @@ class ShareActivity : FileActivity(), ShareFragmentListener { // Private share creation needs to be handled from here since is is carried out through intents override fun onNewIntent(intent: Intent) { + super.onNewIntent(intent) when (intent.action) { Intent.ACTION_SEARCH -> { // Verify the action and get the query val query = intent.getStringExtra(SearchManager.QUERY) diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/ShareFragmentListener.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/ShareFragmentListener.kt index cdea52a6fb8..a10bfb9e8aa 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/ShareFragmentListener.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/ShareFragmentListener.kt @@ -29,7 +29,7 @@ import com.owncloud.android.domain.sharing.shares.model.OCShare /** * This interface must be implemented by activities that contain this - * fragment to allow an interaction in fragments handling [OCShareEntity]s + * fragment to allow an interaction in fragments handling [OCShare]s * to be communicated to the parent activity and potentially other fragments * contained in that activity. * diff --git a/owncloudApp/src/main/java/com/owncloud/android/providers/DocumentsStorageProvider.kt b/owncloudApp/src/main/java/com/owncloud/android/providers/DocumentsStorageProvider.kt index b81536b2887..541289e555f 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/providers/DocumentsStorageProvider.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/providers/DocumentsStorageProvider.kt @@ -462,7 +462,7 @@ class DocumentsStorageProvider : DocumentsProvider() { return } for (data in rootIdToStorageManager.values) { - if (data.account?.name == rootId) { + if (data.account.name == rootId) { currentStorageManager = data } } @@ -564,7 +564,7 @@ class DocumentsStorageProvider : DocumentsProvider() { if (fileFromOtherStorageManager != null) { Log_OC.d( TAG, - "File with id $id found in storage manager: ${otherStorageManager}" + "File with id $id found in storage manager: $otherStorageManager" ) break } @@ -575,7 +575,7 @@ class DocumentsStorageProvider : DocumentsProvider() { private fun getFileByPathOrException(path: String): OCFile = getFileByPath(path) ?: throw FileNotFoundException("File $path not found") - private fun getFileByPath(path: String): OCFile? = currentStorageManager?.getFileByPath(path) + private fun getFileByPath(path: String): OCFile? = getFileByPath(path) companion object { private val TAG = DocumentsStorageProvider::class.java.toString() diff --git a/owncloudApp/src/main/java/com/owncloud/android/providers/FileContentProvider.kt b/owncloudApp/src/main/java/com/owncloud/android/providers/FileContentProvider.kt index 682b3fa0269..39eed2d8786 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/providers/FileContentProvider.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/providers/FileContentProvider.kt @@ -206,11 +206,11 @@ class FileContentProvider(val executors: Executors = Executors()) : ContentProvi val doubleCheck = query(uri, projection, where, whereArgs, null) // ugly patch; serious refactorization is needed to reduce work in // FileDataStorageManager and bring it to FileContentProvider - if (!doubleCheck.moveToFirst()) { + return if (!doubleCheck.moveToFirst()) { doubleCheck.close() val fileId = db.insert(ProviderTableMeta.FILE_TABLE_NAME, null, values) if (fileId <= 0) throw SQLException("ERROR $uri") - return ContentUris.withAppendedId(ProviderTableMeta.CONTENT_URI_FILE, fileId) + ContentUris.withAppendedId(ProviderTableMeta.CONTENT_URI_FILE, fileId) } else { // file is already inserted; race condition, let's avoid a duplicated entry val insertedFileUri = ContentUris.withAppendedId( @@ -218,7 +218,7 @@ class FileContentProvider(val executors: Executors = Executors()) : ContentProvi doubleCheck.getLong(doubleCheck.getColumnIndex(ProviderTableMeta._ID)) ) doubleCheck.close() - return insertedFileUri + insertedFileUri } } SHARES -> { diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/BaseActivity.java b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/BaseActivity.java index a4e3abed663..847de043e11 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/BaseActivity.java +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/BaseActivity.java @@ -23,7 +23,6 @@ import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.domain.capabilities.model.OCCapability; import com.owncloud.android.lib.common.utils.Log_OC; -import com.owncloud.android.lib.resources.status.RemoteCapability; import com.owncloud.android.ui.dialog.LoadingDialog; /** @@ -66,6 +65,7 @@ public abstract class BaseActivity extends AppCompatActivity { @Override protected void onNewIntent(Intent intent) { + super.onNewIntent(intent); Log_OC.v(TAG, "onNewIntent() start"); Account current = AccountUtils.getCurrentOwnCloudAccount(this); if (current != null && mCurrentAccount != null && !mCurrentAccount.name.equals(current.name)) { diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java index afc7faf5b5c..54548bcc65d 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java @@ -40,6 +40,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.appcompat.app.ActionBarDrawerToggle; import androidx.core.view.GravityCompat; import androidx.drawerlayout.widget.DrawerLayout; @@ -91,8 +92,6 @@ public abstract class DrawerActivity extends ToolbarActivity { */ private Account[] mAccountsWithAvatars = new Account[3]; - private TextView mAccountQuotaText; - /** * Initializes the drawer, its content and highlights the menu item with the given id. * This method needs to be called after the content view has been set. @@ -178,12 +177,7 @@ public void onViewDetachedFromWindow(View v) { setupDrawerContent(mNavigationView); findNavigationViewChildById(R.id.drawer_active_user) - .setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - toggleAccountList(); - } - }); + .setOnClickListener(onClick -> toggleAccountList()); } mDrawerToggle = new ActionBarDrawerToggle(this, mDrawerLayout, R.string.drawer_open, R.string.drawer_close) { @@ -304,10 +298,9 @@ private void openFeedback() { String feedbackMail = (String) getText(R.string.mail_feedback); String feedback = "Android v" + BuildConfig.VERSION_NAME + " - " + getText(R.string.drawer_feedback); Intent intent = new Intent(Intent.ACTION_SENDTO); - intent.setType("text/plain"); intent.putExtra(Intent.EXTRA_SUBJECT, feedback); - intent.setData(Uri.parse(feedbackMail)); + intent.setDataAndType(Uri.parse(feedbackMail), "text/plain"); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); startActivity(intent); } @@ -439,19 +432,19 @@ private void repopulateAccountList(Account[] accounts) { mNavigationView.getMenu().removeGroup(R.id.drawer_menu_accounts); // add all accounts to list - for (int i = 0; i < accounts.length; i++) { - if (!getAccount().name.equals(accounts[i].name)) { + for (Account account : accounts) { + if (!getAccount().name.equals(account.name)) { MenuItem accountMenuItem = mNavigationView.getMenu().add( R.id.drawer_menu_accounts, Menu.NONE, MENU_ORDER_ACCOUNT, - accounts[i].name + account.name ); ThumbnailsCacheManager.GetAvatarTask task = new ThumbnailsCacheManager.GetAvatarTask( accountMenuItem, - accounts[i], + account, mMenuAccountAvatarRadiusDimension, false ); @@ -521,7 +514,7 @@ private void updateQuota() { String.format(getString(R.string.drawer_quota), DisplayUtils.bytesToHumanReadable(userQuota.getUsed(), this), DisplayUtils.bytesToHumanReadable(userQuota.getTotal(), this), - userQuota.getRelative() + String.valueOf(userQuota.getRelative()) ) ); @@ -694,7 +687,7 @@ protected void onPostCreate(Bundle savedInstanceState) { } @Override - public void onConfigurationChanged(Configuration newConfig) { + public void onConfigurationChanged(@NonNull Configuration newConfig) { super.onConfigurationChanged(newConfig); if (mDrawerToggle != null) { mDrawerToggle.onConfigurationChanged(newConfig); diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt index adab7343d17..396fc44d9b2 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt @@ -31,7 +31,6 @@ package com.owncloud.android.ui.activity import android.Manifest import android.accounts.Account import android.accounts.AuthenticatorException -import android.annotation.SuppressLint import android.annotation.TargetApi import android.app.Activity import android.content.BroadcastReceiver @@ -44,11 +43,10 @@ import android.content.ServiceConnection import android.content.SyncRequest import android.content.pm.PackageManager import android.content.res.Resources.NotFoundException +import android.net.Uri import android.os.Build import android.os.Bundle import android.os.IBinder -import android.os.Parcelable -import android.util.Log import android.view.Menu import android.view.MenuItem import android.view.View @@ -184,7 +182,7 @@ class FileDisplayActivity : FileActivity(), FileFragment.ContainerActivity, OnEn /// Load of saved instance state if (savedInstanceState != null) { - Log.d(TAG, savedInstanceState.toString()) + Log_OC.d(savedInstanceState.toString()) fileWaitingToPreview = savedInstanceState.getParcelable(KEY_WAITING_TO_PREVIEW) syncInProgress = savedInstanceState.getBoolean(KEY_SYNC_IN_PROGRESS) @@ -731,15 +729,14 @@ class FileDisplayActivity : FileActivity(), FileFragment.ContainerActivity, OnEn private fun requestUploadOfContentFromApps(contentIntent: Intent?, resultCode: Int) { - val streamsToUpload = ArrayList() + val streamsToUpload = ArrayList() - //getClipData is only supported on api level 16+, Jelly Bean if (contentIntent!!.clipData != null && contentIntent.clipData!!.itemCount > 0) { for (i in 0 until contentIntent.clipData!!.itemCount) { streamsToUpload.add(contentIntent.clipData!!.getItemAt(i).uri) } } else { - streamsToUpload.add(contentIntent!!.data) + streamsToUpload.add(contentIntent.data!!) } val behaviour = if (resultCode == RESULT_OK_AND_MOVE) @@ -1054,7 +1051,6 @@ class FileDisplayActivity : FileActivity(), FileFragment.ContainerActivity, OnEn * @author David A. Velasco * [BroadcastReceiver] to enable upload feedback in UI */ - @SuppressLint("StringFormatInvalid") override fun onReceive(context: Context, intent: Intent) { val uploadedRemotePath = intent.getStringExtra(Extras.EXTRA_REMOTE_PATH) val accountName = intent.getStringExtra(Extras.EXTRA_ACCOUNT_NAME) @@ -1861,10 +1857,10 @@ class FileDisplayActivity : FileActivity(), FileFragment.ContainerActivity, OnEn const val ACTION_DETAILS = "com.owncloud.android.ui.activity.action.DETAILS" - val REQUEST_CODE__SELECT_CONTENT_FROM_APPS = REQUEST_CODE__LAST_SHARED + 1 - val REQUEST_CODE__MOVE_FILES = REQUEST_CODE__LAST_SHARED + 2 - val REQUEST_CODE__COPY_FILES = REQUEST_CODE__LAST_SHARED + 3 - val REQUEST_CODE__UPLOAD_FROM_CAMERA = REQUEST_CODE__LAST_SHARED + 4 - val RESULT_OK_AND_MOVE = Activity.RESULT_FIRST_USER + const val REQUEST_CODE__SELECT_CONTENT_FROM_APPS = REQUEST_CODE__LAST_SHARED + 1 + const val REQUEST_CODE__MOVE_FILES = REQUEST_CODE__LAST_SHARED + 2 + const val REQUEST_CODE__COPY_FILES = REQUEST_CODE__LAST_SHARED + 3 + const val REQUEST_CODE__UPLOAD_FROM_CAMERA = REQUEST_CODE__LAST_SHARED + 4 + const val RESULT_OK_AND_MOVE = Activity.RESULT_FIRST_USER } } \ No newline at end of file diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.java b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.java index 81e4e642082..94c26a14962 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.java +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.java @@ -30,7 +30,6 @@ import android.content.res.Resources.NotFoundException; import android.os.Bundle; import android.os.Parcelable; -import android.util.Log; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; @@ -69,8 +68,6 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C public static final String EXTRA_FILES = FolderPickerActivity.class.getCanonicalName() + ".EXTRA_FILES"; - private static final String TAG = FolderPickerActivity.class.getSimpleName(); - private static final String TAG_LIST_OF_FOLDERS = "LIST_OF_FOLDERS"; private LocalBroadcastManager mLocalBroadcastManager; @@ -170,7 +167,7 @@ private void setBackgroundText() { } listFragment.setMessageForEmptyList(getString(message)); } else { - Log.e(TAG, "OCFileListFragment is null"); + Log_OC.e("OCFileListFragment is null"); } } diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/LogHistoryActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/LogHistoryActivity.kt index ed9d17b9bdb..c575f3c904f 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/LogHistoryActivity.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/LogHistoryActivity.kt @@ -27,7 +27,6 @@ import com.owncloud.android.R import info.hannes.logcat.BothLogsFragment import info.hannes.logcat.LogcatFragment import info.hannes.timber.fileLoggingTree -import timber.log.Timber class LogHistoryActivity : ToolbarActivity() { diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/PatternLockActivity.java b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/PatternLockActivity.java index 7c22324285d..5da24c8b77d 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/PatternLockActivity.java +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/PatternLockActivity.java @@ -30,7 +30,7 @@ import android.view.View; import android.view.WindowManager; import android.widget.Button; -import android.widget.RelativeLayout; +import android.widget.LinearLayout; import android.widget.TextView; import androidx.appcompat.app.AppCompatActivity; @@ -81,7 +81,7 @@ protected void onCreate(Bundle savedInstanceState) { setContentView(R.layout.activity_pattern_lock); // Allow or disallow touches with other visible windows - RelativeLayout activityPatternLockLayout = findViewById(R.id.activityPatternLockLayout); + LinearLayout activityPatternLockLayout = findViewById(R.id.activityPatternLockLayout); activityPatternLockLayout.setFilterTouchesWhenObscured( PreferenceUtils.shouldDisallowTouchesWithOtherVisibleWindows(this) ); diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java index 83bda05c4c1..c5bfe2d3427 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java @@ -29,12 +29,10 @@ import android.accounts.Account; import android.accounts.AccountManager; import android.accounts.AuthenticatorException; -import android.annotation.SuppressLint; import android.app.Dialog; import android.content.BroadcastReceiver; import android.content.Context; import android.content.DialogInterface; -import android.content.DialogInterface.OnCancelListener; import android.content.DialogInterface.OnClickListener; import android.content.Intent; import android.content.IntentFilter; @@ -94,6 +92,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.Stack; import java.util.Vector; @@ -110,7 +109,7 @@ public class ReceiveExternalFilesActivity extends FileActivity private AccountManager mAccountManager; private Stack mParents; - private ArrayList mStreamsToUpload; + private ArrayList mStreamsToUpload; private String mUploadPath; private OCFile mFile; @@ -155,7 +154,7 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); if (mAccountSelected) { - setAccount((Account) savedInstanceState.getParcelable(FileActivity.EXTRA_ACCOUNT)); + setAccount(savedInstanceState.getParcelable(FileActivity.EXTRA_ACCOUNT)); } // Listen for sync messages @@ -266,8 +265,8 @@ public void onClick(DialogInterface dialog, int which) { }); return builder.create(); case DIALOG_MULTIPLE_ACCOUNT: - Account accounts[] = mAccountManager.getAccountsByType(MainApp.Companion.getAccountType()); - CharSequence dialogItems[] = new CharSequence[accounts.length]; + Account[] accounts = mAccountManager.getAccountsByType(MainApp.Companion.getAccountType()); + CharSequence[] dialogItems = new CharSequence[accounts.length]; OwnCloudAccount oca; for (int i = 0; i < dialogItems.length; ++i) { try { @@ -285,24 +284,18 @@ public void onClick(DialogInterface dialog, int which) { } } builder.setTitle(R.string.common_choose_account); - builder.setItems(dialogItems, new OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - setAccount(mAccountManager.getAccountsByType(MainApp.Companion.getAccountType())[which]); - onAccountSet(mAccountWasRestored); - dialog.dismiss(); - mAccountSelected = true; - mAccountSelectionShowing = false; - } + builder.setItems(dialogItems, (dialog, which) -> { + setAccount(mAccountManager.getAccountsByType(MainApp.Companion.getAccountType())[which]); + onAccountSet(mAccountWasRestored); + dialog.dismiss(); + mAccountSelected = true; + mAccountSelectionShowing = false; }); builder.setCancelable(true); - builder.setOnCancelListener(new OnCancelListener() { - @Override - public void onCancel(DialogInterface dialog) { - mAccountSelectionShowing = false; - dialog.cancel(); - finish(); - } + builder.setOnCancelListener(dialog -> { + mAccountSelectionShowing = false; + dialog.cancel(); + finish(); }); return builder.create(); default: @@ -333,10 +326,7 @@ public void onItemClick(AdapterView parent, View view, int position, long id) return; } // filter on dirtype - Vector files = new Vector<>(); - for (OCFile f : tmpfiles) { - files.add(f); - } + Vector files = new Vector<>(tmpfiles); if (files.size() < position) { throw new IndexOutOfBoundsException("Incorrect item selected"); } @@ -471,16 +461,16 @@ private Vector sortFileList(Vector files) { } private String generatePath(Stack dirs) { - String full_path = ""; + StringBuilder full_path = new StringBuilder(); for (String a : dirs) { - full_path += a + "/"; + full_path.append(a).append("/"); } - return full_path; + return full_path.toString(); } private void prepareStreamsToUpload() { - if (getIntent().getAction().equals(Intent.ACTION_SEND)) { + if (getIntent().getAction() != null && getIntent().getAction().equals(Intent.ACTION_SEND)) { mStreamsToUpload = new ArrayList<>(); mStreamsToUpload.add(getIntent().getParcelableExtra(Intent.EXTRA_STREAM)); if (mStreamsToUpload.get(0) != null) { @@ -511,7 +501,6 @@ private boolean isPlainTextUpload() { getIntent().getStringExtra(Intent.EXTRA_TEXT) != null; } - @SuppressLint("NewApi") public void uploadFiles() { UriUploader uploader = new UriUploader( @@ -541,8 +530,6 @@ public void uploadFiles() { messageResTitle = R.string.uploader_error_title_no_file_to_upload; } else if (resultCode == UriUploader.UriUploaderResultCode.ERROR_READ_PERMISSION_NOT_GRANTED) { messageResId = R.string.uploader_error_message_read_permission_not_granted; - } else if (resultCode == UriUploader.UriUploaderResultCode.ERROR_UNKNOWN) { - messageResId = R.string.common_error_unknown; } showErrorDialog( @@ -603,9 +590,7 @@ private void initTargetFolder() { } else { String[] dir_names = lastPath.split("/"); mParents.clear(); - for (String dir : dir_names) { - mParents.add(dir); - } + mParents.addAll(Arrays.asList(dir_names)); } //Make sure that path still exists, if it doesn't pop the stack and try the previous path while (!getStorageManager().fileExists(generatePath(mParents)) && mParents.size() > 1) { @@ -776,8 +761,7 @@ public void onReceive(Context context, Intent intent) { currentFile = currentDir; } - if (synchFolderRemotePath != null && - currentDir.getRemotePath().equals(synchFolderRemotePath)) { + if (currentDir.getRemotePath().equals(synchFolderRemotePath)) { populateDirectoryList(); } mFile = currentFile; @@ -891,28 +875,26 @@ public void afterTextChanged(Editable editable) { final AlertDialog alertDialog = builder.create(); setFileNameFromIntent(alertDialog, input); - alertDialog.setOnShowListener(new DialogInterface.OnShowListener() { - @Override - public void onShow(DialogInterface dialog) { - Button button = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE); - button.setOnClickListener(view -> { - String fileName = input.getText().toString(); - String error = null; - if (fileName.length() > MAX_FILENAME_LENGTH) { - error = String.format(getString(R.string.uploader_upload_text_dialog_filename_error_length_max), MAX_FILENAME_LENGTH); - } else if (fileName.length() == 0) { - error = getString(R.string.uploader_upload_text_dialog_filename_error_empty); - } else { - fileName += ".txt"; - Uri fileUri = savePlainTextToFile(fileName); - mStreamsToUpload.clear(); - mStreamsToUpload.add(fileUri); - uploadFiles(); - } - inputLayout.setErrorEnabled(error != null); - inputLayout.setError(error); - }); - } + alertDialog.setOnShowListener(dialog -> { + Button button = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE); + button.setOnClickListener(view -> { + String fileName = input.getText().toString(); + String error = null; + if (fileName.length() > MAX_FILENAME_LENGTH) { + error = String.format(getString(R.string.uploader_upload_text_dialog_filename_error_length_max), + MAX_FILENAME_LENGTH); + } else if (fileName.length() == 0) { + error = getString(R.string.uploader_upload_text_dialog_filename_error_empty); + } else { + fileName += ".txt"; + Uri fileUri = savePlainTextToFile(fileName); + mStreamsToUpload.clear(); + mStreamsToUpload.add(fileUri); + uploadFiles(); + } + inputLayout.setErrorEnabled(error != null); + inputLayout.setError(error); + }); }); alertDialog.show(); } diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java b/owncloudApp/src/main/java/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java index 121852cef64..47847e2fe23 100755 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java @@ -78,7 +78,7 @@ public class ExpandableUploadListAdapter extends BaseExpandableListAdapter imple private UploadsStorageManager mUploadsStorageManager; - public ProgressListener mProgressListener; + private ProgressListener mProgressListener; interface Refresh { void refresh(); @@ -88,20 +88,20 @@ abstract class UploadGroup implements Refresh { OCUpload[] items; String name; - public UploadGroup(String groupName) { + UploadGroup(String groupName) { this.name = groupName; items = new OCUpload[0]; } - public String getGroupName() { + String getGroupName() { return name; } - public int getGroupCount() { + int getGroupCount() { return items == null ? 0 : items.length; } - public Comparator comparator = new Comparator() { + Comparator comparator = new Comparator() { @Override public int compare(OCUpload upload1, OCUpload upload2) { @@ -129,18 +129,18 @@ public int compare(OCUpload upload1, OCUpload upload2) { } private int compareUploadId(OCUpload upload1, OCUpload upload2) { - return Long.valueOf(upload1.getUploadId()).compareTo(upload2.getUploadId()); + return Long.compare(upload1.getUploadId(), upload2.getUploadId()); } private int compareUpdateTime(OCUpload upload1, OCUpload upload2) { - return Long.valueOf(upload2.getUploadEndTimestamp()).compareTo(upload1.getUploadEndTimestamp()); + return Long.compare(upload2.getUploadEndTimestamp(), upload1.getUploadEndTimestamp()); } }; abstract public int getGroupIcon(); } - private UploadGroup[] mUploadGroups = null; + private UploadGroup[] mUploadGroups; public ExpandableUploadListAdapter(FileActivity parentActivity) { Log_OC.d(TAG, "ExpandableUploadListAdapter"); @@ -238,16 +238,13 @@ private View getView(OCUpload[] uploadsItems, int position, View convertView, Vi pathTextView.setText(PREF__CAMERA_UPLOADS_DEFAULT_PATH); String remoteParentPath = upload.getRemotePath(); remoteParentPath = new File(remoteParentPath).getParent(); - pathTextView.setText(mParentActivity.getString(R.string.app_name) + remoteParentPath); + String pathText = mParentActivity.getString(R.string.app_name) + remoteParentPath; + pathTextView.setText(pathText); // file size TextView fileSizeTextView = view.findViewById(R.id.upload_file_size); - fileSizeTextView.setText( - DisplayUtils.bytesToHumanReadable( - upload.getFileSize(), - mParentActivity - ) + ", " - ); + String fileSize = DisplayUtils.bytesToHumanReadable(upload.getFileSize(), mParentActivity) + ", "; + fileSizeTextView.setText(fileSize); //* upload date TextView uploadDateTextView = view.findViewById(R.id.upload_date); @@ -265,11 +262,9 @@ private View getView(OCUpload[] uploadsItems, int position, View convertView, Vi try { Account account = AccountUtils.getOwnCloudAccountByName(mParentActivity, upload.getAccountName()); OwnCloudAccount oca = new OwnCloudAccount(account, mParentActivity); - accountNameTextView.setText( - oca.getDisplayName() + " @ " + - DisplayUtils.convertIdn(account.name.substring(account.name.lastIndexOf("@") + 1), - false) - ); + String accountName = oca.getDisplayName() + " @ " + + DisplayUtils.convertIdn(account.name.substring(account.name.lastIndexOf("@") + 1), false); + accountNameTextView.setText(accountName); } catch (Exception e) { Log_OC.w(TAG, "Couldn't get display name for account, using old style"); accountNameTextView.setText(upload.getAccountName()); @@ -351,14 +346,11 @@ private View getView(OCUpload[] uploadsItems, int position, View convertView, Vi //Cancel rightButton.setImageResource(R.drawable.ic_action_cancel_grey); rightButton.setVisibility(View.VISIBLE); - rightButton.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - FileUploader.FileUploaderBinder uploaderBinder = mParentActivity.getFileUploaderBinder(); - if (uploaderBinder != null) { - uploaderBinder.cancel(upload); - refreshView(); - } + rightButton.setOnClickListener(v -> { + FileUploader.FileUploaderBinder uploaderBinder = mParentActivity.getFileUploaderBinder(); + if (uploaderBinder != null) { + uploaderBinder.cancel(upload); + refreshView(); } }); @@ -366,12 +358,9 @@ public void onClick(View v) { //Delete rightButton.setImageResource(R.drawable.ic_action_delete_grey); rightButton.setVisibility(View.VISIBLE); - rightButton.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - mUploadsStorageManager.removeUpload(upload); - refreshView(); - } + rightButton.setOnClickListener(v -> { + mUploadsStorageManager.removeUpload(upload); + refreshView(); }); } else { // UploadStatus.UPLOAD_SUCCESS @@ -381,14 +370,9 @@ public void onClick(View v) { // retry if (upload.getUploadStatus() == UploadStatus.UPLOAD_FAILED) { if (UploadResult.CREDENTIAL_ERROR.equals(upload.getLastResult())) { - view.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - mParentActivity.getFileOperationsHelper().checkCurrentCredentials( - upload.getAccount(mParentActivity) - ); - } - }); + view.setOnClickListener(v -> mParentActivity.getFileOperationsHelper().checkCurrentCredentials( + upload.getAccount(mParentActivity) + )); } else { // not a credentials error @@ -401,12 +385,9 @@ public void onClick(View v) { requester.retry(mParentActivity, upload, false); refreshView(); } else { - final String message = String.format( - mParentActivity.getString(R.string.local_file_not_found_toast) - ); Snackbar snackbar = Snackbar.make( v.getRootView().findViewById(android.R.id.content), - message, + mParentActivity.getString(R.string.local_file_not_found_toast), Snackbar.LENGTH_LONG ); snackbar.show(); @@ -422,9 +403,9 @@ public void onClick(View v) { ImageView fileIcon = view.findViewById(R.id.thumbnail); fileIcon.setImageResource(R.drawable.file); - /** Cancellation needs do be checked and done before changing the drawable in fileIcon, or + /* Cancellation needs do be checked and done before changing the drawable in fileIcon, or * {@link ThumbnailsCacheManager#cancelPotentialWork} will NEVER cancel any task. - **/ + */ OCFile fakeFileToCheatThumbnailsCacheManagerInterface = new OCFile(upload.getRemotePath()); fakeFileToCheatThumbnailsCacheManagerInterface.setStoragePath(upload.getLocalPath()); fakeFileToCheatThumbnailsCacheManagerInterface.setMimetype(upload.getMimeType()); @@ -482,9 +463,7 @@ public void onClick(View v) { if (allowedToCreateNewThumbnail) { final ThumbnailsCacheManager.ThumbnailGenerationTask task = new ThumbnailsCacheManager.ThumbnailGenerationTask(fileIcon); - if (thumbnail == null) { - thumbnail = ThumbnailsCacheManager.mDefaultImg; - } + thumbnail = ThumbnailsCacheManager.mDefaultImg; final ThumbnailsCacheManager.AsyncThumbnailDrawable asyncDrawable = new ThumbnailsCacheManager.AsyncThumbnailDrawable( mParentActivity.getResources(), @@ -615,7 +594,7 @@ private String getStatusText(OCUpload upload) { case SPECIFIC_FORBIDDEN: // We don't know the specific forbidden error message because it is not being // saved in uploads storage - status = String.format(mParentActivity.getString(R.string.uploader_upload_forbidden)); + status = mParentActivity.getString(R.string.uploader_upload_forbidden); break; case SPECIFIC_SERVICE_UNAVAILABLE: // We don't know the specific unavailable service error message because @@ -758,12 +737,12 @@ public boolean isChildSelectable(int groupPosition, int childPosition) { public class ProgressListener implements OnDatatransferProgressListener { int mLastPercent = 0; - OCUpload mUpload = null; - WeakReference mProgressBar = null; + OCUpload mUpload; + WeakReference mProgressBar; - public ProgressListener(OCUpload upload, ProgressBar progressBar) { + ProgressListener(OCUpload upload, ProgressBar progressBar) { mUpload = upload; - mProgressBar = new WeakReference(progressBar); + mProgressBar = new WeakReference<>(progressBar); } @Override @@ -780,7 +759,7 @@ public void onTransferProgress(long progressRate, long totalTransferredSoFar, lo mLastPercent = percent; } - public boolean isWrapping(ProgressBar progressBar) { + boolean isWrapping(ProgressBar progressBar) { ProgressBar wrappedProgressBar = mProgressBar.get(); return ( wrappedProgressBar != null && diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/adapter/LogListAdapter.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/adapter/LogListAdapter.kt deleted file mode 100644 index 6ca91cf5a89..00000000000 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/adapter/LogListAdapter.kt +++ /dev/null @@ -1,92 +0,0 @@ -/* - * ownCloud Android client application - * - * @author David González Verdugo - * Copyright (C) 2019 ownCloud GmbH. - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2, - * as published by the Free Software Foundation. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.owncloud.android.ui.adapter - -import android.content.Context -import android.graphics.Color -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.core.content.ContextCompat -import androidx.recyclerview.widget.RecyclerView -import com.owncloud.android.R -import java.util.* - -/** - * Built a logs container which will be displayed as a list - */ -class LogListAdapter(private val completeLogs: ArrayList, filter: String, val context: Context) : RecyclerView.Adapter() { - private var filterLogs: List = ArrayList() - - init { - setFilter(filter) - } - - fun setFilter(filter: String) { - filterLogs = completeLogs.filter { it.contains(filter) } - notifyDataSetChanged() - } - - /** - * Define the view for each log in the list - */ - class LogViewHolder(view: View) : RecyclerView.ViewHolder(view) { - - val logContent: TextView = view.findViewById(R.id.logContent) - - } - - /** - * Create the view for each log in the list - * - * @param viewGroup - * @param i - * @return - */ - override fun onCreateViewHolder(viewGroup: ViewGroup, i: Int): LogViewHolder { - val view = LayoutInflater.from(viewGroup.context).inflate(R.layout.log_item, viewGroup, false) - return LogViewHolder(view) - } - - /** - * Fill in each log in the list - * - * @param holder - * @param position - */ - override fun onBindViewHolder(holder: LogViewHolder, position: Int) { - holder.logContent.text = filterLogs[position] - if (filterLogs[position].contains(" E: ")) { - holder.logContent.setTextColor(Color.RED) - } else if (filterLogs[position].contains(" W: ")) { - holder.logContent.setTextColor(Color.MAGENTA) - } else if (filterLogs[position].contains(" V: ")) { - holder.logContent.setTextColor(Color.GRAY) - } else { - holder.logContent.setTextColor(ContextCompat.getColor(context, R.color.primary_dark)) - } - } - - override fun getItemCount(): Int { - return filterLogs.size - } - -} diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/adapter/X509CertificateViewAdapter.java b/owncloudApp/src/main/java/com/owncloud/android/ui/adapter/X509CertificateViewAdapter.java index 31c91d59d7e..6fb3dcfb437 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/adapter/X509CertificateViewAdapter.java +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/adapter/X509CertificateViewAdapter.java @@ -20,11 +20,11 @@ */ package com.owncloud.android.ui.adapter; -import android.util.Log; import android.view.View; import android.widget.TextView; import com.owncloud.android.R; +import com.owncloud.android.lib.common.utils.Log_OC; import com.owncloud.android.ui.dialog.SslUntrustedCertDialog; import javax.security.auth.x500.X500Principal; @@ -46,8 +46,6 @@ public class X509CertificateViewAdapter implements SslUntrustedCertDialog.Certif private X509Certificate mCertificate = null; - private static final String TAG = X509CertificateViewAdapter.class.getSimpleName(); - public X509CertificateViewAdapter(X509Certificate certificate) { mCertificate = certificate; } @@ -104,7 +102,7 @@ private void showSignature(View dialogView) { } } catch (CertificateEncodingException e) { - Log.e(TAG, "Problem while trying to decode the certificate."); + Log_OC.e("Problem while trying to decode the certificate."); } } diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.java b/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.java index 804f74e1554..eeb26ea88ab 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.java +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.java @@ -22,7 +22,6 @@ package com.owncloud.android.ui.dialog; import android.app.Dialog; -import android.content.DialogInterface; import android.os.Bundle; import androidx.appcompat.app.AlertDialog; diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java b/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java index 58489c8f87b..c202a7587ba 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java @@ -44,7 +44,7 @@ public enum Decision { SERVER } - OnConflictDecisionMadeListener mListener; + private OnConflictDecisionMadeListener mListener; public static ConflictsResolveDialog newInstance(String path, OnConflictDecisionMadeListener listener) { ConflictsResolveDialog f = new ConflictsResolveDialog(); @@ -57,11 +57,10 @@ public static ConflictsResolveDialog newInstance(String path, OnConflictDecision @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - String remotepath = getArguments().getString("remotepath"); return new AlertDialog.Builder(getActivity()) .setIcon(R.drawable.ic_warning) .setTitle(R.string.conflict_title) - .setMessage(String.format(getString(R.string.conflict_message), remotepath)) + .setMessage(getString(R.string.conflict_message)) .setPositiveButton(R.string.conflict_use_local_version, (dialog, which) -> { if (mListener != null) { diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/errorhandling/ErrorMessageAdapter.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/errorhandling/ErrorMessageAdapter.kt index 3708ea59675..c6087a4a3db 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/errorhandling/ErrorMessageAdapter.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/errorhandling/ErrorMessageAdapter.kt @@ -222,7 +222,7 @@ class ErrorMessageAdapter { return f.format(R.string.auth_account_not_the_same) RemoteOperationResult.ResultCode.OK_REDIRECT_TO_NON_SECURE_CONNECTION -> return f.format(R.string.auth_redirect_non_secure_connection_title) - else -> if (result.httpPhrase != null && result.httpPhrase.length > 0) + else -> if (result.httpPhrase != null && result.httpPhrase.isNotEmpty()) return result.httpPhrase } diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/errorhandling/ErrorShowActivity.java b/owncloudApp/src/main/java/com/owncloud/android/ui/errorhandling/ErrorShowActivity.java index 40f57c41274..15e0e6b6729 100755 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/errorhandling/ErrorShowActivity.java +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/errorhandling/ErrorShowActivity.java @@ -21,24 +21,22 @@ package com.owncloud.android.ui.errorhandling; import android.os.Bundle; -import android.util.Log; import android.widget.ScrollView; import android.widget.TextView; import com.owncloud.android.R; +import com.owncloud.android.lib.common.utils.Log_OC; import com.owncloud.android.ui.activity.BaseActivity; import com.owncloud.android.utils.PreferenceUtils; public class ErrorShowActivity extends BaseActivity { - private static final String TAG = ErrorShowActivity.class.getSimpleName(); - TextView mError; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - Log.e(TAG, "ErrorShowActivity was called. See above for StackTrace."); + Log_OC.e("ErrorShowActivity was called. See above for StackTrace."); Thread.setDefaultUncaughtExceptionHandler(new ExceptionHandler(this)); setContentView(R.layout.errorhandling_showerror); diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/errorhandling/ExceptionHandler.java b/owncloudApp/src/main/java/com/owncloud/android/ui/errorhandling/ExceptionHandler.java index 9522a09d961..c80e2ee233e 100755 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/errorhandling/ExceptionHandler.java +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/errorhandling/ExceptionHandler.java @@ -21,7 +21,8 @@ import android.app.Activity; import android.content.Intent; import android.os.Build; -import android.util.Log; + +import com.owncloud.android.lib.common.utils.Log_OC; import java.io.PrintWriter; import java.io.StringWriter; @@ -30,14 +31,12 @@ public class ExceptionHandler implements java.lang.Thread.UncaughtExceptionHandl private final Activity mContext; private final String LINE_SEPARATOR = "\n"; - private static final String TAG = ExceptionHandler.class.getSimpleName(); - public ExceptionHandler(Activity context) { mContext = context; } public void uncaughtException(Thread thread, Throwable exception) { - Log.e(TAG, "ExceptionHandler caught UncaughtException", exception); + Log_OC.e("ExceptionHandler caught UncaughtException", exception); StringWriter stackTrace = new StringWriter(); exception.printStackTrace(new PrintWriter(stackTrace)); StringBuilder errorReport = new StringBuilder(); @@ -71,7 +70,7 @@ public void uncaughtException(Thread thread, Throwable exception) { errorReport.append(Build.VERSION.INCREMENTAL); errorReport.append(LINE_SEPARATOR); - Log.e(TAG, "An exception was thrown and handled by ExceptionHandler:", exception); + Log_OC.e("An exception was thrown and handled by ExceptionHandler:", exception); Intent intent = new Intent(mContext, ErrorShowActivity.class); intent.putExtra("error", errorReport.toString()); diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java b/owncloudApp/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java index 98c1414668c..9f20b44189a 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java @@ -23,7 +23,6 @@ package com.owncloud.android.ui.fragment; import android.os.Bundle; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -51,8 +50,6 @@ public class ExtendedListFragment extends Fragment implements OnItemClickListener, OnEnforceableRefreshListener { - protected static final String TAG = ExtendedListFragment.class.getSimpleName(); - protected static final String KEY_SAVED_LIST_POSITION = "SAVED_LIST_POSITION"; private static final String KEY_INDEXES = "INDEXES"; @@ -145,7 +142,7 @@ public boolean isGridEnabled() { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - Log_OC.d(TAG, "onCreateView"); + Log_OC.d("onCreateView"); View v = inflater.inflate(R.layout.list_fragment, null); @@ -194,10 +191,10 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, } int referencePosition = savedInstanceState.getInt(KEY_SAVED_LIST_POSITION); if (isGridEnabled()) { - Log_OC.v(TAG, "Setting grid position " + referencePosition); + Log_OC.v("Setting grid position " + referencePosition); mGridView.setSelection(referencePosition); } else { - Log_OC.v(TAG, "Setting and centering around list position " + referencePosition); + Log_OC.v("Setting and centering around list position " + referencePosition); mListView.setAndCenterSelection(referencePosition); } } @@ -229,7 +226,7 @@ public void onActivityCreated(Bundle savedInstanceState) { @Override public void onSaveInstanceState(Bundle savedInstanceState) { super.onSaveInstanceState(savedInstanceState); - Log_OC.d(TAG, "onSaveInstanceState()"); + Log_OC.d("onSaveInstanceState()"); savedInstanceState.putBoolean(KEY_IS_GRID_VISIBLE, isGridEnabled()); savedInstanceState.putInt(KEY_SAVED_LIST_POSITION, getReferencePosition()); savedInstanceState.putIntegerArrayList(KEY_INDEXES, mIndexes); @@ -270,7 +267,7 @@ protected void restoreIndexAndTopPosition() { final int firstPosition = mFirstPositions.remove(mFirstPositions.size() - 1); int top = mTops.remove(mTops.size() - 1); - Log_OC.v(TAG, "Setting selection to position: " + firstPosition + "; top: " + Log_OC.v("Setting selection to position: " + firstPosition + "; top: " + top + "; index: " + index); if (mCurrentListView == mListView) { @@ -424,7 +421,7 @@ protected void setFooterEnabled(boolean enabled) { try { mGridView.addFooterView(mGridFooterView, null, false); } catch (IllegalStateException ie) { - Log.w(TAG, "Could not add footer to grid view, because it exists"); + Log_OC.w("Could not add footer to grid view, because it exists"); } } mGridFooterView.invalidate(); @@ -468,7 +465,7 @@ protected void setFooterText(String text) { } public void setProgressBarAsIndeterminate(boolean indeterminate) { - Log_OC.d(TAG, "Setting progress visibility to " + indeterminate); + Log_OC.d("Setting progress visibility to " + indeterminate); mShadowView.setVisibility(View.GONE); mProgressBar.setVisibility(View.VISIBLE); mProgressBar.setIndeterminate(indeterminate); diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/owncloudApp/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java index 561543a9df1..3d0dcfffc6d 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java @@ -318,7 +318,7 @@ public boolean onTouch(View v, MotionEvent event) { action.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true); getActivity().startActivityForResult( Intent.createChooser(action, getString(R.string.upload_chooser_title)), - FileDisplayActivity.Companion.getREQUEST_CODE__SELECT_CONTENT_FROM_APPS() + FileDisplayActivity.REQUEST_CODE__SELECT_CONTENT_FROM_APPS ); dialog.hide(); return false; @@ -328,7 +328,7 @@ public boolean onTouch(View v, MotionEvent event) { @Override public boolean onTouch(View v, MotionEvent event) { - ((FileDisplayActivity) getActivity()).getFilesUploadHelper().uploadFromCamera(FileDisplayActivity.Companion.getREQUEST_CODE__UPLOAD_FROM_CAMERA()); + ((FileDisplayActivity) getActivity()).getFilesUploadHelper().uploadFromCamera(FileDisplayActivity.REQUEST_CODE__UPLOAD_FROM_CAMERA); dialog.hide(); return false; } @@ -939,15 +939,13 @@ public boolean onFileActionChosen(int menuId) { case R.id.action_move: { Intent action = new Intent(getActivity(), FolderPickerActivity.class); action.putParcelableArrayListExtra(FolderPickerActivity.EXTRA_FILES, checkedFiles); - getActivity().startActivityForResult(action, - FileDisplayActivity.Companion.getREQUEST_CODE__MOVE_FILES()); + getActivity().startActivityForResult(action, FileDisplayActivity.REQUEST_CODE__MOVE_FILES); return true; } case R.id.action_copy: Intent action = new Intent(getActivity(), FolderPickerActivity.class); action.putParcelableArrayListExtra(FolderPickerActivity.EXTRA_FILES, checkedFiles); - getActivity().startActivityForResult(action, - FileDisplayActivity.Companion.getREQUEST_CODE__COPY_FILES()); + getActivity().startActivityForResult(action, FileDisplayActivity.REQUEST_CODE__COPY_FILES); return true; default: return false; diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java b/owncloudApp/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java index d1306830431..a9b155fa62f 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java @@ -103,7 +103,7 @@ public void openFile(OCFile file) { } List launchables = mFileActivity.getPackageManager(). - queryIntentActivities(openFileWithIntent, PackageManager.GET_INTENT_FILTERS); + queryIntentActivities(openFileWithIntent, PackageManager.MATCH_DEFAULT_ONLY); if (launchables != null && launchables.size() > 0) { try { @@ -180,37 +180,6 @@ public boolean isSharedSupported() { return false; } - /** - * Helper method to remove an existing share, no matter if public or private. - * Starts a request to do it in {@link OperationsService} - * - * @param share The {@link OCShare} to remove (unshare). - */ - public void removeShare(OCShare share) { - Intent unshareService = new Intent(mFileActivity, OperationsService.class); - unshareService.setAction(OperationsService.ACTION_UNSHARE); - unshareService.putExtra(OperationsService.EXTRA_SHARE_ID, share.getId()); - unshareService.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount()); - - queueShareIntent(unshareService); - } - - private void queueShareIntent(Intent shareIntent) { - if (isSharedSupported()) { - // Unshare the file - mWaitingForOpId = mFileActivity.getOperationsServiceBinder(). - queueNewOperation(shareIntent); - - mFileActivity.showLoadingDialog(R.string.wait_a_moment); - - } else { - // Show a Message - mFileActivity.showSnackMessage( - mFileActivity.getString(R.string.share_link_no_support_share_api) - ); - } - } - /** * Show an instance of {@link com.owncloud.android.domain.sharing.shares.model.ShareType} for sharing or unsharing * the {@link OCFile} received as parameter. diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/helpers/UriUploader.java b/owncloudApp/src/main/java/com/owncloud/android/ui/helpers/UriUploader.java index 725995afefb..e291e7691ea 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/helpers/UriUploader.java +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/helpers/UriUploader.java @@ -52,7 +52,7 @@ public class UriUploader { private final String TAG = UriUploader.class.getSimpleName(); private FileActivity mActivity; - private ArrayList mUrisToUpload; + private ArrayList mUrisToUpload; private CopyAndUploadContentUrisTask.OnCopyTmpFilesTaskListener mCopyTmpTaskListener; private int mBehaviour; @@ -72,7 +72,7 @@ public enum UriUploaderResultCode { public UriUploader( FileActivity activity, - ArrayList uris, + ArrayList uris, String uploadPath, Account account, int behaviour, @@ -101,9 +101,6 @@ public UriUploaderResultCode uploadUris() { Uri sourceUri = (Uri) sourceStream; if (sourceUri != null) { String displayName = UriUtils.getDisplayNameForUri(sourceUri, mActivity); - if (displayName == null) { - displayName = generateDiplayName(); - } String remotePath = mUploadPath + displayName; if (ContentResolver.SCHEME_CONTENT.equals(sourceUri.getScheme())) { @@ -120,8 +117,8 @@ public UriUploaderResultCode uploadUris() { if (!contentUris.isEmpty()) { /// content: uris will be copied to temporary files before calling {@link FileUploader} - copyThenUpload(contentUris.toArray(new Uri[contentUris.size()]), - contentRemotePaths.toArray(new String[contentRemotePaths.size()])); + copyThenUpload(contentUris.toArray(new Uri[0]), + contentRemotePaths.toArray(new String[0])); } else if (schemeFileCounter == 0) { mCode = UriUploaderResultCode.ERROR_NO_FILE_TO_UPLOAD; @@ -140,11 +137,6 @@ public UriUploaderResultCode uploadUris() { return mCode; } - private String generateDiplayName() { - return mActivity.getString(R.string.common_unknown) + - "-" + DisplayUtils.unixTimeToHumanReadable(System.currentTimeMillis()); - } - /** * Requests the upload of a file in the local file system to {@link FileUploader} service. * diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewVideoFragment.java b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewVideoFragment.java index 8a48659607a..00aaa9f0e53 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewVideoFragment.java +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewVideoFragment.java @@ -23,7 +23,6 @@ import android.accounts.Account; import android.app.Activity; -import android.content.DialogInterface; import android.content.Intent; import android.content.res.Configuration; import android.os.Bundle; diff --git a/owncloudApp/src/main/java/com/owncloud/android/utils/DisplayUtils.java b/owncloudApp/src/main/java/com/owncloud/android/utils/DisplayUtils.java index ab5625a134f..a2dfb90aaab 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/utils/DisplayUtils.java +++ b/owncloudApp/src/main/java/com/owncloud/android/utils/DisplayUtils.java @@ -196,7 +196,6 @@ public static CharSequence getRelativeTimestamp(Context context, long modificati DateUtils.WEEK_IN_MILLIS, 0); } - @SuppressWarnings("deprecation") public static CharSequence getRelativeDateTimeString( Context c, long time, long minResolution, long transitionResolution, int flags ) { diff --git a/owncloudApp/src/main/java/third_parties/in/srain/cube/GridViewWithHeaderAndFooter.java b/owncloudApp/src/main/java/third_parties/in/srain/cube/GridViewWithHeaderAndFooter.java index 8503001f65e..fe3cbe04b9b 100644 --- a/owncloudApp/src/main/java/third_parties/in/srain/cube/GridViewWithHeaderAndFooter.java +++ b/owncloudApp/src/main/java/third_parties/in/srain/cube/GridViewWithHeaderAndFooter.java @@ -22,7 +22,6 @@ import android.database.DataSetObserver; import android.os.Build; import android.util.AttributeSet; -import android.util.Log; import android.view.View; import android.view.ViewGroup; import android.widget.AdapterView; @@ -43,9 +42,6 @@ * See {@link GridViewWithHeaderAndFooter#addFooterView(View, Object, boolean)} */ public class GridViewWithHeaderAndFooter extends GridView { - - public static boolean DEBUG = false; - /** * A class that represents a fixed view in a list, for example a header at the top * or a footer at the bottom. @@ -68,7 +64,6 @@ private static class FixedViewInfo { private View mViewForMeasureRowHeight = null; private int mRowHeight = -1; - private static final String LOG_TAG = "grid-view-header-footer"; private ArrayList mHeaderViewInfos = new ArrayList<>(); private ArrayList mFooterViewInfos = new ArrayList<>(); @@ -579,9 +574,6 @@ public boolean hasStableIds() { @Override public View getView(int position, View convertView, ViewGroup parent) { - if (DEBUG) { - Log.d(LOG_TAG, String.format("getView: %s, reused: %s", position, convertView == null)); - } // Header (negative positions will throw an ArrayIndexOutOfBoundsException) int numHeadersAndPlaceholders = getHeadersCount() * mNumColumns; if (position < numHeadersAndPlaceholders) { @@ -682,10 +674,6 @@ public int getItemViewType(int position) { type = adapterViewTypeStart + mHeaderViewInfos.size() + 1 + (footerPosition / mNumColumns + 1); } } - if (DEBUG) { - Log.d(LOG_TAG, String.format("getItemViewType: pos: %s, result: %s", position, type, - mCachePlaceHoldView, mCacheFirstHeaderView)); - } return type; } @@ -704,9 +692,6 @@ public int getViewTypeCount() { } count += offset; } - if (DEBUG) { - Log.d(LOG_TAG, String.format("getViewTypeCount: %s", count)); - } return count; } @@ -760,34 +745,6 @@ public void setSelectionFromTop(int position, int y) { } setSelection(position); - //setSelectionInt(position); - - /*if (!isInTouchMode()) { - position = super.lookForSelectablePosition(position, true); - if (position >= 0) { - setNextSelectedPositionInt(position); - } - } else { - mResurrectToPosition = position; - }*/ - - /* - if (position >= 0) { - mLayoutMode = LAYOUT_SPECIFIC; - mSpecificTop = mListPadding.top + y; - - if (mNeedSync) { - mSyncPosition = position; - mSyncRowId = getAdapter().getItemId(position); - } - - if (mPositionScroller != null) { - mPositionScroller.stop(); - } - - requestLayout(); - } - */ } } diff --git a/owncloudApp/src/main/res/drawable-anydpi-v21/arrow_right.xml b/owncloudApp/src/main/res/drawable-anydpi-v21/arrow_right.xml deleted file mode 100644 index 3208e8aa831..00000000000 --- a/owncloudApp/src/main/res/drawable-anydpi-v21/arrow_right.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/owncloudApp/src/main/res/drawable-hdpi/folder_external.png b/owncloudApp/src/main/res/drawable-hdpi/folder_external.png deleted file mode 100644 index 29fa3784b14..00000000000 Binary files a/owncloudApp/src/main/res/drawable-hdpi/folder_external.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-hdpi/ic_action_settings.png b/owncloudApp/src/main/res/drawable-hdpi/ic_action_settings.png deleted file mode 100644 index cff84744f18..00000000000 Binary files a/owncloudApp/src/main/res/drawable-hdpi/ic_action_settings.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-hdpi/ic_favorite.png b/owncloudApp/src/main/res/drawable-hdpi/ic_favorite.png deleted file mode 100644 index d95f7249ebd..00000000000 Binary files a/owncloudApp/src/main/res/drawable-hdpi/ic_favorite.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-hdpi/ic_log.png b/owncloudApp/src/main/res/drawable-hdpi/ic_log.png deleted file mode 100644 index dd7d0734d8d..00000000000 Binary files a/owncloudApp/src/main/res/drawable-hdpi/ic_log.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-hdpi/ic_navigate_next.png b/owncloudApp/src/main/res/drawable-hdpi/ic_navigate_next.png deleted file mode 100644 index a4221baf6f4..00000000000 Binary files a/owncloudApp/src/main/res/drawable-hdpi/ic_navigate_next.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-hdpi/ic_refresh.png b/owncloudApp/src/main/res/drawable-hdpi/ic_refresh.png deleted file mode 100644 index 4d4c5171186..00000000000 Binary files a/owncloudApp/src/main/res/drawable-hdpi/ic_refresh.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-hdpi/whats_new_av_offline_jobs.png b/owncloudApp/src/main/res/drawable-hdpi/whats_new_av_offline_jobs.png deleted file mode 100644 index e067f9bd358..00000000000 Binary files a/owncloudApp/src/main/res/drawable-hdpi/whats_new_av_offline_jobs.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-hdpi/whats_new_current_folder_search.png b/owncloudApp/src/main/res/drawable-hdpi/whats_new_current_folder_search.png deleted file mode 100644 index add992e7eb8..00000000000 Binary files a/owncloudApp/src/main/res/drawable-hdpi/whats_new_current_folder_search.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-hdpi/whats_new_fingerprint_lock.png b/owncloudApp/src/main/res/drawable-hdpi/whats_new_fingerprint_lock.png deleted file mode 100644 index f870971085f..00000000000 Binary files a/owncloudApp/src/main/res/drawable-hdpi/whats_new_fingerprint_lock.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-hdpi/whats_new_gif_support.png b/owncloudApp/src/main/res/drawable-hdpi/whats_new_gif_support.png deleted file mode 100644 index 4368c7b6024..00000000000 Binary files a/owncloudApp/src/main/res/drawable-hdpi/whats_new_gif_support.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-hdpi/whats_new_new_icons.png b/owncloudApp/src/main/res/drawable-hdpi/whats_new_new_icons.png deleted file mode 100644 index 5c4c8d499af..00000000000 Binary files a/owncloudApp/src/main/res/drawable-hdpi/whats_new_new_icons.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-hdpi/whats_new_new_pins.png b/owncloudApp/src/main/res/drawable-hdpi/whats_new_new_pins.png deleted file mode 100644 index 6665c2f2592..00000000000 Binary files a/owncloudApp/src/main/res/drawable-hdpi/whats_new_new_pins.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-hdpi/whats_new_pattern_lock.png b/owncloudApp/src/main/res/drawable-hdpi/whats_new_pattern_lock.png deleted file mode 100644 index ecd3469210b..00000000000 Binary files a/owncloudApp/src/main/res/drawable-hdpi/whats_new_pattern_lock.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-hdpi/whats_new_select_all.png b/owncloudApp/src/main/res/drawable-hdpi/whats_new_select_all.png deleted file mode 100644 index a523b97931d..00000000000 Binary files a/owncloudApp/src/main/res/drawable-hdpi/whats_new_select_all.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-hdpi/whats_new_upload_camera_picture.png b/owncloudApp/src/main/res/drawable-hdpi/whats_new_upload_camera_picture.png deleted file mode 100644 index 4276b7b951c..00000000000 Binary files a/owncloudApp/src/main/res/drawable-hdpi/whats_new_upload_camera_picture.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-hdpi/whats_new_user_quota.png b/owncloudApp/src/main/res/drawable-hdpi/whats_new_user_quota.png deleted file mode 100644 index e0806477582..00000000000 Binary files a/owncloudApp/src/main/res/drawable-hdpi/whats_new_user_quota.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-mdpi/folder_external.png b/owncloudApp/src/main/res/drawable-mdpi/folder_external.png deleted file mode 100644 index 4f961d15e24..00000000000 Binary files a/owncloudApp/src/main/res/drawable-mdpi/folder_external.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-mdpi/ic_action_settings.png b/owncloudApp/src/main/res/drawable-mdpi/ic_action_settings.png deleted file mode 100644 index 0eb78f7c734..00000000000 Binary files a/owncloudApp/src/main/res/drawable-mdpi/ic_action_settings.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-mdpi/ic_favorite.png b/owncloudApp/src/main/res/drawable-mdpi/ic_favorite.png deleted file mode 100644 index 487b89d5edc..00000000000 Binary files a/owncloudApp/src/main/res/drawable-mdpi/ic_favorite.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-mdpi/ic_navigate_next.png b/owncloudApp/src/main/res/drawable-mdpi/ic_navigate_next.png deleted file mode 100644 index 3c237ed85f0..00000000000 Binary files a/owncloudApp/src/main/res/drawable-mdpi/ic_navigate_next.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-mdpi/ic_refresh.png b/owncloudApp/src/main/res/drawable-mdpi/ic_refresh.png deleted file mode 100644 index f37c0781091..00000000000 Binary files a/owncloudApp/src/main/res/drawable-mdpi/ic_refresh.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-xhdpi/folder_external.png b/owncloudApp/src/main/res/drawable-xhdpi/folder_external.png deleted file mode 100644 index 33909f7d81d..00000000000 Binary files a/owncloudApp/src/main/res/drawable-xhdpi/folder_external.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-xhdpi/ic_favorite.png b/owncloudApp/src/main/res/drawable-xhdpi/ic_favorite.png deleted file mode 100644 index 8a777a4727b..00000000000 Binary files a/owncloudApp/src/main/res/drawable-xhdpi/ic_favorite.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-xhdpi/ic_log.png b/owncloudApp/src/main/res/drawable-xhdpi/ic_log.png deleted file mode 100644 index 50b1541e7d6..00000000000 Binary files a/owncloudApp/src/main/res/drawable-xhdpi/ic_log.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-xhdpi/ic_navigate_next.png b/owncloudApp/src/main/res/drawable-xhdpi/ic_navigate_next.png deleted file mode 100644 index 8eab33c6305..00000000000 Binary files a/owncloudApp/src/main/res/drawable-xhdpi/ic_navigate_next.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-xhdpi/ic_refresh.png b/owncloudApp/src/main/res/drawable-xhdpi/ic_refresh.png deleted file mode 100644 index 63f616dc29a..00000000000 Binary files a/owncloudApp/src/main/res/drawable-xhdpi/ic_refresh.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-xhdpi/whats_new_av_offline_jobs.png b/owncloudApp/src/main/res/drawable-xhdpi/whats_new_av_offline_jobs.png deleted file mode 100644 index d0305df300d..00000000000 Binary files a/owncloudApp/src/main/res/drawable-xhdpi/whats_new_av_offline_jobs.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-xhdpi/whats_new_current_folder_search.png b/owncloudApp/src/main/res/drawable-xhdpi/whats_new_current_folder_search.png deleted file mode 100644 index 9569128069f..00000000000 Binary files a/owncloudApp/src/main/res/drawable-xhdpi/whats_new_current_folder_search.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-xhdpi/whats_new_fingerprint_lock.png b/owncloudApp/src/main/res/drawable-xhdpi/whats_new_fingerprint_lock.png deleted file mode 100644 index 6eae5ff355b..00000000000 Binary files a/owncloudApp/src/main/res/drawable-xhdpi/whats_new_fingerprint_lock.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-xhdpi/whats_new_gif_support.png b/owncloudApp/src/main/res/drawable-xhdpi/whats_new_gif_support.png deleted file mode 100644 index 653cc5e2270..00000000000 Binary files a/owncloudApp/src/main/res/drawable-xhdpi/whats_new_gif_support.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-xhdpi/whats_new_new_icons.png b/owncloudApp/src/main/res/drawable-xhdpi/whats_new_new_icons.png deleted file mode 100644 index e568761c37f..00000000000 Binary files a/owncloudApp/src/main/res/drawable-xhdpi/whats_new_new_icons.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-xhdpi/whats_new_new_pins.png b/owncloudApp/src/main/res/drawable-xhdpi/whats_new_new_pins.png deleted file mode 100644 index 4a40238435d..00000000000 Binary files a/owncloudApp/src/main/res/drawable-xhdpi/whats_new_new_pins.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-xhdpi/whats_new_pattern_lock.png b/owncloudApp/src/main/res/drawable-xhdpi/whats_new_pattern_lock.png deleted file mode 100644 index 5aac9b6904e..00000000000 Binary files a/owncloudApp/src/main/res/drawable-xhdpi/whats_new_pattern_lock.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-xhdpi/whats_new_select_all.png b/owncloudApp/src/main/res/drawable-xhdpi/whats_new_select_all.png deleted file mode 100644 index fd59bb4e7f0..00000000000 Binary files a/owncloudApp/src/main/res/drawable-xhdpi/whats_new_select_all.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-xhdpi/whats_new_upload_camera_picture.png b/owncloudApp/src/main/res/drawable-xhdpi/whats_new_upload_camera_picture.png deleted file mode 100644 index 8e435bfa34a..00000000000 Binary files a/owncloudApp/src/main/res/drawable-xhdpi/whats_new_upload_camera_picture.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-xhdpi/whats_new_user_quota.png b/owncloudApp/src/main/res/drawable-xhdpi/whats_new_user_quota.png deleted file mode 100644 index 28c6a1fa8d3..00000000000 Binary files a/owncloudApp/src/main/res/drawable-xhdpi/whats_new_user_quota.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-xxhdpi/folder_external.png b/owncloudApp/src/main/res/drawable-xxhdpi/folder_external.png deleted file mode 100644 index 29347c5a65b..00000000000 Binary files a/owncloudApp/src/main/res/drawable-xxhdpi/folder_external.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-xxhdpi/ic_log.png b/owncloudApp/src/main/res/drawable-xxhdpi/ic_log.png deleted file mode 100644 index 50f854ea5a0..00000000000 Binary files a/owncloudApp/src/main/res/drawable-xxhdpi/ic_log.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-xxhdpi/ic_navigate_next.png b/owncloudApp/src/main/res/drawable-xxhdpi/ic_navigate_next.png deleted file mode 100644 index d4b141b9da4..00000000000 Binary files a/owncloudApp/src/main/res/drawable-xxhdpi/ic_navigate_next.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-xxhdpi/ic_refresh.png b/owncloudApp/src/main/res/drawable-xxhdpi/ic_refresh.png deleted file mode 100644 index 07a6372dfe8..00000000000 Binary files a/owncloudApp/src/main/res/drawable-xxhdpi/ic_refresh.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-xxhdpi/ic_sort_variant.png b/owncloudApp/src/main/res/drawable-xxhdpi/ic_sort_variant.png deleted file mode 100644 index 2918126d1c9..00000000000 Binary files a/owncloudApp/src/main/res/drawable-xxhdpi/ic_sort_variant.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-xxhdpi/owncloud_progress_bg_light.9.png b/owncloudApp/src/main/res/drawable-xxhdpi/owncloud_progress_bg_light.9.png deleted file mode 100644 index fb146c33987..00000000000 Binary files a/owncloudApp/src/main/res/drawable-xxhdpi/owncloud_progress_bg_light.9.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-xxhdpi/owncloud_progress_primary_light.9.png b/owncloudApp/src/main/res/drawable-xxhdpi/owncloud_progress_primary_light.9.png deleted file mode 100644 index 1fc3b4ec7c9..00000000000 Binary files a/owncloudApp/src/main/res/drawable-xxhdpi/owncloud_progress_primary_light.9.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-xxhdpi/owncloud_progress_secondary_light.9.png b/owncloudApp/src/main/res/drawable-xxhdpi/owncloud_progress_secondary_light.9.png deleted file mode 100644 index 6cae209f42b..00000000000 Binary files a/owncloudApp/src/main/res/drawable-xxhdpi/owncloud_progress_secondary_light.9.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-xxxhdpi/ic_navigate_next.png b/owncloudApp/src/main/res/drawable-xxxhdpi/ic_navigate_next.png deleted file mode 100644 index 12ec7bf0ab9..00000000000 Binary files a/owncloudApp/src/main/res/drawable-xxxhdpi/ic_navigate_next.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable-xxxhdpi/ic_refresh.png b/owncloudApp/src/main/res/drawable-xxxhdpi/ic_refresh.png deleted file mode 100644 index c1ea1e23d0c..00000000000 Binary files a/owncloudApp/src/main/res/drawable-xxxhdpi/ic_refresh.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable/action_item_btn.xml b/owncloudApp/src/main/res/drawable/action_item_btn.xml deleted file mode 100644 index 02fdd765b59..00000000000 --- a/owncloudApp/src/main/res/drawable/action_item_btn.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/owncloudApp/src/main/res/drawable/action_item_selected.9.png b/owncloudApp/src/main/res/drawable/action_item_selected.9.png deleted file mode 100644 index de41f40e1cd..00000000000 Binary files a/owncloudApp/src/main/res/drawable/action_item_selected.9.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable/arrow_down.png b/owncloudApp/src/main/res/drawable/arrow_down.png deleted file mode 100644 index 05e6a596509..00000000000 Binary files a/owncloudApp/src/main/res/drawable/arrow_down.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable/arrow_up.png b/owncloudApp/src/main/res/drawable/arrow_up.png deleted file mode 100644 index 4412938cf78..00000000000 Binary files a/owncloudApp/src/main/res/drawable/arrow_up.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable/backrepeat.xml b/owncloudApp/src/main/res/drawable/backrepeat.xml deleted file mode 100644 index 37105c7b6b7..00000000000 --- a/owncloudApp/src/main/res/drawable/backrepeat.xml +++ /dev/null @@ -1,4 +0,0 @@ - - \ No newline at end of file diff --git a/owncloudApp/src/main/res/drawable/btn.xml b/owncloudApp/src/main/res/drawable/btn.xml deleted file mode 100644 index d7affb1fbe0..00000000000 --- a/owncloudApp/src/main/res/drawable/btn.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/owncloudApp/src/main/res/drawable/btn_cancel.png b/owncloudApp/src/main/res/drawable/btn_cancel.png deleted file mode 100644 index 0a339bde389..00000000000 Binary files a/owncloudApp/src/main/res/drawable/btn_cancel.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable/btn_round.xml b/owncloudApp/src/main/res/drawable/btn_round.xml deleted file mode 100644 index 21a19287864..00000000000 --- a/owncloudApp/src/main/res/drawable/btn_round.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/owncloudApp/src/main/res/drawable/btn_round_pressed.xml b/owncloudApp/src/main/res/drawable/btn_round_pressed.xml deleted file mode 100644 index 6ce86ef3026..00000000000 --- a/owncloudApp/src/main/res/drawable/btn_round_pressed.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/owncloudApp/src/main/res/drawable/btn_small_round.xml b/owncloudApp/src/main/res/drawable/btn_small_round.xml deleted file mode 100755 index 6e34b8b2078..00000000000 --- a/owncloudApp/src/main/res/drawable/btn_small_round.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/owncloudApp/src/main/res/drawable/checker_16_16.png b/owncloudApp/src/main/res/drawable/checker_16_16.png deleted file mode 100644 index 3e9e3d0969f..00000000000 Binary files a/owncloudApp/src/main/res/drawable/checker_16_16.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable/header.png b/owncloudApp/src/main/res/drawable/header.png deleted file mode 100644 index d377f65186d..00000000000 Binary files a/owncloudApp/src/main/res/drawable/header.png and /dev/null differ diff --git a/owncloudApp/src/main/res/drawable/logo_icon.xml b/owncloudApp/src/main/res/drawable/logo_icon.xml deleted file mode 100644 index 28d97875716..00000000000 --- a/owncloudApp/src/main/res/drawable/logo_icon.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/owncloudApp/src/main/res/drawable/popup.9.png b/owncloudApp/src/main/res/drawable/popup.9.png deleted file mode 100644 index 334227234fb..00000000000 Binary files a/owncloudApp/src/main/res/drawable/popup.9.png and /dev/null differ diff --git a/owncloudApp/src/main/res/layout-land/account_setup.xml b/owncloudApp/src/main/res/layout-land/account_setup.xml index f16c106bbd8..c91029913fe 100644 --- a/owncloudApp/src/main/res/layout-land/account_setup.xml +++ b/owncloudApp/src/main/res/layout-land/account_setup.xml @@ -31,7 +31,6 @@ android:visibility="invisible"/> @@ -119,8 +117,8 @@ android:id="@+id/embeddedCheckServerButton" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_gravity="center_vertical|right" - android:layout_marginRight="5dp" + android:layout_gravity="center_vertical|end" + android:layout_marginEnd="5dp" android:background="@android:color/transparent" android:contentDescription="@string/auth_refresh_button" android:padding="0dp" @@ -131,8 +129,8 @@ android:id="@+id/embeddedRefreshButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center_vertical|right" - android:layout_marginRight="5dp" + android:layout_gravity="center_vertical|end" + android:layout_marginEnd="5dp" android:background="@android:color/transparent" android:contentDescription="@string/auth_refresh_button" android:padding="0dp" @@ -148,7 +146,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="10dp" android:contentDescription="@string/auth_testing_connection" - android:drawableLeft="@android:drawable/stat_notify_sync" + android:drawableStart="@android:drawable/stat_notify_sync" android:drawablePadding="5dp" android:gravity="center_vertical" android:minHeight="32dp" @@ -159,7 +157,6 @@ android:id="@+id/account_username" android:layout_width="match_parent" android:layout_height="wrap_content" - android:contentDescription="@string/auth_username" android:ems="10" android:hint="@string/auth_username" android:inputType="textNoSuggestions" @@ -184,7 +181,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:contentDescription="@string/auth_unauthorized" - android:drawableLeft="@android:drawable/stat_notify_sync" + android:drawableStart="@android:drawable/stat_notify_sync" android:drawablePadding="5dip" android:gravity="center_vertical" android:text="@string/auth_unauthorized" diff --git a/owncloudApp/src/main/res/layout-land/activity_pattern_lock.xml b/owncloudApp/src/main/res/layout-land/activity_pattern_lock.xml index 6d26588995e..b7dfa8a552b 100644 --- a/owncloudApp/src/main/res/layout-land/activity_pattern_lock.xml +++ b/owncloudApp/src/main/res/layout-land/activity_pattern_lock.xml @@ -1,64 +1,57 @@ - - + android:text="@string/pattern_enter_pattern" + android:textColor="@android:color/black" + android:textSize="16sp" /> - + - + + + + + + + - - - - - - - - - - - + android:layout_centerVertical="true" + android:layout_toEndOf="@id/pattern_lock_view" + android:text="@android:string/cancel" + android:theme="@style/Button.Primary" /> - + - + diff --git a/owncloudApp/src/main/res/layout/account_action.xml b/owncloudApp/src/main/res/layout/account_action.xml index 5b3f7342521..09dbd61cffb 100644 --- a/owncloudApp/src/main/res/layout/account_action.xml +++ b/owncloudApp/src/main/res/layout/account_action.xml @@ -28,7 +28,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:layout_marginLeft="20dp" android:layout_marginStart="20dp" android:src="@drawable/ic_account_plus" /> @@ -40,7 +39,6 @@ android:layout_marginStart="20dp" android:layout_weight="1" android:gravity="center_vertical" - android:paddingRight="@dimen/standard_padding" android:paddingEnd="@dimen/standard_padding" android:text="@string/placeholder_filename" android:textColor="@color/primary" diff --git a/owncloudApp/src/main/res/layout/account_item.xml b/owncloudApp/src/main/res/layout/account_item.xml index b2b9a7ce951..e6ed8cbf4ab 100644 --- a/owncloudApp/src/main/res/layout/account_item.xml +++ b/owncloudApp/src/main/res/layout/account_item.xml @@ -26,10 +26,8 @@ android:id="@+id/icon" android:layout_width="40dp" android:layout_height="40dp" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" android:layout_centerInParent="true" - android:layout_marginLeft="@dimen/standard_margin" android:layout_marginStart="@dimen/standard_margin" android:src="@drawable/ic_account_plus" /> @@ -38,10 +36,8 @@ android:id="@+id/ticker" android:layout_width="16dp" android:layout_height="16dp" - android:layout_alignRight="@id/icon" android:layout_alignEnd="@id/icon" android:layout_alignTop="@id/icon" - android:layout_marginRight="-8dp" android:layout_marginEnd="-8dp" android:layout_marginTop="-8dp" android:src="@drawable/ic_current" @@ -53,15 +49,11 @@ android:id="@+id/name" android:layout_width="match_parent" android:layout_height="28dp" - android:layout_marginLeft="@dimen/standard_margin" android:layout_marginStart="@dimen/standard_margin" - android:layout_marginRight="@dimen/standard_half_margin" android:layout_marginEnd="@dimen/standard_half_margin" android:layout_marginTop="4dp" - android:layout_toRightOf="@id/icon" android:layout_toEndOf="@id/icon" - android:layout_toLeftOf="@+id/passwordButton" - android:layout_toStartOf="@id/passwordButton" + android:layout_toStartOf="@+id/passwordButton" android:layout_alignParentTop="true" android:gravity="bottom" android:text="@string/placeholder_filename" @@ -75,14 +67,10 @@ android:id="@+id/account" android:layout_width="match_parent" android:layout_height="44dp" - android:layout_marginLeft="@dimen/standard_margin" android:layout_marginStart="@dimen/standard_margin" - android:layout_marginRight="@dimen/standard_half_margin" android:layout_marginEnd="@dimen/standard_half_margin" android:layout_marginBottom="4dp" - android:layout_toRightOf="@id/icon" android:layout_toEndOf="@id/icon" - android:layout_toLeftOf="@id/passwordButton" android:layout_toStartOf="@id/passwordButton" android:layout_alignParentBottom="true" android:layout_below="@id/name" @@ -94,11 +82,10 @@ android:ellipsize="end" /> diff --git a/owncloudApp/src/main/res/layout/account_setup.xml b/owncloudApp/src/main/res/layout/account_setup.xml index 4d92a611656..778719d13d4 100644 --- a/owncloudApp/src/main/res/layout/account_setup.xml +++ b/owncloudApp/src/main/res/layout/account_setup.xml @@ -89,11 +89,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" - android:contentDescription="@string/auth_host_address" android:drawablePadding="5dp" android:hint="@string/auth_host_url" android:inputType="textUri" - android:paddingRight="55dp" + android:paddingEnd="55dp" android:theme="@style/EditText.Authenticator"> @@ -103,8 +102,8 @@ android:id="@+id/embeddedCheckServerButton" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_gravity="center_vertical|right" - android:layout_marginRight="5dp" + android:layout_gravity="center_vertical|end" + android:layout_marginEnd="5dp" android:background="@android:color/transparent" android:contentDescription="@string/auth_refresh_button" android:padding="0dp" @@ -115,8 +114,8 @@ android:id="@+id/embeddedRefreshButton" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_gravity="center_vertical|right" - android:layout_marginRight="5dp" + android:layout_gravity="center_vertical|end" + android:layout_marginEnd="5dp" android:background="@android:color/transparent" android:contentDescription="@string/auth_refresh_button" android:padding="0dp" @@ -131,7 +130,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="10dp" android:contentDescription="@string/auth_testing_connection" - android:drawableLeft="@android:drawable/stat_notify_sync" + android:drawableStart="@android:drawable/stat_notify_sync" android:drawablePadding="5dp" android:gravity="center_vertical" android:minHeight="32dp" @@ -143,7 +142,6 @@ style="@style/EditText.Authenticator" android:layout_width="match_parent" android:layout_height="wrap_content" - android:contentDescription="@string/auth_username" android:ems="10" android:hint="@string/auth_username" android:inputType="textNoSuggestions" @@ -155,7 +153,6 @@ style="@style/EditText.Authenticator" android:layout_width="match_parent" android:layout_height="wrap_content" - android:contentDescription="@string/auth_password" android:drawablePadding="5dp" android:ems="10" android:hint="@string/auth_password" diff --git a/owncloudApp/src/main/res/layout/action_item.xml b/owncloudApp/src/main/res/layout/action_item.xml deleted file mode 100644 index bd3232dda85..00000000000 --- a/owncloudApp/src/main/res/layout/action_item.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/owncloudApp/src/main/res/layout/activity_pattern_lock.xml b/owncloudApp/src/main/res/layout/activity_pattern_lock.xml index dcb5de244f4..36c093d6702 100644 --- a/owncloudApp/src/main/res/layout/activity_pattern_lock.xml +++ b/owncloudApp/src/main/res/layout/activity_pattern_lock.xml @@ -1,56 +1,49 @@ - - - - - - - - - - - - - + android:text="@string/pattern_enter_pattern" + android:textColor="@android:color/black" + android:textSize="16sp" /> - + + + + + + + + - + diff --git a/owncloudApp/src/main/res/layout/activity_row.xml b/owncloudApp/src/main/res/layout/activity_row.xml index 1e3a3cae324..bab115f8955 100644 --- a/owncloudApp/src/main/res/layout/activity_row.xml +++ b/owncloudApp/src/main/res/layout/activity_row.xml @@ -40,7 +40,6 @@ android:layout_height="40dip" android:layout_gravity="center_vertical" android:layout_marginEnd="8dip" - android:layout_marginRight="8dip" android:duplicateParentState="true" /> @@ -49,10 +48,8 @@ android:layout_width="@dimen/nav_drawer_header_avatar_other_accounts_size" android:layout_height="@dimen/nav_drawer_header_avatar_other_accounts_size" android:layout_alignTop="@id/drawer_current_account" - android:layout_alignParentRight="true" android:layout_alignParentEnd="true" android:layout_marginEnd="@dimen/nav_drawer_header_avatar_second_account_margin" - android:layout_marginRight="@dimen/nav_drawer_header_avatar_second_account_margin" android:src="@drawable/ic_account_circle" android:onClick="onAccountDrawerClick" /> @@ -61,7 +58,6 @@ android:layout_width="@dimen/nav_drawer_header_avatar_other_accounts_size" android:layout_height="@dimen/nav_drawer_header_avatar_other_accounts_size" android:layout_alignTop="@id/drawer_current_account" - android:layout_alignParentRight="true" android:layout_alignParentEnd="true" android:src="@drawable/ic_account_circle" android:onClick="onAccountDrawerClick" /> @@ -71,11 +67,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_above="@+id/drawer_username_full" - android:layout_toLeftOf="@+id/drawer_account_chooser_toogle" android:layout_toStartOf="@id/drawer_account_chooser_toogle" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:paddingRight="@dimen/standard_half_padding" android:paddingEnd="@dimen/standard_half_padding" android:ellipsize="end" android:shadowColor="@color/black" @@ -93,11 +86,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:layout_toLeftOf="@id/drawer_account_chooser_toogle" android:layout_toStartOf="@id/drawer_account_chooser_toogle" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:paddingRight="@dimen/standard_half_padding" android:paddingEnd="@dimen/standard_half_padding" android:ellipsize="end" android:lines="1" @@ -111,12 +101,11 @@ android:textSize="12sp" /> diff --git a/owncloudApp/src/main/res/layout/file_actions.xml b/owncloudApp/src/main/res/layout/file_actions.xml deleted file mode 100644 index 7db8b5ebfc6..00000000000 --- a/owncloudApp/src/main/res/layout/file_actions.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/owncloudApp/src/main/res/layout/file_details_fragment.xml b/owncloudApp/src/main/res/layout/file_details_fragment.xml index 46aedad7e81..f1a4168d525 100644 --- a/owncloudApp/src/main/res/layout/file_details_fragment.xml +++ b/owncloudApp/src/main/res/layout/file_details_fragment.xml @@ -49,9 +49,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:layout_marginLeft="@dimen/standard_half_margin" android:layout_marginStart="@dimen/standard_half_margin" - android:layout_toRightOf="@+id/fdIcon" + android:layout_toEndOf="@+id/fdIcon" android:text="@string/placeholder_sentence" android:textAppearance="?android:attr/textAppearanceLarge" /> @@ -114,8 +113,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentTop="true" - android:layout_marginLeft="@dimen/standard_margin" - android:layout_toRightOf="@+id/fdLabelContainer"> + android:layout_marginStart="@dimen/standard_margin" + android:layout_toEndOf="@+id/fdLabelContainer"> diff --git a/owncloudApp/src/main/res/layout/file_download_fragment.xml b/owncloudApp/src/main/res/layout/file_download_fragment.xml index 2310a2e4a50..9a31e00f33b 100644 --- a/owncloudApp/src/main/res/layout/file_download_fragment.xml +++ b/owncloudApp/src/main/res/layout/file_download_fragment.xml @@ -58,7 +58,7 @@ android:id="@+id/cancelBtn" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="12dp" + android:layout_marginStart="12dp" android:src="@drawable/ic_action_cancel_grey" android:background="@android:color/transparent" /> diff --git a/owncloudApp/src/main/res/layout/files_folder_picker.xml b/owncloudApp/src/main/res/layout/files_folder_picker.xml index 8ea7782609f..c4cc08f8e78 100644 --- a/owncloudApp/src/main/res/layout/files_folder_picker.xml +++ b/owncloudApp/src/main/res/layout/files_folder_picker.xml @@ -48,7 +48,7 @@ along with this program. If not, see . style="?android:buttonStyle" android:layout_width="50dp" android:layout_height="match_parent" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:src="@drawable/ic_home_black" android:visibility="gone" /> diff --git a/owncloudApp/src/main/res/layout/fingerprint_dialog.xml b/owncloudApp/src/main/res/layout/fingerprint_dialog.xml index 36286c31c6d..9cd5be221e1 100644 --- a/owncloudApp/src/main/res/layout/fingerprint_dialog.xml +++ b/owncloudApp/src/main/res/layout/fingerprint_dialog.xml @@ -31,7 +31,6 @@ android:id="@+id/fingerprintDescription" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" android:layout_alignParentTop="true" android:text="@string/fingerprint_confirm" @@ -41,7 +40,6 @@ android:id="@+id/fingerprintTouch" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" android:layout_below="@id/fingerprintDescription" android:layout_marginTop="20dp" @@ -51,7 +49,6 @@ android:id="@+id/fingerprintIcon" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_below="@+id/fingerprintDescription" android:layout_marginBottom="@dimen/standard_half_margin" android:layout_marginTop="@dimen/standard_half_margin" android:src="@drawable/ic_fp_40px" /> @@ -60,7 +57,6 @@ android:id="@+id/fingerprintStatus" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginLeft="@dimen/standard_margin" android:layout_marginStart="@dimen/standard_margin" android:gravity="center_vertical" android:text="@string/fingerprint_hint" @@ -72,7 +68,7 @@ style="@style/Button.Primary" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:layout_below="@+id/fingerprintTouch" android:layout_marginTop="@dimen/standard_half_margin" android:text="@android:string/cancel" diff --git a/owncloudApp/src/main/res/layout/grid_image.xml b/owncloudApp/src/main/res/layout/grid_image.xml index 5670a0d39a6..76a8b863e51 100644 --- a/owncloudApp/src/main/res/layout/grid_image.xml +++ b/owncloudApp/src/main/res/layout/grid_image.xml @@ -42,7 +42,7 @@ android:id="@+id/sharedIcon" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="top|right" + android:layout_gravity="top|end" android:layout_margin="4dp" android:src="@drawable/shared_via_link" /> @@ -50,7 +50,7 @@ android:id="@+id/localFileIndicator" android:layout_width="@dimen/file_indicator_pin_size_grid" android:layout_height="@dimen/file_indicator_pin_size_grid" - android:layout_gravity="bottom|right" + android:layout_gravity="bottom|end" android:layout_margin="4dp" android:src="@drawable/sync_pin" /> diff --git a/owncloudApp/src/main/res/layout/grid_item.xml b/owncloudApp/src/main/res/layout/grid_item.xml index db606e19f39..2a41e3574c8 100644 --- a/owncloudApp/src/main/res/layout/grid_item.xml +++ b/owncloudApp/src/main/res/layout/grid_item.xml @@ -16,6 +16,7 @@ --> @@ -77,8 +78,8 @@ android:ellipsize="middle" android:gravity="center_horizontal" android:singleLine="true" - android:text="TextView" android:textColor="@color/textColor" - android:textSize="16dip" /> + android:textSize="16dip" + tools:text="TextView"/> \ No newline at end of file diff --git a/owncloudApp/src/main/res/layout/listrow_details.xml b/owncloudApp/src/main/res/layout/listrow_details.xml deleted file mode 100644 index ca84ef5794c..00000000000 --- a/owncloudApp/src/main/res/layout/listrow_details.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/owncloudApp/src/main/res/layout/listrow_group.xml b/owncloudApp/src/main/res/layout/listrow_group.xml deleted file mode 100644 index 2f3c482774e..00000000000 --- a/owncloudApp/src/main/res/layout/listrow_group.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - \ No newline at end of file diff --git a/owncloudApp/src/main/res/layout/loading_dialog.xml b/owncloudApp/src/main/res/layout/loading_dialog.xml index c843971a45d..b5e502f1337 100644 --- a/owncloudApp/src/main/res/layout/loading_dialog.xml +++ b/owncloudApp/src/main/res/layout/loading_dialog.xml @@ -39,7 +39,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:layout_marginLeft="@dimen/standard_margin" + android:layout_marginStart="@dimen/standard_margin" android:text="TextView" /> diff --git a/owncloudApp/src/main/res/layout/password_dialog.xml b/owncloudApp/src/main/res/layout/password_dialog.xml deleted file mode 100644 index 6b63206b65d..00000000000 --- a/owncloudApp/src/main/res/layout/password_dialog.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/owncloudApp/src/main/res/layout/popup.xml b/owncloudApp/src/main/res/layout/popup.xml deleted file mode 100644 index 0ba8f9dc3d7..00000000000 --- a/owncloudApp/src/main/res/layout/popup.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/owncloudApp/src/main/res/layout/rate_me_dialog.xml b/owncloudApp/src/main/res/layout/rate_me_dialog.xml index b1bae2b8c08..f8cac7631a2 100644 --- a/owncloudApp/src/main/res/layout/rate_me_dialog.xml +++ b/owncloudApp/src/main/res/layout/rate_me_dialog.xml @@ -29,7 +29,6 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" - android:drawableRight="@drawable/ic_star_black_24dp" android:drawableEnd="@drawable/ic_star_black_24dp" android:drawablePadding="16dp" android:textColor="@color/color_accent" diff --git a/owncloudApp/src/main/res/layout/search_suggestion_row.xml b/owncloudApp/src/main/res/layout/search_suggestion_row.xml index 266811fc73f..7052828a775 100644 --- a/owncloudApp/src/main/res/layout/search_suggestion_row.xml +++ b/owncloudApp/src/main/res/layout/search_suggestion_row.xml @@ -28,7 +28,6 @@ android:scaleType="centerInside" android:layout_alignParentTop="true" android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" android:visibility="invisible" style="@style/RtlOverlay.Widget.AppCompat.Search.DropDown.Icon1" /> @@ -45,7 +44,7 @@ style="@style/RtlOverlay.Widget.AppCompat.Search.DropDown.Query" /> diff --git a/owncloudApp/src/main/res/layout/share_activity.xml b/owncloudApp/src/main/res/layout/share_activity.xml index 5e47be46386..524f147f129 100644 --- a/owncloudApp/src/main/res/layout/share_activity.xml +++ b/owncloudApp/src/main/res/layout/share_activity.xml @@ -21,7 +21,7 @@ android:id="@+id/share_activity_layout" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="com.owncloud.android.ui.activity.ShareActivity" + tools:context=".presentation.ui.sharing.ShareActivity" android:filterTouchesWhenObscured="true" > diff --git a/owncloudApp/src/main/res/layout/share_file_layout.xml b/owncloudApp/src/main/res/layout/share_file_layout.xml index 4c7261707aa..b9953a37f6e 100644 --- a/owncloudApp/src/main/res/layout/share_file_layout.xml +++ b/owncloudApp/src/main/res/layout/share_file_layout.xml @@ -19,7 +19,7 @@ android:id="@+id/shareScroll" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="com.owncloud.android.data.sharing.shares.presentation.fragment.ShareFileFragment"> + tools:context=".presentation.ui.sharing.ShareActivity"> @@ -74,7 +69,7 @@ android:id="@+id/getPrivateLinkButton" android:layout_width="36dp" android:layout_height="36dp" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:padding="@dimen/standard_half_padding" android:src="@drawable/copy_link" /> @@ -104,7 +99,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:paddingLeft="@dimen/standard_half_padding" + android:paddingStart="@dimen/standard_half_padding" android:text="@string/share_with_user_section_title" android:textAllCaps="true" android:textColor="@color/white" @@ -114,8 +109,8 @@ android:id="@+id/addUserButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_marginRight="@dimen/standard_half_margin" + android:layout_alignParentEnd="true" + android:layout_marginEnd="@dimen/standard_half_margin" android:background="@color/transparent" android:src="@drawable/ic_add" /> @@ -126,7 +121,7 @@ android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" - android:paddingLeft="@dimen/standard_half_padding" + android:paddingStart="@dimen/standard_half_padding" android:scrollbars="vertical" android:visibility="gone" /> @@ -135,7 +130,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingBottom="@dimen/standard_padding" - android:paddingLeft="@dimen/standard_half_padding" + android:paddingStart="@dimen/standard_half_padding" android:paddingTop="@dimen/standard_padding" android:text="@string/share_no_users" android:textSize="15sp" /> @@ -161,7 +156,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:paddingLeft="@dimen/standard_half_padding" + android:paddingStart="@dimen/standard_half_padding" android:text="@string/share_via_link_section_title" android:textAllCaps="true" android:textColor="@color/white" @@ -171,8 +166,8 @@ android:id="@+id/addPublicLinkButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_marginRight="@dimen/standard_half_margin" + android:layout_alignParentEnd="true" + android:layout_marginEnd="@dimen/standard_half_margin" android:background="@color/transparent" android:src="@drawable/ic_add" /> @@ -195,7 +190,7 @@ android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" - android:paddingLeft="@dimen/standard_half_padding" + android:paddingStart="@dimen/standard_half_padding" android:scrollbars="vertical" android:visibility="gone" /> @@ -204,7 +199,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingBottom="@dimen/standard_padding" - android:paddingLeft="@dimen/standard_half_padding" + android:paddingStart="@dimen/standard_half_padding" android:paddingTop="@dimen/standard_padding" android:text="@string/share_no_public_links" android:textSize="15sp" /> diff --git a/owncloudApp/src/main/res/layout/share_public_dialog.xml b/owncloudApp/src/main/res/layout/share_public_dialog.xml index 3bbb0cc2c58..1f98f9c99a3 100644 --- a/owncloudApp/src/main/res/layout/share_public_dialog.xml +++ b/owncloudApp/src/main/res/layout/share_public_dialog.xml @@ -42,7 +42,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/standard_half_padding" - android:layout_marginRight="@dimen/standard_half_padding" android:inputType="textNoSuggestions" android:textSize="15sp" /> @@ -86,7 +85,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" android:layout_alignParentTop="true" android:padding="@dimen/standard_half_padding" /> @@ -94,9 +92,7 @@ android:id="@+id/shareViaLinkPasswordLabel" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:layout_toLeftOf="@id/shareViaLinkPasswordSwitch" android:layout_toStartOf="@id/shareViaLinkPasswordSwitch" android:paddingLeft="@dimen/standard_half_padding" android:paddingRight="@dimen/standard_half_padding" @@ -127,7 +123,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" android:layout_alignParentTop="true" android:checked="false" android:padding="@dimen/standard_half_padding" /> @@ -136,9 +131,7 @@ android:id="@+id/shareViaLinkExpirationLabel" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:layout_toLeftOf="@id/shareViaLinkExpirationSwitch" android:layout_toStartOf="@id/shareViaLinkExpirationSwitch" android:paddingLeft="@dimen/standard_half_padding" android:paddingRight="@dimen/standard_half_padding" @@ -151,10 +144,8 @@ android:id="@+id/shareViaLinkExpirationValue" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" android:layout_below="@id/shareViaLinkExpirationLabel" - android:layout_toLeftOf="@id/shareViaLinkExpirationSwitch" android:layout_toStartOf="@id/shareViaLinkExpirationSwitch" android:paddingBottom="@dimen/standard_half_padding" android:paddingLeft="@dimen/standard_half_padding" @@ -166,7 +157,6 @@ android:id="@+id/shareViaLinkExpirationExplanationLabel" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" android:layout_below="@id/shareViaLinkExpirationValue" android:paddingLeft="@dimen/standard_half_padding" @@ -190,7 +180,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="10dp" - android:drawableLeft="@drawable/common_error_grey" android:drawablePadding="5dp" android:drawableStart="@drawable/common_error_grey" android:gravity="center_vertical" diff --git a/owncloudApp/src/main/res/layout/share_public_link_item.xml b/owncloudApp/src/main/res/layout/share_public_link_item.xml index c67c74be183..89699f38514 100644 --- a/owncloudApp/src/main/res/layout/share_public_link_item.xml +++ b/owncloudApp/src/main/res/layout/share_public_link_item.xml @@ -32,7 +32,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_marginBottom="@dimen/standard_half_margin" - android:layout_marginLeft="@dimen/standard_half_margin" + android:layout_marginStart="@dimen/standard_half_margin" android:layout_marginTop="@dimen/standard_half_margin" android:layout_weight="1" android:ellipsize="middle" diff --git a/owncloudApp/src/main/res/layout/share_user_item.xml b/owncloudApp/src/main/res/layout/share_user_item.xml index 893967f7ebc..e5dce3895a3 100644 --- a/owncloudApp/src/main/res/layout/share_user_item.xml +++ b/owncloudApp/src/main/res/layout/share_user_item.xml @@ -45,7 +45,7 @@ android:id="@+id/userOrGroupName" android:layout_marginTop="@dimen/standard_half_margin" android:layout_marginBottom="@dimen/standard_half_margin" - android:layout_marginLeft="@dimen/standard_half_margin" + android:layout_marginStart="@dimen/standard_half_margin" android:textColor="@color/textColor" android:singleLine="true" android:ellipsize="middle" diff --git a/owncloudApp/src/main/res/layout/simple_dialog_list_item.xml b/owncloudApp/src/main/res/layout/simple_dialog_list_item.xml deleted file mode 100644 index 1cf0be6f866..00000000000 --- a/owncloudApp/src/main/res/layout/simple_dialog_list_item.xml +++ /dev/null @@ -1,12 +0,0 @@ - - \ No newline at end of file diff --git a/owncloudApp/src/main/res/layout/ssl_untrusted_cert_layout.xml b/owncloudApp/src/main/res/layout/ssl_untrusted_cert_layout.xml index e132022339f..63a490aedd1 100644 --- a/owncloudApp/src/main/res/layout/ssl_untrusted_cert_layout.xml +++ b/owncloudApp/src/main/res/layout/ssl_untrusted_cert_layout.xml @@ -41,8 +41,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="0" - android:layout_gravity="left" - android:paddingLeft="8dp" + android:layout_gravity="start" + android:paddingStart="8dp" android:text="@string/ssl_validator_reason_cert_not_trusted" android:textAppearance="?android:attr/textAppearanceSmall" /> @@ -51,8 +51,8 @@ android:id="@+id/reason_cert_expired" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="left" - android:paddingLeft="8dp" + android:layout_gravity="start" + android:paddingStart="8dp" android:text="@string/ssl_validator_reason_cert_expired" android:textAppearance="?android:attr/textAppearanceSmall" /> @@ -61,8 +61,8 @@ android:id="@+id/reason_cert_not_yet_valid" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="left" - android:paddingLeft="8dp" + android:layout_gravity="start" + android:paddingStart="8dp" android:text="@string/ssl_validator_reason_cert_not_yet_valid" android:textAppearance="?android:attr/textAppearanceSmall" /> @@ -71,8 +71,8 @@ android:id="@+id/reason_hostname_not_verified" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="left" - android:paddingLeft="8dp" + android:layout_gravity="start" + android:paddingStart="8dp" android:text="@string/ssl_validator_reason_hostname_not_verified" android:textAppearance="?android:attr/textAppearanceSmall" /> @@ -81,8 +81,8 @@ android:id="@+id/reason_no_info_about_error" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="left" - android:paddingLeft="8dp" + android:layout_gravity="start" + android:paddingStart="8dp" android:text="@string/ssl_validator_no_info_about_error" android:textAppearance="?android:attr/textAppearanceSmall" /> @@ -100,15 +100,15 @@ android:id="@+id/details_view" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:gravity="left" + android:gravity="start" android:orientation="vertical"> diff --git a/owncloudApp/src/main/res/layout/ssl_validator_layout.xml b/owncloudApp/src/main/res/layout/ssl_validator_layout.xml index 4c0f1dca305..4c244411918 100644 --- a/owncloudApp/src/main/res/layout/ssl_validator_layout.xml +++ b/owncloudApp/src/main/res/layout/ssl_validator_layout.xml @@ -40,8 +40,8 @@ android:id="@+id/reason_cert_not_trusted" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="left" - android:paddingLeft="8dp" + android:layout_gravity="start" + android:paddingStart="8dp" android:text="@string/ssl_validator_reason_cert_not_trusted" android:textAppearance="?android:attr/textAppearanceSmall" /> @@ -50,8 +50,8 @@ android:id="@+id/reason_cert_expired" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="left" - android:paddingLeft="8dp" + android:layout_gravity="start" + android:paddingStart="8dp" android:text="@string/ssl_validator_reason_cert_expired" android:textAppearance="?android:attr/textAppearanceSmall" /> @@ -60,8 +60,8 @@ android:id="@+id/reason_cert_not_yet_valid" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="left" - android:paddingLeft="8dp" + android:layout_gravity="start" + android:paddingStart="8dp" android:text="@string/ssl_validator_reason_cert_not_yet_valid" android:textAppearance="?android:attr/textAppearanceSmall" /> @@ -70,8 +70,8 @@ android:id="@+id/reason_hostname_not_verified" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="left" - android:paddingLeft="8dp" + android:layout_gravity="start" + android:paddingStart="8dp" android:text="@string/ssl_validator_reason_hostname_not_verified" android:textAppearance="?android:attr/textAppearanceSmall" /> @@ -87,7 +87,7 @@ android:id="@+id/details_view" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:gravity="left" + android:gravity="start" android:orientation="vertical"> @@ -50,13 +50,13 @@ diff --git a/owncloudApp/src/main/res/layout/upload_list_group.xml b/owncloudApp/src/main/res/layout/upload_list_group.xml index 80836f169c1..a393785f32d 100755 --- a/owncloudApp/src/main/res/layout/upload_list_group.xml +++ b/owncloudApp/src/main/res/layout/upload_list_group.xml @@ -14,7 +14,7 @@ android:divider="@null" android:dividerHeight="0dp" android:ellipsize="middle" - android:paddingLeft="@dimen/activity_horizontal_margin" + android:paddingStart="@dimen/activity_horizontal_margin" android:showDividers="none" android:textColor="@color/color_accent" tools:text="Uploaded" /> @@ -25,7 +25,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingEnd="@dimen/activity_horizontal_margin" - android:paddingRight="@dimen/activity_horizontal_margin" tools:text="5 Files" /> \ No newline at end of file diff --git a/owncloudApp/src/main/res/layout/upload_list_item.xml b/owncloudApp/src/main/res/layout/upload_list_item.xml index 3872c45fe4f..394f3c73abc 100755 --- a/owncloudApp/src/main/res/layout/upload_list_item.xml +++ b/owncloudApp/src/main/res/layout/upload_list_item.xml @@ -52,7 +52,7 @@ android:id="@+id/upload_file_size" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:gravity="left" + android:gravity="start" android:textColor="@color/list_item_lastmod_and_filesize_text" android:ellipsize="middle" android:singleLine="true" @@ -112,7 +112,7 @@ android:focusable="false" android:focusableInTouchMode="false" android:layout_gravity="center_vertical" - android:paddingLeft="8dp" + android:paddingStart="8dp" > @@ -81,7 +80,7 @@ android:id="@+id/last_mod" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:gravity="right" + android:gravity="end" android:text="Mod Date" android:textColor="@color/list_item_lastmod_and_filesize_text" android:textSize="@dimen/two_line_secondary_text_size" /> diff --git a/owncloudApp/src/main/res/layout/webview_dialog.xml b/owncloudApp/src/main/res/layout/webview_dialog.xml deleted file mode 100644 index 804eea16b4e..00000000000 --- a/owncloudApp/src/main/res/layout/webview_dialog.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - diff --git a/owncloudApp/src/main/res/menu/account_picker_long_click.xml b/owncloudApp/src/main/res/menu/account_picker_long_click.xml deleted file mode 100644 index 5fe40f86429..00000000000 --- a/owncloudApp/src/main/res/menu/account_picker_long_click.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -

- - - \ No newline at end of file diff --git a/owncloudApp/src/main/res/menu/file_actions_menu.xml b/owncloudApp/src/main/res/menu/file_actions_menu.xml index 6950aeb0460..09bce31f49b 100644 --- a/owncloudApp/src/main/res/menu/file_actions_menu.xml +++ b/owncloudApp/src/main/res/menu/file_actions_menu.xml @@ -17,19 +17,22 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . --> - + android:showAsAction="never" + tools:ignore="AppCompatResource" /> + android:showAsAction="never" + tools:ignore="AppCompatResource" /> Sorteer Sorteer volgens A-Z - - Alle lêers Instellings Oplaaie @@ -108,5 +106,4 @@ Staak deling Nie genoeg spasie in die rekening Enigeen met die skakel het toegang tot die lêer/vouer - diff --git a/owncloudApp/src/main/res/values-af/strings.xml b/owncloudApp/src/main/res/values-af/strings.xml deleted file mode 100644 index c757504ac22..00000000000 --- a/owncloudApp/src/main/res/values-af/strings.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/owncloudApp/src/main/res/values-ak/strings.xml b/owncloudApp/src/main/res/values-ak/strings.xml deleted file mode 100644 index 1647fff6c53..00000000000 --- a/owncloudApp/src/main/res/values-ak/strings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/owncloudApp/src/main/res/values-am-rET/strings.xml b/owncloudApp/src/main/res/values-am-rET/strings.xml deleted file mode 100644 index 1647fff6c53..00000000000 --- a/owncloudApp/src/main/res/values-am-rET/strings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/owncloudApp/src/main/res/values-ar/strings.xml b/owncloudApp/src/main/res/values-ar/strings.xml index 78fdf13de10..7724f1cbc3f 100644 --- a/owncloudApp/src/main/res/values-ar/strings.xml +++ b/owncloudApp/src/main/res/values-ar/strings.xml @@ -101,7 +101,7 @@ منذ ثوانٍ لا شيء هنا. تحميل شيء ما! لا يوجد ملفات متوفرة دون اتصال بالإنترنت. - جار التحميل... + جار التحميل… لم يتم العثور على أي تطبيق مناسب لنوع الملف لا توجد ملفات في هذا المجلد. لا يوجد أي مجلدات في هذا المجلد. @@ -131,7 +131,7 @@ رجوع إلى الخلف حفظ وخروج خطأ - جار التحميل... + جار التحميل… غير معروف خطأ غير معروف قيد الانتظار @@ -142,7 +142,7 @@ إنشاء حساب تحميل من اسم المجلد - جار التحميل... + جار التحميل… %1$dنسبة %% التحميل %2$s تم التحميل بنجاح %1$s تم التحميل @@ -181,7 +181,7 @@ بانتظار اتصال الواي فاي بانتظار التحميل نوع الوسائط غير مدعوم - جار التنزيل... + جار التنزيل… %1$dنسبة %% التنزيل %2$s تم التنزيل بنجاح %1$s تم التنزيل @@ -245,8 +245,8 @@ زر التشغيل أو الإيقاف المؤقت زر التقديم السريع صورة من الكاميرا - جار الحصول على تفويض... - جار محاولة تسجيل الدخول... + جار الحصول على تفويض… + جار محاولة تسجيل الدخول… لا يوجد اتصال شبكة الاتصال الآمن غير متوفر. تم إنشاء اتصال @@ -293,7 +293,7 @@ إرسال رابط إلى نسخ الملف من التخزين الخاص تسجيل الدخول باستخدام oAuth2 - جار الاتصال بخادم OAuth2... + جار الاتصال بخادم OAuth2… تعذر التحقق من هوية الخادم - شهادة الخادم غير موثوق بها - شهادة الخادم منتهية الصلاحية @@ -348,11 +348,8 @@ حدث خطأ أثناء محاولة استرداد المستخدمين والمجموعات حدث خطأ أثناء محاولة استرداد الإمكانيات عذرًا، المشاركة غير مفعلة على خادمك. برجاء الاتصال بالمسؤول. - غير قادر على المشاركة. برجاء التحقق مما إذا كان الملف موجودًا أم لا حدث خطأ أثناء محاولة مشاركة هذا الملف أو المجلد - غير قادر على إلغاء المشاركة. برجاء التحقق مما إذا كان الملف موجودًا أم لا حدث خطأ أثناء محاولة إلغاء مشاركة هذا الملف أو المجلد - غير قادر على التحديث. برجاء التحقق مما إذا كان الملف موجودًا أم لا حدث خطأ أثناء محاولة تحديث المشاركة أدخل كلمة مرور يجب عليك إدخال كلمة مرور @@ -385,7 +382,7 @@ إرسال المحفوظات لم يتم العثور على أي تطبيق لإرسال السجلات. برجاء تثبيت تطبيق بريد. %1$s سجلات تطبيقات الأندرويد - جار تحميل البيانات... + جار تحميل البيانات… تحديد الكل تحديد العكس نقل diff --git a/owncloudApp/src/main/res/values-ast/strings.xml b/owncloudApp/src/main/res/values-ast/strings.xml index fe0ba5ca407..55d0f8d422a 100644 --- a/owncloudApp/src/main/res/values-ast/strings.xml +++ b/owncloudApp/src/main/res/values-ast/strings.xml @@ -14,8 +14,6 @@ Ordenar Ordenar por A-Z - - Tolos ficheros Axustes Xubes @@ -43,7 +41,7 @@ ¡Prueba %1$s nel to teléfonu intelixente! Prestaríame invitate a usar %1$s nel to smartphone Descárgalo equi: %2$s Comprobar servidor - Direición del sirvidor https://... + Direición del sirvidor https://… Nome d\'usuariu Contraseña Nuevu en %1$s? @@ -64,7 +62,7 @@ Hebo un fallu mientres s\'intentaba copiar un ficheru a una carpeta temporal. Por favor, intente unviala de nuevu. hai segundos Nun hai nada equí. ¡Xubi daqué! - Cargando... + Cargando… Nun hai ficheros nesta carpeta. Nenguna xuba disponible. Carpeta @@ -89,7 +87,7 @@ Atrás Guardar y colar Fallu - Cargando ... + Cargando … desconocí­u Fallu desconocíu Pendiente @@ -97,9 +95,9 @@ Camudar contraseña Desaniciar cuenta Crear cuenta - Xubir dende ... + Xubir dende … Nome de la carpeta - Xubiendo ... + Xubiendo … %1$d%% Xubiendo %2$s Xuba correuta %1$s xubíu @@ -127,7 +125,7 @@ Fallu desconocíu Esperando conectividá wifi Esperando pa xubir - Baxando ... + Baxando … %1$d%% Descargando %2$s Descarga correuta %1$s descargáu @@ -182,8 +180,8 @@ Botón de rebobináu Botón de reproducción o posa Botón d\'avance rápidu - Garrando autorización... - Intentando aniciar sesión... + Garrando autorización… + Intentando aniciar sesión… Ensin conexón de rede Conexón segura non disponible Conexón afitada @@ -234,7 +232,7 @@ Comprobación de credenciales almacenaes Problema inesperáu, por favor esbilla\'l ficheru dende otra aplicación Nun s\'esbilló dengún ficheru - Unviar enllaz a ... + Unviar enllaz a … Copiando ficheru dende l\'almacenamientu priváu Aniciar sesión con oAuth2 - El certificáu del sirvidor nun ye de confianza @@ -280,11 +278,8 @@ Nun pue amosase esta imaxe Nun se pudo copiar %1$s al ficheru llocal %2$s Sentímoslo, la compartición nun ta activada nel to sirvidor. Por favor contauta col to alministrador - Nun pue compartise. Por favor, comprueba si\'l ficheru esiste Hebo un fallu mientres s\'intentaba compartir esti ficheru o carpeta - Incapaz de dexar de compartir. Por favor, comprueba si\'l ficheru esiste Hebo un fallu mientres s\'intentaba dexar de compartir esti ficheru o carpeta - Nun pue actualizase. Por favor, comprueba si esiste\'l ficheru Hebo un fallu mientres s\'intentaba actualizar la cuota Introduz una contraseña Tienes qu\'introducir una contraseña @@ -314,7 +309,7 @@ Unviar historial Nun s\'atopó nenguna aplicación pa unviar rexistros. Por favor instala una aplicación de corréu electrónicu Aplicación de rexistros d\'Android %1$s - Cargando datos ... + Cargando datos … Esbillar too Mover Ensín nada dientro. ¡Pues amestar una carpeta! @@ -346,8 +341,8 @@ %1$d ficheros %1$d ficheros, 1 carpeta %1$d ficheros, %2$d carpetes - Ficheru orixinal será... - Ficheru orixinal será... + Ficheru orixinal será… + Ficheru orixinal será… Copiar ficheru Mover ficheru guardáu en carpeta orixinal @@ -362,7 +357,7 @@ Contraseña Aseguráu Consiguir enllaz - Compartir con ... + Compartir con … Compartir con %1$s Guetar Guetar usuarios y grupos @@ -396,5 +391,4 @@ %d escoyíu %d escoyíos - diff --git a/owncloudApp/src/main/res/values-az/strings.xml b/owncloudApp/src/main/res/values-az/strings.xml index db55099b0aa..c674c040fae 100644 --- a/owncloudApp/src/main/res/values-az/strings.xml +++ b/owncloudApp/src/main/res/values-az/strings.xml @@ -12,8 +12,6 @@ Göndər Çeşidləmək Təyinata görə çeşidləmək - - Aç Geriyə cavab Kömək @@ -59,15 +57,15 @@ Bəli Xeyir Səhv - Yüklənir... + Yüklənir… Bəlli olmayan səhv baş verdi Gözləmə Haqqında Şifrəni dəyiş Hesab yarat - Burdan yüklə ... + Burdan yüklə … Qovluq adı - Yüklənmə gedir ... + Yüklənmə gedir … %1$d%% Yüklənmə gedir %2$s Uğurla yükləndi Yüklənmədə səhv baş verdi @@ -75,7 +73,7 @@ Mövcud Bitmişdir Bəlli olmayan səhv baş verdi - Endirilir ... + Endirilir … %1$d%% Endirilir %2$s Endirim uğurla bitdi Endirim olmadı @@ -159,7 +157,7 @@ Aşağıda göstərilən %5$s-də olan daxili və xarici fayl(lar) link edilmiş Biraz gözləyin Naməlum problem; xahiş olunur faylı fərqli program təminatından seçəsiniz Heç bir fayl seçilməyib - Linki yollayın ... + Linki yollayın … oAuth2 ilə qeydiyyatdan keçin Server sertifikati inamlı deyil - Server sertifikatının vaxtı bitmişdir @@ -196,9 +194,7 @@ Aşağıda göstərilən %5$s-də olan daxili və xarici fayl(lar) link edilmiş %1$s nüsxələnə bilməz %2$s local qovluğa Üzr istəyirik, sizin yerverdə paylaşıma izin verilmir. Xahiş olunur inzibatçınızla əlaqə saxlayasınız. - Paylaşa bilinmir. Bu faylın yada qovluğun paylaşımı zamanı səhv baş verdi - Paylaşımı dayandırmaq olmur. Xahiş olunur fayl mövcudluğunu yoxlayasınız Bu fayl və ya qovluğun yayımlanmasının dayandırılmasında səhv baş verdi Şifrəni daxil et Siz şifrəni daxil etməlisiniz @@ -241,5 +237,4 @@ inzibatçınızla əlaqə saxlayasınız. yayımlaya bilərsiniz dəyişmək olar sil - diff --git a/owncloudApp/src/main/res/values-bal/strings.xml b/owncloudApp/src/main/res/values-bal/strings.xml deleted file mode 100644 index 169dfefffda..00000000000 --- a/owncloudApp/src/main/res/values-bal/strings.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/owncloudApp/src/main/res/values-be/strings.xml b/owncloudApp/src/main/res/values-be/strings.xml index d76ad801440..8293cbc89be 100644 --- a/owncloudApp/src/main/res/values-be/strings.xml +++ b/owncloudApp/src/main/res/values-be/strings.xml @@ -1,12 +1,9 @@ Налады - - Секунд таму Так Не Памылка Выбар - diff --git a/owncloudApp/src/main/res/values-bg-rBG/strings.xml b/owncloudApp/src/main/res/values-bg-rBG/strings.xml index 642cbf2666d..1bc159f67b8 100644 --- a/owncloudApp/src/main/res/values-bg-rBG/strings.xml +++ b/owncloudApp/src/main/res/values-bg-rBG/strings.xml @@ -178,7 +178,7 @@ Бутон за превъртане Бутон пусни / пауза Бутон за превъртане напред - Получване на оторизация... + Получване на оторизация… Няма интернет връзка Няма сигурна връзка Осъществена връзка @@ -278,11 +278,8 @@ %1$s не може да бъде копиран в локалната папка %2$s За съжаление споделянето не е включено на сървъра ви. Моля, свържете се с администратора. - Неуспешен опит за споделяне. Моля, провери дали файла съществува. Настъпи грешка при опита за споделяне на този файл или папка. - Неуспешен опит за прекратяване на споделянето. Моля, провери дали файла съществува. Настъпи грешка при опита за премахване на споделянето на този файл или папка. - Не може да се актуализира. Моля, проверете дали файлът съществува Възникна грешка докато се опитва да обнови споделянето Въведи Парола Вие трябва да въведете парола @@ -312,7 +309,7 @@ Изпрати историята Не е намерено приложение за изпращане на логове. Моля инсталирайте e-mail приложение %1$s Android журнали на приложенията - Зареждане на данни... + Зареждане на данни… Избери всички Премести Тук няма нищо. Можеш да добавиш папка! diff --git a/owncloudApp/src/main/res/values-bn-rBD/strings.xml b/owncloudApp/src/main/res/values-bn-rBD/strings.xml index 5896328a4a0..657f4df3be0 100644 --- a/owncloudApp/src/main/res/values-bn-rBD/strings.xml +++ b/owncloudApp/src/main/res/values-bn-rBD/strings.xml @@ -10,8 +10,6 @@ নিয়ামকসমূহ বিস্তারিত পাঠাও - - খোল মতামত সহায়িকা @@ -68,7 +66,7 @@ আপলোড করা হয়েছে সুসম্পন্ন অজানা জটিলতা - ডাউনলোড চলছে... + ডাউনলোড চলছে… %1$d%% ডাউনলোড করছে %2$s ডাউনলোড সফল ডাউনলোড হয়নি @@ -216,5 +214,4 @@ সম্পাদনা করতে পারবেন তৈরী করুন মুছে ফেল - diff --git a/owncloudApp/src/main/res/values-bn-rIN/strings.xml b/owncloudApp/src/main/res/values-bn-rIN/strings.xml index 0e5b8b52a0a..731c1a9b2fb 100644 --- a/owncloudApp/src/main/res/values-bn-rIN/strings.xml +++ b/owncloudApp/src/main/res/values-bn-rIN/strings.xml @@ -4,8 +4,6 @@ ফাইলস নতুন ফোল্ডার সেটিংস - - খোলা অঙ্কিত করা ফাইলস @@ -20,5 +18,4 @@ বাতিল করা সেভ অনুসন্ধান - diff --git a/owncloudApp/src/main/res/values-br/strings.xml b/owncloudApp/src/main/res/values-br/strings.xml index 169dfefffda..8850a563a5a 100644 --- a/owncloudApp/src/main/res/values-br/strings.xml +++ b/owncloudApp/src/main/res/values-br/strings.xml @@ -1,8 +1,3 @@ - - - - diff --git a/owncloudApp/src/main/res/values-bs/strings.xml b/owncloudApp/src/main/res/values-bs/strings.xml index e31c68de8e6..687667632d7 100644 --- a/owncloudApp/src/main/res/values-bs/strings.xml +++ b/owncloudApp/src/main/res/values-bs/strings.xml @@ -5,8 +5,6 @@ Nova fascikla Postavke Pošalji - - Otvori Pomoć Više @@ -20,7 +18,7 @@ Dijeli Da Ne - Greška + Greška Nepoznata greška Na čekanju Promijeni lozinku @@ -43,5 +41,4 @@ kreiraj izmjeni izbriši - diff --git a/owncloudApp/src/main/res/values-ca/strings.xml b/owncloudApp/src/main/res/values-ca/strings.xml index 55fcba820f1..2c1e8539baf 100644 --- a/owncloudApp/src/main/res/values-ca/strings.xml +++ b/owncloudApp/src/main/res/values-ca/strings.xml @@ -92,7 +92,7 @@ S\'ha produït un error mentre es copiava el fitxer a una carpeta temporal. Sisplau intenta enviar-ho una altra vegada. segons enrere Res per aquí. Pugeu alguna cosa! - Carregant... + Carregant… No s\'ha trobat cap aplicació per a aquest tipus d\'arxiu! No hi ha arxius a aquesta carpeta No hi ha cap carpeta en aquesta carpeta. @@ -121,7 +121,7 @@ Enrera Desa i surt Error - Carregant... + Carregant… desconegut Error desconegut Pendent @@ -227,11 +227,11 @@ Botó de reproducció o pausa Botó de reproducció ràpida Fotografia de la càmera - S\'està autenticant... + S\'està autenticant… Sense connexió de xarxa La connexió segura no està disponible. S\'ha establert la connexió - S\'està comprovant la connexió... + S\'està comprovant la connexió… La configuració del servidor està malformada Ja hi ha un compte al dispositiu pel mateix usuari i mateix servidor L\'usuari introduït no coincideix amb l\'usuari d\'aquest compte @@ -248,7 +248,7 @@ Estat inesperat; torna a escriure l\'adreça del servidor La vostra autorització ha vençut. Acrediteu-vos de nou Escriviu la contrasenya actual - Connectant amb el servidor d\'autentificació... + Connectant amb el servidor d\'autentificació… El serivdor no permet aquest mètode d\'autenticació %1$s no permet comptes múltiples El servidor no retorna una id d\'usuari correcta, contacteu amb l\'administrador. @@ -282,7 +282,7 @@ No heu seleccionat cap fitxer Copiant fitxer des de emmagatzemament privat Accés amb oAuth2 - Connectant al servidor OAuth2... + Connectant al servidor OAuth2… La identitat del servidor no ha pogut ser verificada - El certificat del servidor no està autenticat - El certificat del servidor ha expirat @@ -331,11 +331,8 @@ %1$s no s\'ha pogut copiar a la carpeta local %2$s Ruta de pujada de les fotos La compartició no es troba disponible al vostre servidor. Contacteu amb l\'administrador. - No es pot compartir. Assegureu-vos que el fitxer existeix S\'ha produït un error en intentar compartir aquest fitxer o carpeta - No es pot des-compartir. Assegureu-vos que el fitxer existeix S\'ha produït un error en intentar deixar de compartir aquest fitxer o carpeta - No es pot actualitzar. Assegureu-vos que el fitxer existeix S\'ha produït un error en tractar d\'actualitzar la compartició Escriviu una contrasenya Heu d\'escriure una contrasenya @@ -368,7 +365,7 @@ Enviar història No es troba aplicació per enviar els registres. Si us plau, instal·la una aplicació de email. %1$s app de registres Android - Carregant dades... + Carregant dades… Seleccionar tot Moure Res per aquí. Pots afegir una carpeta! diff --git a/owncloudApp/src/main/res/values-cs-rCZ/strings.xml b/owncloudApp/src/main/res/values-cs-rCZ/strings.xml index 56ee11e45ea..070f57fe5b1 100644 --- a/owncloudApp/src/main/res/values-cs-rCZ/strings.xml +++ b/owncloudApp/src/main/res/values-cs-rCZ/strings.xml @@ -64,7 +64,7 @@ Automaticky nahrát video snímané kamerou Změna účtu Přihlásit Ověřit server - Adresa serveru https://... + Adresa serveru https://… Uživatelské jméno Heslo Nováček s %1$s? @@ -86,7 +86,7 @@ Automaticky nahrát video snímané kamerou před pár sekundami Žádný obsah. Nahrajte něco! Nejsou dostupné žádné offline soubory. - Načítání... + Načítání… Pro typ souboru nebyla nalezena aplikace V tomto adresáři nejsou žádné soubory. V tomto adresáři nejsou žádné podadresáře. @@ -116,7 +116,7 @@ Automaticky nahrát video snímané kamerou Zpět Uložit & ukončit Chyba - Načítání... + Načítání… neznámý Neznámá chyba Nevyřízené @@ -127,7 +127,7 @@ Automaticky nahrát video snímané kamerou Vytvořit účet Nahrát z Název adresáře - Nahrávám... + Nahrávám… %1$d%% Odesílám %2$s Odesílání úspěšné %1$s nahráno @@ -166,7 +166,7 @@ Automaticky nahrát video snímané kamerou Čekání na wifi připojení Čekání na nahrávání Nepodporovaný typ média - Stahuji... + Stahuji… %1$d%% Stahuji %2$s Stažení úspěšné %1$s staženo @@ -230,8 +230,8 @@ Automaticky nahrát video snímané kamerou Tlačítko Přehrát/Pozastavit Tlačítko Rychle vpřed Obrázek z kamery - Kontroluji pověření... - Přihlašuji... + Kontroluji pověření… + Přihlašuji… Žádné síťové spojení Zabezpečené spojení není k dispozici Spojení navázáno @@ -252,7 +252,7 @@ Automaticky nahrát video snímané kamerou Neočekávaný stav; zadejte prosím znovu adresu serveru Vaše přihlášení vypršelo. Přihlaste se prosím znovu Zadejte prosím aktuální heslo - Připojování k ověřovacímu serveru ... + Připojování k ověřovacímu serveru … Server nepodporuje tuto přihlašovací metodu %1$s nepodporuje více účtů Váš server nevrací správné přihlašovací ID, kontaktujte prosím svého správce systému @@ -340,11 +340,8 @@ Automaticky nahrát video snímané kamerou Cesta k nahrání obrázku Je nám líto, ale sdílení není na vašem serveru povoleno. Kontaktujte svého správce systému. - Nelze sdílet. Zkontrolujte prosím že soubor existuje Při pokusu o sdílení tohoto souboru či adresáře nastala chyba - Nelze ukončit sdílení. Zkontrolujte prosím že soubor existuje Při pokusu o zrušení sdílení tohoto souboru či adresáře nastala chyba - Nelze aktulizovat. Ověřte že soubor existuje Došlo k chybě při pokusu o aktualizaci sdílení Zadejte heslo Musíte zadat heslo diff --git a/owncloudApp/src/main/res/values-cy-rGB/strings.xml b/owncloudApp/src/main/res/values-cy-rGB/strings.xml index cf2cf0f9b46..b06b775db42 100644 --- a/owncloudApp/src/main/res/values-cy-rGB/strings.xml +++ b/owncloudApp/src/main/res/values-cy-rGB/strings.xml @@ -5,8 +5,6 @@ Ffeiliau Gosodiadau Anfon - - Agor Cymorth Cyffredinol @@ -37,13 +35,13 @@ I ddod Ynglyn â Creu cyfrif - Llwytho i fyny o ... - Yn llwytho i fyny ... + Llwytho i fyny o … + Yn llwytho i fyny … %1$d%% Llwytho i fyny %2$s Llwytho i fyny\'n llwyddiannus Methwyd llwytho i fyny Methwyd cwblhau llwytho %1$s i fyny - Llwytho i lawr ... + Llwytho i lawr … %1$d%% Llwytho i lawr %2$s Llwyddiant llwytho i lawr Methwyd llwytho i lawr @@ -116,5 +114,4 @@ yn gallu golygu creu dileu - diff --git a/owncloudApp/src/main/res/values-da/strings.xml b/owncloudApp/src/main/res/values-da/strings.xml index f64ead47666..2fad7ae663e 100644 --- a/owncloudApp/src/main/res/values-da/strings.xml +++ b/owncloudApp/src/main/res/values-da/strings.xml @@ -66,7 +66,7 @@ En fejl opstod ved kopiering af filen til en midlertidig folder. Prøv venligst igen. sekunder siden Her er tomt. Upload noget! - Indlæser... + Indlæser… Ingen app fundet for filtype Der er ingen filer i denne mappe. Der er ingen mapper i denne mappe. @@ -93,7 +93,7 @@ Tilbage Gem & afslut Fejl - Indlæser... + Indlæser… ukendt Ukendt fejl Afventer @@ -185,13 +185,12 @@ Tiden udløb under forsøg på at afspille Mediefilen kan ikke streames Mediefil kan ikke afspilles med tilgængelige medieafspiller - Sikkerhedsfejl ved forsøg på afspilning af Inputfejl ved forsøg på afspilning af %1$s Uventet fejl ved forsøg på afspilning af %1$s Tilbagespolingsknap Afspil eller pause knap Hurtigt fremad-knap - Forsøger godkendelse... + Forsøger godkendelse… Ingen netværksforbindelse Sikker forbindelse ikke tilgængelig. Forbindelse oprettet @@ -291,11 +290,8 @@ %1$s kunne ikke kopieres til %2$s lokale mappe Beklager, deling er ikke slået til på din server. Kontakt venligst din ⇥⇥administrator. - Kan ikke dele. Tjek venligst om filen findes. Der opstod en fejl ved deling af denne fil eller mappe - Kan ikke fjerne deling. Tjek venligst om filen findes. Der opstod en fejl ved stopning af deling af denne mappe. - Ikke muligt at opdatere. Kontroller venligst at filen findes Der opstod en fejl under forsøg på at opdatere andelen Angiv et kodeord Du skal angive et kodeord @@ -328,7 +324,7 @@ Afsend historik Ingen app til afsendelse af logs fundet. Installer venligst en mail-app. %1$s Android-app - logge - Indlæser data ... + Indlæser data … Vælg alle Flyt Der er intet her. Du kan tilføje en mappe! diff --git a/owncloudApp/src/main/res/values-de-rAT/strings.xml b/owncloudApp/src/main/res/values-de-rAT/strings.xml index 20e3bcdcaf0..fc0afbab85e 100644 --- a/owncloudApp/src/main/res/values-de-rAT/strings.xml +++ b/owncloudApp/src/main/res/values-de-rAT/strings.xml @@ -9,8 +9,6 @@ Senden Sortieren Sortieren nach - - Rückmeldung Hilfe Allgemein @@ -22,7 +20,7 @@ Rückmeldung Versuch %1$s auf deinem Handy! Ich lade dich ein %1$s auf deinem Handy zu verwenden!\nDownloade es hier: %2$s - Server Adresse https://... + Server Adresse https://… Benutzername Passwort Neu bei %1$s? @@ -49,20 +47,20 @@ Nein Zurück Fehler - Lade ... + Lade … Unbekannter Fehler Über Passwort ändern Konto erstellen - Hochladen von ... + Hochladen von … Ordner Name - Lade hoch ... + Lade hoch … Hochladen erfolgreich Hochladen fehlgeschlagen Hochladen von %1$s konnte nicht fertig gestellt werden Abgebrochen Unbekannter Fehler - Lade herunter ... + Lade herunter … Herunterladen erfolgreich Herunterladen fehlgeschlagen Herunterladen von %1$s konnte nicht fertig gestellt werden @@ -95,5 +93,4 @@ erstellen Ändern löschen - diff --git a/owncloudApp/src/main/res/values-de-rDE/strings.xml b/owncloudApp/src/main/res/values-de-rDE/strings.xml index 9df21b3bd51..7cab1bff440 100644 --- a/owncloudApp/src/main/res/values-de-rDE/strings.xml +++ b/owncloudApp/src/main/res/values-de-rDE/strings.xml @@ -141,9 +141,9 @@ Passwort ändern Benutzerkonto löschen Account erstellen - Dateien hochladen von... + Dateien hochladen von… Ordnername - Hochladen... + Hochladen… %1$d%% Hochladen %2$s Hochladen erfolgreich %1$s wurde/n erfolgreich hochgeladen @@ -182,7 +182,7 @@ Warte auf die drahtlose Verbindung Warten auf das Hochladen Nicht unterstützter Medientyp - Herunterladen... + Herunterladen… %1$d%% Herunterladen %2$s Herunterladen erfolgreich %1$s wurde erfolgreich heruntergeladen @@ -247,7 +247,7 @@ Vorspulen Button Kamerabild Legitimierung empfangen … - Anmeldeversuch... + Anmeldeversuch… Keine Netzwerkverbindung Sichere Verbindung nicht verfügbar. Verbindung hergestellt @@ -304,7 +304,7 @@ Link senden an … Kopiere Datei vom privatem Speicher Anmelden mit oAuth2 - Verbinde mit dem OAuth2-Server... + Verbinde mit dem OAuth2-Server… Die Identität des Servers konnte nicht verifiziert werden - Das Zertifikat des Servers ist nicht vertrauenswürdig - Das Zertifikat des Servers ist abgelaufen @@ -360,11 +360,8 @@ Beim Versuch, Funktionen abzurufen, ist ein Fehler aufgetreten Entschuldigung, Freigaben sind auf Ihrem Server nicht aktiviert. Bitte kontaktieren Sie Ihren ⇥⇥Administrator. - Teilen nicht möglich. Prüfen Sie, ob die Datei existiert Es ist ein Fehler beim Freigeben der Datei oder des Ordners aufgetreten. - Entfernen der Freigabe nicht möglich. Prüfen Sie, ob die Datei existiert Es ist ein Fehler beim Entfernen der Freigabe für diese Datei oder den Ordner aufgetreten. - Update nicht möglich. Bitte überprüfen Sie, ob die Datei existiert Es ist ein Fehler beim Aktualisieren der Freigabe aufgetreten Passwort eingeben Sie müssen ein Passwort eingeben @@ -435,8 +432,8 @@ Kamera-Ordner (%1$s) Benötigt Optional - Originaldatei wird... - Originaldatei wird... + Originaldatei wird… + Originaldatei wird… Datei kopieren Datei verschieben im Originalordner behalten diff --git a/owncloudApp/src/main/res/values-de/strings.xml b/owncloudApp/src/main/res/values-de/strings.xml index 7eb4d8482b8..266a0ea8b33 100644 --- a/owncloudApp/src/main/res/values-de/strings.xml +++ b/owncloudApp/src/main/res/values-de/strings.xml @@ -143,7 +143,7 @@ Account erstellen Hochladen von (Quelle) Ordnername - Lade hoch... + Lade hoch… %1$d%% Hochladen %2$s Hochladen erfolgreich %1$s hochgeladen @@ -182,7 +182,7 @@ warten auf eine WLAN Verbindung Warten auf hochladen Nicht unterstützter Medientyp - Lade herunter... + Lade herunter… %1$d%% Herunterladen %2$s Herunterladen erfolgreich %1$s heruntergeladen @@ -247,7 +247,7 @@ Vorspulen Knopf Kamerabild Autorisierung empfangen… - Anmeldung läuft ... + Anmeldung läuft … Keine Netzwerkverbindung Sichere Verbindung nicht verfügbar. Verbindung hergestellt @@ -268,7 +268,7 @@ Unerwarteter Zustand; Bitte gib die Adresse des Servers erneut ein Deine Autorisierung ist abgelaufen. Bitte Autorisierung nochmals durchführen Bitte gib das aktuelle Passwort ein - Verbinden zum Authentifizierungs-Server ... + Verbinden zum Authentifizierungs-Server … Der Server unterstützt diese Authentifizierung-Methode nicht %1$s unterstützt nicht mehrere Benutzerkonten Dein Server gibt keine korrekte Benutzer-ID zurück, bitte kontaktiere einen Administrator @@ -304,7 +304,7 @@ Link senden an Kopiere Datei vom privatem Speicher Anmelden mit oAuth2 - Verbinde zum OAuth2-Server... + Verbinde zum OAuth2-Server… Die Identität des Servers konnte nicht verifiziert werden - Das Zertifikat des Servers ist nicht vertrauenswürdig - Das Zertifikat des Servers ist abgelaufen @@ -360,11 +360,8 @@ Beim Versuch, Funktionen abzurufen, ist ein Fehler aufgetreten Entschuldigung, Freigaben sind auf Deinem Server nicht aktiviert. Bitte kontaktiere Deinen ⇥⇥Administrator. - Teilen nicht möglich. Prüfe, dass die Datei existiert Es ist ein Fehler beim Freigeben der Datei oder des Ordners aufgetreten. - Entfernen der Freigabe nicht möglich. Prüfe, dass die Datei existiert Es ist ein Fehler beim Entfernen der Freigabe für diese Datei oder den Ordner aufgetreten. - Aktualisierung der Datei nicht möglich. Prüfe, dass die Datei existiert Es ist ein Fehler beim Aktualisieren der Freigabe aufgetreten Passwort eingeben Du musst ein Passwort eingeben diff --git a/owncloudApp/src/main/res/values-el/strings.xml b/owncloudApp/src/main/res/values-el/strings.xml index 7fe2963a86d..773dfc1ec9e 100644 --- a/owncloudApp/src/main/res/values-el/strings.xml +++ b/owncloudApp/src/main/res/values-el/strings.xml @@ -103,7 +103,7 @@ δευτερόλεπτα πριν Δεν υπάρχει τίποτα εδώ. Μεταφορτώστε κάτι! Δεν υπάρχουν διαθέσιμα αρχεία εκτός σύνδεση. - Γίνεται φόρτωση... + Γίνεται φόρτωση… Δεν βρέθηκε καμία εφαρμογή για τύπο αρχείου Δεν υπάρχουν αρχεία σε αυτό τον φάκελο. Δεν υπάρχουν άλλοι φάκελοι μέσα σε αυτόν τον φάκελο. @@ -133,7 +133,7 @@ Πίσω Αποθήκευση & έξοδος Σφάλμα - Γίνεται φόρτωση... + Γίνεται φόρτωση… άγνωστο Άγνωστο σφάλμα Εκκρεμεί @@ -248,7 +248,7 @@ Κουμπί αναπαραγωγής ή παύσης Κουμπί προώθησης Φωτογραφία από την κάμερα - Λήψη πιστοποίησης... + Λήψη πιστοποίησης… Προσπάθεια εισόδου… Δεν υπάρχει σύνδεση στο δίκτυο Μη διαθέσιμη ασφαλής σύνδεση. @@ -306,7 +306,7 @@ Αποστολή συνδέσμου σε Αντιγραφή αρχείου από ιδιωτικό αποθηκευτικό χώρο Σύνδεση με oAuth2 - Γίνεται σύνδεση με τον διακομιστή OAuth2... + Γίνεται σύνδεση με τον διακομιστή OAuth2… Δεν ήταν δυνατή η επαλήθευση της ταυτότητας του διακομιστή - Το πιστοποιητικό του διακομιστή δεν είναι έμπιστο - Το πιστοποιητικό του διακομιστή έχει λήξει @@ -362,11 +362,8 @@ Παρουσιάστηκε σφάλμα κατά την προσπάθεια ανάκτησης δυνατοτήτων Λυπούμαστε, ο διαμοιρασμός δεν επιτρέπεται στο διακομιστή σας. Παρακαλούμε επικοινωνήστε με το διαχειριστή σας. - Αδύνατη η κοινή χρήση. Παρακαλούμε ελέγξτε αν ο φάκελος υπάρχει Ένα σφάλμα προέκυψε κατά την προσπάθεια διαμοιρασμού αυτού του αρχείου ή φακέλου - Αδύνατη η διακοπή κοινής χρήσης. Παρακαλούμε ελέγξτε αν το αρχείο υπάρχει Ένα σφάλμα προέκυψε κατά τη διάρκεια ακύρωσης διαμοιρασμού αυτού του αρχείου ή φακέλου - Αδυναμία ενημέρωσης. Παρακαλούμε ελέγξτε εάν υπάρχει το αρχείο Ένα σφάλμα προέκυψε κατά τη διάρκεια ενημέρωσης του κοινόχρηστου Εισάγετε συνθηματικό Πρέπει να εισάγετε συνθηματικό diff --git a/owncloudApp/src/main/res/values-en-rGB/strings.xml b/owncloudApp/src/main/res/values-en-rGB/strings.xml index 2dcf26c2afa..c3f61ca5297 100644 --- a/owncloudApp/src/main/res/values-en-rGB/strings.xml +++ b/owncloudApp/src/main/res/values-en-rGB/strings.xml @@ -360,11 +360,8 @@ An error occurred while trying to retrieve capabilities Sorry, sharing is not enabled on your server. Please contact your administrator. - Unable to share. Please check whether the file exists An error occurred while trying to share this file or folder - Unable to unshare. Please check whether the file exists An error occurred while trying to unshare this file or folder - Unable to update. Please check whether the file exists An error occurred while trying to update the share Enter a password You must enter a password diff --git a/owncloudApp/src/main/res/values-en-rNZ/strings.xml b/owncloudApp/src/main/res/values-en-rNZ/strings.xml deleted file mode 100644 index 169dfefffda..00000000000 --- a/owncloudApp/src/main/res/values-en-rNZ/strings.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/owncloudApp/src/main/res/values-en-rUS/strings.xml b/owncloudApp/src/main/res/values-en-rUS/strings.xml deleted file mode 100644 index 169dfefffda..00000000000 --- a/owncloudApp/src/main/res/values-en-rUS/strings.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/owncloudApp/src/main/res/values-eo/strings.xml b/owncloudApp/src/main/res/values-eo/strings.xml index 3c287dc342b..a81dc1ab22a 100644 --- a/owncloudApp/src/main/res/values-eo/strings.xml +++ b/owncloudApp/src/main/res/values-eo/strings.xml @@ -14,8 +14,6 @@ Ordigi Malsuprenirece Ordigi laŭ - - Ĉiuj dosieroj Agordo Alŝutoj @@ -30,7 +28,7 @@ Forviŝi historion Helpo Rekomendi al amiko - Servila adreso https://... + Servila adreso https://… Uzantonomo Pasvorto Ĉu nova je %1$s? @@ -42,7 +40,7 @@ Forlasi sekundoj antaŭe Nenio estas ĉi tie. Alŝutu ion! - Ŝargante... + Ŝargante… Estas neniu dosiero en ĉi tiu dosierujo. dosierujo dosierujoj @@ -62,7 +60,7 @@ Antaŭen Konservi kaj eliri Eraro - Ŝargante... + Ŝargante… nekonata Nekonata eraro Traktotaj @@ -70,9 +68,9 @@ Ŝanĝi la pasvorton Forigi konton Krei konton - Alŝuti dosieron el... + Alŝuti dosieron el… Dosierujnomo - Alŝutante... + Alŝutante… %1$d%% Alŝutante %2$s Alŝuto sukcesis %1$s alŝutiĝis @@ -89,7 +87,7 @@ Permesa eraro Nekonata eraro Atendante por alŝuti - Elŝutante... + Elŝutante… %1$d%% Elŝutante %2$s Elŝuto sukcesis %1$s elŝutiĝis @@ -116,8 +114,8 @@ %1$s (ludanta) %1$s (ŝarganta) Dosiero ne estas en valida konto - Ekhavante rajtigon... - Provante ensaluti... + Ekhavante rajtigon… + Provante ensaluti… Neniu reta konekto Sekura konekto ne haveblas. Konekto stariĝis @@ -155,7 +153,7 @@ Atendu momenton Neatendita problemo; bonvolu provi alian aplikaĵon por elekti la dosieron Neniu dosiero elektiĝis - Sendi ligilon al... + Sendi ligilon al… Kopiante dosieron el malpublika memoro Ensaluti per oAuth2 - La servila atestilo ne fidindas @@ -212,7 +210,7 @@ Sendi historion Neniu aplikaĵo por sendi protokolojn troviĝas. Bonvolu instali retpoŝtaplikaĵon. %1$s protokoloj de Android-aplikaĵoj - Ŝargante datumojn... + Ŝargante datumojn… Movi Nenio estas ĉi tie. Vi povas aldoni dosierujon! Elekti @@ -243,8 +241,8 @@ %1$d dosieroj %1$d dosieroj, 1 dosierujo %1$d dosieroj, %2$d dosierujoj - Origina dosiero estos... - Origina dosiero estos... + Origina dosiero estos… + Origina dosiero estos… Kopii dosieron Movi dosieron konservita en origina dosierujo @@ -273,5 +271,4 @@ Administri spacon Forviŝi datumojn Kelkaj dosieroj ne povis foriĝi. - diff --git a/owncloudApp/src/main/res/values-es-rAR/strings.xml b/owncloudApp/src/main/res/values-es-rAR/strings.xml index 9aecf39c0a5..42fb9f5dfa7 100644 --- a/owncloudApp/src/main/res/values-es-rAR/strings.xml +++ b/owncloudApp/src/main/res/values-es-rAR/strings.xml @@ -82,7 +82,7 @@ El tóken de acceso ha expirado o se ha vuelto inválido. Ingresa nuevamente para conseguir el acceso Entrar Verificar servidor - Dirección del servidor https://... + Dirección del servidor https://… Nombre de usuario Contraseña ¿Sos nuevo para %1$s? @@ -104,7 +104,7 @@ segundos atrás No hay nada. ¡Subí contenido! No hay archivos disponibles sin conexión. - Cargando... + Cargando… No se ha encontrado una aplicación para este tipo de archivo No existen archivos en esta carpeta. No hay subcarpetas en esta carpeta. @@ -134,7 +134,7 @@ Volver Guardar & Salir Error - Cargando... + Cargando… desconocido Error desconocido Pendientes @@ -145,7 +145,7 @@ Crear cuenta Subir desde Nombre de la carpeta - Subiendo... + Subiendo… %1$d%% Subiendo %2$s Subido con éxito %1$s cargado @@ -184,7 +184,7 @@ Esperando conectividad WiFi Esperando para cargar Archivo de medios no soportado - Descargando... + Descargando… %1$d%% descargando %2$s Descarga completa %1$s descargado @@ -248,8 +248,8 @@ Botón de reproducción o pausa Botón avance rápido Imagen desde la cámara - Obteniendo autorización... - Intentando identificar... + Obteniendo autorización… + Intentando identificar… Sin conexión de red Conexión segura no disponible. Conexión establecida @@ -270,7 +270,7 @@ Estado inesperado; por favor ingrese nuevamente la dirección del servidor Tu autorización ha expirado. Por favor, obtenga una nueva autorización Por favor ingrese su contraseña actual - Conectando al servidor de autenticación ... + Conectando al servidor de autenticación … El servidor no soporta este método de autenticación %1$s no soporta múltiples cuentas Tú servidor no esta regresando una identificación de usuario correcta, por favor contacta a un administrador @@ -359,11 +359,8 @@ Ha ocurrido un error al intentar obtener las capacidades Lo sentimos, compartir no esta activado en su servidor. Por favor contacte a su ⇥⇥administrator. - Imposible compartir. Por favor revise si el archivo existe Un error ocurrió cuando se intentaba compartir el archivo o carpeta - Imposible dejar de compartir. Por favor revise si los archivos existen Un error ocurrió cuando se intentaba dejar de compartir el archivo o carpeta - No se puede actualizar. Por favor chequea si el archivo existe Ha ocurrido un error al momento de actualizar el compartido Ingresa una contraseña Debes ingresar una contraseña @@ -396,7 +393,7 @@ Enviar historial No se ha encontrado una aplicación para enviar los registros. Por favor instale una aplicación de correo. %1$s Registros de la aplicación Android - Cargando datos... + Cargando datos… Seleccionar todos Invertir selección Mover diff --git a/owncloudApp/src/main/res/values-es-rBO/strings.xml b/owncloudApp/src/main/res/values-es-rBO/strings.xml deleted file mode 100644 index 169dfefffda..00000000000 --- a/owncloudApp/src/main/res/values-es-rBO/strings.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/owncloudApp/src/main/res/values-es-rCL/strings.xml b/owncloudApp/src/main/res/values-es-rCL/strings.xml index 3127361603d..10b016c839b 100644 --- a/owncloudApp/src/main/res/values-es-rCL/strings.xml +++ b/owncloudApp/src/main/res/values-es-rCL/strings.xml @@ -7,13 +7,11 @@ Nuevo directorio Configuración detalles - - Ayuda General Cuentas Ayuda - Dirección del servidor https://... + Dirección del servidor https://… Usuario Clave ¿Nuevo en %1$s? @@ -35,11 +33,11 @@ Si No Error - Cargando ... + Cargando … Error desconocido Acerca de Crear cuenta - Subir desde... + Subir desde… Nombre del directorio Subiendo %1$d%% Subiendo %2$s @@ -47,7 +45,7 @@ Subida fallida La subida de %1$s no pudo ser completada Error desconocido - Descargando... + Descargando… %1$d%% Descargando %2$s Descarga completada Descarga fallida @@ -130,5 +128,4 @@ Compartir Cancelar Clave - diff --git a/owncloudApp/src/main/res/values-es-rCO/strings.xml b/owncloudApp/src/main/res/values-es-rCO/strings.xml deleted file mode 100644 index 169dfefffda..00000000000 --- a/owncloudApp/src/main/res/values-es-rCO/strings.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/owncloudApp/src/main/res/values-es-rCR/strings.xml b/owncloudApp/src/main/res/values-es-rCR/strings.xml index 04a409f9fcd..02f5792ddaa 100644 --- a/owncloudApp/src/main/res/values-es-rCR/strings.xml +++ b/owncloudApp/src/main/res/values-es-rCR/strings.xml @@ -1,10 +1,5 @@ Archivos - - - Archivos - diff --git a/owncloudApp/src/main/res/values-es-rEC/strings.xml b/owncloudApp/src/main/res/values-es-rEC/strings.xml deleted file mode 100644 index 169dfefffda..00000000000 --- a/owncloudApp/src/main/res/values-es-rEC/strings.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/owncloudApp/src/main/res/values-es-rES/strings.xml b/owncloudApp/src/main/res/values-es-rES/strings.xml deleted file mode 100644 index 169dfefffda..00000000000 --- a/owncloudApp/src/main/res/values-es-rES/strings.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/owncloudApp/src/main/res/values-es-rMX/strings.xml b/owncloudApp/src/main/res/values-es-rMX/strings.xml index c8da605e2ea..b8a4d1cd5a2 100644 --- a/owncloudApp/src/main/res/values-es-rMX/strings.xml +++ b/owncloudApp/src/main/res/values-es-rMX/strings.xml @@ -79,7 +79,7 @@ Ha ocurrido un error al copiar a la carpeta temporal. Por favor intentelo de nuevo. hace segundos No hay nada aquí. ¡Suba algo! - Cargando... + Cargando… No se ha encontrado ninguna aplicación para el tipo de archivo No hay archivos en esta carpeta. No hay archivos en esta carpeta @@ -108,7 +108,7 @@ Volver Guardar & salir Error - Cargando... + Cargando… desconocido Error desconocido Pendiente @@ -312,11 +312,8 @@ Ruta de carga de imagenes La función Compartir no está activada en su servidor. Contacte a su administrador. - No se puede compartir. Revise si el archivo existe Ocurrió un error al tratar de compartir este archivo o carpeta - No se puede dejar de compartir. Revise si el archivo existe Ocurrió un error al tratar de ya no compartir este archivo o carpeta - No se puede actualizar. Revise si el archivo existe Un error ha ocurrido mientras se intentaba actualizar el comparto Introduzca una contraseña Debe introducir una contraseña diff --git a/owncloudApp/src/main/res/values-es-rPE/strings.xml b/owncloudApp/src/main/res/values-es-rPE/strings.xml deleted file mode 100644 index 169dfefffda..00000000000 --- a/owncloudApp/src/main/res/values-es-rPE/strings.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/owncloudApp/src/main/res/values-es-rPY/strings.xml b/owncloudApp/src/main/res/values-es-rPY/strings.xml deleted file mode 100644 index 04a409f9fcd..00000000000 --- a/owncloudApp/src/main/res/values-es-rPY/strings.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - Archivos - - - - Archivos - - diff --git a/owncloudApp/src/main/res/values-es-rUS/strings.xml b/owncloudApp/src/main/res/values-es-rUS/strings.xml deleted file mode 100644 index 169dfefffda..00000000000 --- a/owncloudApp/src/main/res/values-es-rUS/strings.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/owncloudApp/src/main/res/values-es-rUY/strings.xml b/owncloudApp/src/main/res/values-es-rUY/strings.xml deleted file mode 100644 index 169dfefffda..00000000000 --- a/owncloudApp/src/main/res/values-es-rUY/strings.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/owncloudApp/src/main/res/values-es/strings.xml b/owncloudApp/src/main/res/values-es/strings.xml index d3335e02b5f..527eb29f4af 100644 --- a/owncloudApp/src/main/res/values-es/strings.xml +++ b/owncloudApp/src/main/res/values-es/strings.xml @@ -102,7 +102,7 @@ hace segundos No hay nada aquí. ¡Suba algo! No hay archivos sin conexión disponibles. - Cargando... + Cargando… No se han encontrado apps para ese tipo de archivos No hay archivos en esta carpeta. No hay carpetas en esta carpeta. @@ -132,7 +132,7 @@ Volver Guardar & salir Error - Cargando... + Cargando… desconocido Error desconocido Pendiente @@ -143,7 +143,7 @@ Crear cuenta Subir desde Nombre de la carpeta - Subiendo... + Subiendo… %1$d%% Subiendo %2$s Subido con éxito %1$s subido @@ -182,7 +182,7 @@ Esperando a la conexión wifi Esperando para subir Tipo de archivo no soportado - Descargando... + Descargando… %1$d%% Descargado de %2$s Descarga completa %1$s descargado @@ -246,8 +246,8 @@ Botón de reproducción o pausa Botón avance rápido Imagen de la cámara - Consiguiendo autorización... - Tratando de iniciar sesión... + Consiguiendo autorización… + Tratando de iniciar sesión… Sin conexión de red Conexión segura no disponible. Conexión establecida @@ -360,11 +360,8 @@ Ha ocurrido un error al tratar de recuperar las capacidades La función Compartir no está activada en su servidor. Contacte a su administrador. - No se puede compartir. Revise si el archivo existe Ocurrió un error al tratar de compartir este archivo o carpeta - No se puede dejar de compartir. Revise si el archivo existe Ocurrió un error al tratar de ya no compartir este archivo o carpeta - No se puede actualizar. Revise si el archivo existe Un error ha ocurrido mientras se intentaba actualizar el comparto Introduzca una contraseña Debe introducir una contraseña @@ -397,7 +394,7 @@ Mandar historial. Aplicación para enviar registros no encontrada. Por favor instale una aplicación de correo. Se han encontrado %1$s logs de la app Android - Cargando datos... + Cargando datos… Seleccionar todo Seleccionar inverso Mover diff --git a/owncloudApp/src/main/res/values-et-rEE/strings.xml b/owncloudApp/src/main/res/values-et-rEE/strings.xml index e8179844e87..4d5916bf918 100644 --- a/owncloudApp/src/main/res/values-et-rEE/strings.xml +++ b/owncloudApp/src/main/res/values-et-rEE/strings.xml @@ -15,8 +15,6 @@ Kahanevalt Sorteeri A-Z - - Kõik failid Seaded Üleslaadimised @@ -44,7 +42,7 @@ Proovi oma nutitelefonil rakendust %1$s! Kutsun sind kasutama oma nutitelefonis rakendust %1$s!\nLaadi see alla siit: %2$s Kontrolli serverit - Serveri aadress https://... + Serveri aadress https://… Kasutajanimi Parool Uus %1$s kasutaja? @@ -58,7 +56,7 @@ Ühtegi faili ei laaditud sekundit tagasi Siin pole midagi. Lae midagi üles! - Laadimine... + Laadimine… Kaustas pole faile. kaust kaustad @@ -79,7 +77,7 @@ Tagasi Salvesta & välju Viga - Laadimine ... + Laadimine … tundmatu Tundmatu viga Ootel @@ -87,9 +85,9 @@ Muuda parooli Eemalda konto Loo konto - Lae fail üles kohast ... + Lae fail üles kohast … Kausta nimi - Üleslaadimine ... + Üleslaadimine … %1$d%% üleslaadimine %2$s Üleslaadimine oli edukas Üleslaadimine ebaõnnestus @@ -112,7 +110,7 @@ Rakendus suleti jõuga Tundmatu viga Üleslaadimise ootamine - Allalaadimine ... + Allalaadimine … %1$d%% allalaadimine %2$s Allalaadimine oli edukas Allalaadimine ebaõnnestus @@ -252,9 +250,7 @@ Allpool on loend kohalikest failidest ning serveris asuvatest failidest %5$s, mi %1$s ei suudetud kopeerida kohalikku kataloogi %2$s Vabandust, server ei toeta jagamist. Palun kontakteeru ⇥⇥administraatoriga. - Jagamine ebaõnnestus. Palun kontrolli, kas fail on olemas Faili või kausta jagamisel esines viga - Liigutamise lõpetamine ebaõnnestus. Palun kontrolli, kas fail on olemas Faili või kausta jagamise tühistamisel esines viga Sisesta parool Sa pead parooli sisestama @@ -279,7 +275,7 @@ Allpool on loend kohalikest failidest ning serveris asuvatest failidest %5$s, mi Logid Saada ajalugu %1$s Androidi rakenduse logid - Andmete laadimine ... + Andmete laadimine … Tõsta ümber Siin pole midagi. Sa võid lisada kausta! Vali @@ -309,8 +305,8 @@ Allpool on loend kohalikest failidest ning serveris asuvatest failidest %5$s, mi %1$d faili %1$d faili, 1 kaust %1$d faili, %2$d kausta - Algne fail... - Algne fail... + Algne fail… + Algne fail… Kopeeri fail Liiguta fail hoitakse algses kaustas @@ -324,7 +320,7 @@ Allpool on loend kohalikest failidest ning serveris asuvatest failidest %5$s, mi Parool Turvatud Hangi link - Jaga ... + Jaga … Otsi Otsi kasutajaid ja gruppe %1$s (grupp) @@ -344,5 +340,4 @@ Allpool on loend kohalikest failidest ning serveris asuvatest failidest %5$s, mi Ruumi haldamine Tühjenda andmed Mõningate failide kustutamine ebaõnnestus. - diff --git a/owncloudApp/src/main/res/values-eu-rES/strings.xml b/owncloudApp/src/main/res/values-eu-rES/strings.xml index db7a56832c3..c776ddac43f 100644 --- a/owncloudApp/src/main/res/values-eu-rES/strings.xml +++ b/owncloudApp/src/main/res/values-eu-rES/strings.xml @@ -1,7 +1,4 @@ - Deskargatu - diff --git a/owncloudApp/src/main/res/values-eu/strings.xml b/owncloudApp/src/main/res/values-eu/strings.xml index 742a081eca3..e0c748b3e54 100644 --- a/owncloudApp/src/main/res/values-eu/strings.xml +++ b/owncloudApp/src/main/res/values-eu/strings.xml @@ -15,8 +15,6 @@ Beherantz Ordenatu honen arabera A-Z - - Fitxategi guztiak Ezarpenak Kargatutakoak @@ -80,7 +78,7 @@ Errore bat gertatu da fitxategia aldi baterako karpetan kopiatzerakoan. Mesedez, saia zaitez berriz bidaltzen. segundu Ez dago ezer. Igo zerbait! - Kargatzen... + Kargatzen… Ez da fitxategi motarentzat app-ik aurkitu Ez dago fitxategirik karpeta honetan. Ez dago karpetarik karpeta honetan. @@ -109,7 +107,7 @@ Atzera Gorde & irten Errorea - Kargatzen ... + Kargatzen … ezezaguna Errore ezezaguna Zain @@ -117,9 +115,9 @@ Aldatu pasahitza Kontua ezabatu Sortu kontua - Igo fitxategia hemendik ... + Igo fitxategia hemendik … Karpetaren izena - Igotzen ... + Igotzen … %1$d%% Igotzen %2$s Igotzea ongi burutu da %1$s kargatuta @@ -155,7 +153,7 @@ Wifi konektibitatea itxoiten Kargatzeko itxoiten Onartzen ez den euskarri mota - Deskargatzen ... + Deskargatzen … %1$d%% Deskargatzen %2$s Deskarga ongi burutu da %1$s deskargatu da @@ -236,7 +234,7 @@ Zure baimena iraungitu da. Mesedez, baimendu berriz Mesedez, sartu oraingo pasahitza - Konektatzen autentikazio zerbitzarira... + Konektatzen autentikazio zerbitzarira… Zerbitzariak ez du autentikazio metodo hau onartzen %1$s ez du kontu anitzak onartzen Zure zerbitzariak ez du bueltatzen erabiltzailearen id egokia, mesedez jarri harremanetan administratzailearekin. @@ -267,10 +265,10 @@ Mesedez, baimendu berriz Egiaztatzen gordetako kredentzialak Ezusteko arazoa; mesedez, saiatu beste app batekin fitxategia hautatzeko Ez da fitxategirik hautatu - Bidali lotura honi... + Bidali lotura honi… Fitxategia biltegi pribatutik kopiatzen Saioa hasi oAuth2-rekin - Konektatzen oAuth2 zerbitzarira... + Konektatzen oAuth2 zerbitzarira… - Zerbitzariaren ziurtagiria ez da fidagarria - Zerbitzariaren ziurtagiria iraungi da - Zerbitzariaren ziurtagiria oso gaztea da @@ -312,11 +310,8 @@ Mesedez, baimendu berriz %1$s ezin da %2$s karpeta lokalera kopiatu Irudiak igotzeko bidea Sentitzen dut, partekatzea ez dago zure zerbitzarian gaituta. Mesedez jarri harremanetan zure administratzailearekin. - Ezin izan da partekatu. Mesedez egiaztatu fitxategia existitzen dela Errore bat egon da fitxategaia edo karpeta partekatzerakoan - Ezin izan da partekatzea desegin. Mesedez egiaztatu fitxategia existitzen dela Errore bat egon da fitxategaia edo karpeta partekatzeari uzterakoan - Ezin izan da eguneratu. Mesedez, egiaztatu fitxategia existitzen dela. Pasahitz bat sartu Pasahitz bat sartu behar duzu Bidali @@ -340,7 +335,7 @@ Mesedez, baimendu berriz Konexio segurua birbideratu da segurua ez den bide batetik. Egunkariak %1$s Android aplikazioaren egunerokoak - Datuak kargatzen... + Datuak kargatzen… Mugitu Hemen ez dago ezer. Karpeta bat gehi dezakezu! Aukeratu diff --git a/owncloudApp/src/main/res/values-fa/strings.xml b/owncloudApp/src/main/res/values-fa/strings.xml index 2f19ed1918b..fc8d7a21867 100644 --- a/owncloudApp/src/main/res/values-fa/strings.xml +++ b/owncloudApp/src/main/res/values-fa/strings.xml @@ -321,7 +321,7 @@ مدیریت حساب‌ها لاگ‌ها فرستادن تاریخچه - بارگذاری داده... + بارگذاری داده… انتخاب همه انتقال اینجا هیچی نیست، میتوانید پوشه اضافه کنید diff --git a/owncloudApp/src/main/res/values-fi-rFI/strings.xml b/owncloudApp/src/main/res/values-fi-rFI/strings.xml index 69724ff7d36..320a509bc31 100644 --- a/owncloudApp/src/main/res/values-fi-rFI/strings.xml +++ b/owncloudApp/src/main/res/values-fi-rFI/strings.xml @@ -320,11 +320,8 @@ Kansio lähetetyille kuville Jakaminen ei ole käytössä palvelimellasi. Ota yhteys ylläpitäjään. - Jakaminen epäonnistui. Varmista, että tiedosto on olemassa Virhe tiedoston tai kansion jakamista yrittäessä - Jakamisen lopettaminen epäonnistui. Tarkista onko tiedosto olemassa Tiedoston tai kansion jakamista lopettaessa tapahtui virhe - Päivittäminen epäonnistui. Tarkista onko tiedosto olemassa Jakoa päivittäessä tapahtui virhe Anna salasana Salasana on pakko antaa diff --git a/owncloudApp/src/main/res/values-fr-rCA/strings.xml b/owncloudApp/src/main/res/values-fr-rCA/strings.xml deleted file mode 100644 index ab4d58af2d2..00000000000 --- a/owncloudApp/src/main/res/values-fr-rCA/strings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - diff --git a/owncloudApp/src/main/res/values-fr/strings.xml b/owncloudApp/src/main/res/values-fr/strings.xml index c4d5833e5f4..fe640622c4b 100644 --- a/owncloudApp/src/main/res/values-fr/strings.xml +++ b/owncloudApp/src/main/res/values-fr/strings.xml @@ -30,7 +30,7 @@ %1$s utilisé(s) Aucune information d\'utilisation du stockage disponible Retour d’expérience - Aide... + Aide… Général Plus Sécurité @@ -96,7 +96,7 @@ Téléchargez-le ici : %2$s il y a quelques secondes Il n\'y a rien ici ! Envoyez donc quelque chose :) Il n’y a pas de fichier hors connexion disponible. - Chargement... + Chargement… Aucune application trouvée pour ce type de fichier Aucun fichier n\'est présent dans ce dossier. Il n\'y a pas de dossiers dans ce dossier. @@ -126,7 +126,7 @@ Téléchargez-le ici : %2$s Retour Enregistrer et quitter Erreur - Chargement... + Chargement… Inconnu Erreur inconnue En attente @@ -137,7 +137,7 @@ Téléchargez-le ici : %2$s Créer un compte Téléversez depuis Nom du dossier - Téléversement ... + Téléversement … Envoi du fichier %2$s : %1$d%% effectués Téléversement réussi %1$s téléversé @@ -173,7 +173,7 @@ Téléchargez-le ici : %2$s En attente d\'une connexion wifi En attente de chargement Type de média non pris en charge - Téléchargement ... + Téléchargement … Téléchargement en cours de %2$s, %1$d%% effectués Téléchargement réussi %1$s téléchargé @@ -241,7 +241,7 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq Bouton d\'avance rapide Image de la caméra Demande d\'autorisation… - Tentative de connexion ... + Tentative de connexion … Pas de connexion réseau Connexion sécurisée non disponible Connexion établie @@ -352,11 +352,8 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq Une erreur est survenue pendant la récupération des partages Une erreur est survenue pendant la récupération des utilisateurs et des groupes Désolé, le partage n\'est pas disponible sur votre serveur. Veuillez contacter votre administrateur. - Impossible de partager. Vérifiez que le fichier est bien présent Une erreur est survenue lors de la tentative de partage de ce fichier ou répertoire - Impossible de supprimer le partage. Vérifiez que le fichier est bien présent Une erreur est survenue lors de la tentative d’annulation du partage de ce fichier ou répertoire - Actualisation impossible. Veuillez vérifier que ce fichier existe Une erreur est survenue lors de la mise à jour du partage Saisissez un mot de passe Vous devez saisir un mot de passe diff --git a/owncloudApp/src/main/res/values-fy-rNL/strings.xml b/owncloudApp/src/main/res/values-fy-rNL/strings.xml deleted file mode 100644 index f8e7479a21e..00000000000 --- a/owncloudApp/src/main/res/values-fy-rNL/strings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/owncloudApp/src/main/res/values-gl/strings.xml b/owncloudApp/src/main/res/values-gl/strings.xml index 0e0ed855e35..6a04fb44cf6 100644 --- a/owncloudApp/src/main/res/values-gl/strings.xml +++ b/owncloudApp/src/main/res/values-gl/strings.xml @@ -105,7 +105,7 @@ Descárgueo de aquí: %2$s segundos atrás Aquí non hai nada. Envíe algo! Non hai ficheiros dispoñíbeis sen conexión. - Cargando... + Cargando… Non se atopou unha aplicación para este tipo de ficheiro Non hai ficheiros neste cartafol. Non hai cartafoles neste cartafol. @@ -135,7 +135,7 @@ Descárgueo de aquí: %2$s Atrás Gardaer e saír. Erro - Cargando... + Cargando… descoñecido Produciuse un erro descoñecido Pendentes @@ -250,8 +250,8 @@ Descárgueo de aquí: %2$s Botón de reprodución/pausa Botón de avance rápido Imaxe da cámara - Obtendo a autorización... - Tentando acceder... + Obtendo a autorización… + Tentando acceder… Sen conexión de rede Non hai conexión seguras dispoñíbeis. Estabeleceuse a conexión @@ -364,11 +364,8 @@ Descárgueo de aquí: %2$s Produciuse un erro ao tentar recuperar funcións O seu servidor non ten activada a opción de compartir. Póñase en contacto co administrador. - Non foi posíbel compartir. Comprobe que existe o ficheiro Produciuse un erro ao tentar compartir este ficheiro ou cartafol. - Non foi posíbel deixar de compartir. Comprobe que existe o ficheiro Produciuse un erro ao tentar deixar de compartir este ficheiro ou cartafol - Non foi posíbel actualizar. Comprobe que existe o ficheiro Produciuse un erro ao tentar actualizar o recurso compartido Escriba un contrasinal Ten que escribir un contrasinal @@ -401,7 +398,7 @@ Descárgueo de aquí: %2$s Enviar o historial Non se atopou unha aplicación para enviar os rexistros. Instale unha aplicación de correo! Rexistros da aplicación %1$s Android - Cargando os datos... + Cargando os datos… Seleccionar todo Seleccionar á inversa Mover diff --git a/owncloudApp/src/main/res/values-gu/strings.xml b/owncloudApp/src/main/res/values-gu/strings.xml index 20f0ddd899f..2a973cdffe5 100644 --- a/owncloudApp/src/main/res/values-gu/strings.xml +++ b/owncloudApp/src/main/res/values-gu/strings.xml @@ -1,9 +1,6 @@ ફાઇલો - - બંધ ફાઇલો - diff --git a/owncloudApp/src/main/res/values-he/strings.xml b/owncloudApp/src/main/res/values-he/strings.xml index 26d4ba1d6f9..d902d8756c9 100644 --- a/owncloudApp/src/main/res/values-he/strings.xml +++ b/owncloudApp/src/main/res/values-he/strings.xml @@ -146,7 +146,7 @@ יצירת חשבון העלאה מ- שם התיקייה - מעלה... + מעלה… %1$d%% בהעלאה %2$s ההעלאה הצליחה %1$s הועלו @@ -185,7 +185,7 @@ מחכה לחיבור WiFi ממתין להעלאה סוג מדיה לא נתמך - מוריד... + מוריד… %1$d%% בהורדה %2$s ההורדה הצליחה %1$s הורדו @@ -250,8 +250,8 @@ לחצן ניגון או השהייה לחצן הרצה קדימה תמונה ממצלמה - מקבל אישורים... - מנסה להתחבר... + מקבל אישורים… + מנסה להתחבר… אין חיבור לאינטרנט אין חיבור מוצפן זמין. החיבור נוצר @@ -272,7 +272,7 @@ מצב בלתי צפוי ; יש להכניס את כתובת השרת שנית האישור שלך פג. נא לבצע אישור מחדש יש להכניס את הסיסמא הנוכחית - מתחבר לשרת אימות... + מתחבר לשרת אימות… השרת אינו תומך בשיטת אימות זו %1$s אינו תומך בריבוי חשבונות השרת אינו מחזיר מספר משתמש נכון, יש ליצור קשר עם מנהל @@ -308,7 +308,7 @@ שליחת קישור ל- מעתיק קובץ מאחסון פרטי התחברות באמצעות oAuth2 - מתחבר לשרת OAuth2... + מתחבר לשרת OAuth2… לא ניתן היה לאמת את זהות השרת - תעודת השרת אינה מהימנה - תוקף תעודת השרת פג @@ -364,11 +364,8 @@ שגיאה אירעה בניסיון לאחזר יכולות מצטערים, שיתוף אינו מורשה על השרת שלך. יש ליצור קשר עם ⇥⇥מנהל. - לא ניתן לשתף. יש לבדוק אם הקובץ קיים שגיאה אירעה בזמן ניסיון לשתף קובץ זה או תיקייה זו - לא ניתן לבטל שיתוף. יש לבדוק אם הקובץ קיים שגיאה אירעה בזמן ניסיון לבטל שיתוף לקובץ זה או לתיקייה זו - לא ניתן לעדכן. יש לבדוק אם הקובץ קיים שגיאה אירעה בניסיון לעדכן את השיתוף הכנסת סיסמא יש להכניס סיסמא @@ -401,7 +398,7 @@ הסטורית שליחה לא נמצא יישום לשליחת לוגים. יש להתקין יישום mail. %1$s לוגים של יישום אנדרואיד - טעינת מידע... + טעינת מידע… לבחור הכול בחירה הפוכה העברה diff --git a/owncloudApp/src/main/res/values-hi-rIN/strings.xml b/owncloudApp/src/main/res/values-hi-rIN/strings.xml deleted file mode 100644 index 169dfefffda..00000000000 --- a/owncloudApp/src/main/res/values-hi-rIN/strings.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/owncloudApp/src/main/res/values-hi/strings.xml b/owncloudApp/src/main/res/values-hi/strings.xml index 3732ccb3e0b..18a11d51a55 100644 --- a/owncloudApp/src/main/res/values-hi/strings.xml +++ b/owncloudApp/src/main/res/values-hi/strings.xml @@ -12,8 +12,6 @@ विवरण भेजें सॉर्ट करें - - सेटिंग्स खोलें सहायता @@ -39,5 +37,4 @@ रद्द करें सहेजें पासवर्ड - diff --git a/owncloudApp/src/main/res/values-hr/strings.xml b/owncloudApp/src/main/res/values-hr/strings.xml index 06b8871459f..4225b8920be 100644 --- a/owncloudApp/src/main/res/values-hr/strings.xml +++ b/owncloudApp/src/main/res/values-hr/strings.xml @@ -15,8 +15,6 @@ Silazno Sortiraj po A-Z - - Sve datoteke Postavke Upload-i @@ -65,7 +63,7 @@ Za vrijeme kopiranja datoteke u priveremenu mapu desila se greška. Molimo probaj poslati ponovo. prije par sekundi Nema ničega u ovoj mapi. Pošalji nešto! - Učitavanje... + Učitavanje… Nije nađena aplikacija za ovaj tip datoteke Nema datoteka u ovoj mapi Nema mapa u ovoj mapi @@ -92,7 +90,7 @@ Natrag Spremi & izađi Greška - Učitavanje... + Učitavanje… nepoznato Nepoznata pogreška Na čekanju @@ -162,5 +160,4 @@ Kreirajte promijeni Izbrišite - diff --git a/owncloudApp/src/main/res/values-hu-rHU/strings.xml b/owncloudApp/src/main/res/values-hu-rHU/strings.xml index cc765bf2474..e372c08d559 100644 --- a/owncloudApp/src/main/res/values-hu-rHU/strings.xml +++ b/owncloudApp/src/main/res/values-hu-rHU/strings.xml @@ -77,7 +77,7 @@ Fiók módosítása Bejelentkezés Kiszolgáló ellenőrzése - Kiszolgálócím https://... + Kiszolgálócím https://… Felhasználónév Jelszó Új Önnek a(z) %1$s? @@ -140,7 +140,7 @@ Fiók létrehozása Feltöltés innen Mappanév - Feltöltés... + Feltöltés… %1$d%% Feltöltés: %2$s Feltöltés sikeres %1$s feltöltve @@ -242,8 +242,8 @@ Lejátszás vagy szüneteltetés gomb Gyors előretekerés gomb Kép a kamerából - Belépési adatok elérése... - Bejelentkezési kísérlet... + Belépési adatok elérése… + Bejelentkezési kísérlet… Nincs hálózati kapcsolat Biztonságos kapcsolat nem érhető el. Kapcsolat létrejött @@ -350,11 +350,8 @@ Képfeltöltési útvonal Sajnáljuk, a megosztás nem engedélyezett ezen a kiszolgálón. Vegye fel a kapcsolatot a rendszergazdával. - Nem sikerült megosztani. Ellenőrizze, hogy létezik-e a fájl Hiba történt a fájl vagy mappa megosztásakor - A megosztás nem kapcsolható ki. Ellenőrizze, hogy létezik-e a fájl Hiba történt a fájl vagy mappa megosztásának visszavonásakor - Nem sikerült frissíteni. Ellenőrizze, hogy létezik-e a fájl Hiba történt a megosztás frissítése közben Adjon meg egy jelszót Adjon meg egy jelszót @@ -387,7 +384,7 @@ Előzmények küldése Nem található alkalmazás a naplók küldésére. Telepítsen egy levél alkalmazást. %1$s Android-alkalmazások naplói - Adatok betöltése... + Adatok betöltése… Összes kijelölése Mozgatás Itt nincs semmi! Adj hozzá egy mappát! diff --git a/owncloudApp/src/main/res/values-hy/strings.xml b/owncloudApp/src/main/res/values-hy/strings.xml index 007d7847b21..459ba6bebab 100644 --- a/owncloudApp/src/main/res/values-hy/strings.xml +++ b/owncloudApp/src/main/res/values-hy/strings.xml @@ -12,8 +12,6 @@ Դասակարգել Դասակարգել ըստ Ա-Ֆ - - Բոլոր ֆայլերը Կարգավորումներ Բեռնումներ @@ -62,9 +60,9 @@ Փոխել գաղտնաբառը Ջնջել հաշիվը Ստեղծել հաշիվ - Բեռնել... + Բեռնել… Պանակի անուն - Բեռնում եմ... + Բեռնում եմ… %1$d%% Բեռնում եմ %2$s Բեռնումը հաջողվեց %1$s բեռնվեց @@ -86,7 +84,7 @@ Հակասություն Անհայտ սխալ Սպասում եմ wifi կապին - Ներբեռնում եմ... + Ներբեռնում եմ… %1$d%% Ներբեռնում եմ %2$s Բեռնումն հաջողվեց %1$s բեռնվեց @@ -197,5 +195,4 @@ %d նշված %d նշված - diff --git a/owncloudApp/src/main/res/values-ia/strings.xml b/owncloudApp/src/main/res/values-ia/strings.xml index 31c3333b69b..03d0bfa64bb 100644 --- a/owncloudApp/src/main/res/values-ia/strings.xml +++ b/owncloudApp/src/main/res/values-ia/strings.xml @@ -6,8 +6,6 @@ Configurationes Detalios Invia - - Aperi Adjuta General @@ -56,5 +54,4 @@ crear cambiar deler - diff --git a/owncloudApp/src/main/res/values-id/strings.xml b/owncloudApp/src/main/res/values-id/strings.xml index d99d4a92624..5ddf5d5d056 100644 --- a/owncloudApp/src/main/res/values-id/strings.xml +++ b/owncloudApp/src/main/res/values-id/strings.xml @@ -102,7 +102,7 @@ beberapa detik yang lalu Tidak ada apa-apa di sini. Unggah sesuatu! Tidak ada file offline yang tersedia. - Memuat... + Memuat… Tidak ditemukan aplikasi untuk membaca berkas Tidak ada satupun berkas dalam folder ini. Tidak ada folder dalam folder ini @@ -132,7 +132,7 @@ Kembali Simpan & keluar Kesalahan - Memuat... + Memuat… tidak diketahui Kesalahan tidak diketahui Tertunda @@ -143,7 +143,7 @@ Buat akun Unggah dari Nama folder - Mengunggah... + Mengunggah… %1$d%% Mengunggah %2$s Berhasil mengunggah %1$s diunggah @@ -182,7 +182,7 @@ Menunggu koneksi wifi Menunggu unggahan Jenis media tidak didukung - Mengunduh... + Mengunduh… %1$d%% Mengunduh %2$s Berhasil mengunduh %1$s terunduh @@ -246,8 +246,8 @@ Tombol main dan jeda Tombol maju Gambar dari kamera - Mendapatkan otorisasi... - Mencoba masuk... + Mendapatkan otorisasi… + Mencoba masuk… Tidak ada koneksi internet Sambungan aman tidak tersedia Sambungan dibuat @@ -268,7 +268,7 @@ Kondisi tak terduga; silakan masukkan alamat penyedia lagi Otorisasi Anda telah berakhir. Silakan mengotorisasi lagi Masukkan password - Menyambung ke penyedia otentikasi ... + Menyambung ke penyedia otentikasi … Server tidak mendukung medote otentikasi ini %1$s tidak mendukung banyak akun Server Anda tidak membalas id pengguna dengan banar, Sialakn hubungi Administrator @@ -304,7 +304,7 @@ Kirim tautan ke Menyalin berkas dari penyimpanan pribadi Masuk dengan oAuth2 - Menyambungkan ke server OAuth2... + Menyambungkan ke server OAuth2… Identitas server tidak dapat diverifikasi - Sertifikat server tidak terpercaya - Sertifikat server kadaluarsa @@ -357,11 +357,8 @@ Jalur unggah gambar Maaf, berbagi tidak diaktifkan pada server Anda. Silakan hubungi administrator Anda. - Tidak dapat berbagi. Mohon periksa apakah berkas ada Terjadi kesalahan saat mencoba membagikan berkas atau folder ini - Tidak dapat menghapus berbagi. Mohon periksa apakah berkas ada Terjadi kesalahan saat mencoba menghapus berbagi berkas dan folder ini - Tidak dapat memperbarui. Mohon periksa apakah berkas tersedia Terjadi kesalahan saat mencoba memperbarui berbagi Masukkan sandi Anda harus memasukkan sandi @@ -394,7 +391,7 @@ Kirim riwayat Tidak ada aplikasi untuk mengirim log yang ditemukan. Pasang aplikasi email %1$s Android apl log - Memuat data... + Memuat data… Pilih Semua Pilih kebalikan Pindah diff --git a/owncloudApp/src/main/res/values-io/strings.xml b/owncloudApp/src/main/res/values-io/strings.xml deleted file mode 100644 index 1647fff6c53..00000000000 --- a/owncloudApp/src/main/res/values-io/strings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/owncloudApp/src/main/res/values-is/strings.xml b/owncloudApp/src/main/res/values-is/strings.xml index f89c8bd62e0..ee8b166e878 100644 --- a/owncloudApp/src/main/res/values-is/strings.xml +++ b/owncloudApp/src/main/res/values-is/strings.xml @@ -130,7 +130,7 @@ Stofna aðgang Senda inn úr Nafn möppu - Sendi inn ... + Sendi inn … %1$d%% Sendi inn %2$s Innsending tókst %1$s sent inn @@ -166,7 +166,7 @@ Bíð eftir þráðlausri nettengingu Bíð eftir að senda inn Óstudd gerð gagnamiðils - Sæki ... + Sæki … %1$d%% Sæki %2$s Niðurhal tókst %1$s niðurhalað @@ -226,7 +226,7 @@ Afspilun-eða-hlé hnappur Spóla-hratt-áfram hnappur Mynd úr myndavél - Fæ heimild ... + Fæ heimild … Reyni að skrá inn … Engin nettenging Örugg tenging ekki tiltæk. @@ -332,11 +332,8 @@ Innsendingarslóð fyrir myndir Því miður, deiling gagna er ekki virk á þjóninum. Hafðu samband við kerfisstjóra. - Get ekki deilt. Athugaðu hvort skráin sé til Villa kom upp við að reyna að deila þessari skrá eða möppu - Get ekki hætt deilingu. Athugaðu hvort skráin sé til Villa kom upp við að reyna að hætta deilingu á þessari skrá eða möppu - Get ekki uppfært. Athugaðu hvort skráin sé til Villa kom upp við að reyna að uppfæra sameignina Settu inn lykilorð Þú verður að setja inn lykilorð diff --git a/owncloudApp/src/main/res/values-it/strings.xml b/owncloudApp/src/main/res/values-it/strings.xml index 5c99fe682f2..f9494a4a5f3 100644 --- a/owncloudApp/src/main/res/values-it/strings.xml +++ b/owncloudApp/src/main/res/values-it/strings.xml @@ -80,7 +80,7 @@ Cambia account Accedi Controlla il server - Indirizzo server https://... + Indirizzo server https://… Nome utente Password Prima volta su %1$s? @@ -102,7 +102,7 @@ secondi fa Non c\'è niente qui. Carica qualcosa! Non ci sono file offline disponibili. - Caricamento in corso... + Caricamento in corso… Nessuna applicazione trovata per questo tipo di file Non ci sono file in questa cartella. Non ci sono cartelle in questa cartella. @@ -132,7 +132,7 @@ Indietro Salva ed esci Errore - Caricamento in corso... + Caricamento in corso… sconosciuto Errore sconosciuto In corso @@ -143,7 +143,7 @@ Crea account Invia da Nome della cartella - Invio in corso... + Invio in corso… %1$d%% Caricamento di %2$s Caricamento effettuato %1$s caricato @@ -182,7 +182,7 @@ In attesa della connettività wifi In attesa di caricamento Formato non supportato - Scaricamento... + Scaricamento… %1$d%% Scaricamento di %2$s Scaricamento effettuato %1$s scaricato @@ -246,8 +246,8 @@ Pulsante Riproduci o pausa Pulsante Avanti veloce Immagine dalla fotocamera - Autorizzazione in corso... - Tentativo di accesso... + Autorizzazione in corso… + Tentativo di accesso… Nessuna connessione di rete Connessione sicura disponibile. Connessione stabilita @@ -268,7 +268,7 @@ Stato inatteso; digita nuovamente l\'indirizzo del server Autorizzazione scaduta. Richiedi l\'autorizzazione Digita la password attuale - Connessione al server di autenticazione in corso... + Connessione al server di autenticazione in corso… Il server non supporta questo metodo di autenticazione %1$s non supporta account multipli Il tuo server non ha restituito un id utente corretto, contatta un amministratore @@ -304,7 +304,7 @@ Invia collegamento a Copia file dall\'archiviazione privata Accesso con oAuth2. - Connessione al server OAuth2... + Connessione al server OAuth2… L\'identità del server non può essere verificata - Il certificato del server non è affidabile - Il certificato del server è scaduto @@ -358,11 +358,8 @@ Si è verificato un errore durante il tentativo di recuperare le condivisioni Spiacenti, la condivisione non è abilitata sul tuo server. Contatta il tuo amministratore. - Impossibile condividere. Assicurati che il file esista Si è verificato un errore durante il tentativo di condivisione del file o della cartella - Impossibile rimuovere dalla condivisione. Assicurati che il file esista Si è verificato un errore durante il tentativo di rimuovere la condivisione del file o della cartella - Impossibile aggiornare. Assicurati che il file esista Si è verificato un errore durante il tentativo di aggiornare la condivisione. Digita una password Devi digitare una password @@ -395,7 +392,7 @@ Cronologia invii Non è stata trovata alcuna applicazione per l\'invio dei log. Installa un client di posta. Registri applicazione %1$s Android - Caricamento dati in corso... + Caricamento dati in corso… Seleziona tutto Seleziona inverso Sposta diff --git a/owncloudApp/src/main/res/values-ja-rJP/strings.xml b/owncloudApp/src/main/res/values-ja-rJP/strings.xml index 58cf81eaddb..ac5195bbfd3 100644 --- a/owncloudApp/src/main/res/values-ja-rJP/strings.xml +++ b/owncloudApp/src/main/res/values-ja-rJP/strings.xml @@ -88,7 +88,7 @@ ファイルを一時フォルダーにコピーする際にエラーが発生しました。再送してください。 数秒前 ここには何もありません。何かアップロードしてください。 - 読込中... + 読込中… ファイルタイプに対応するアプリがありません このフォルダーにはファイルがありません。 このフォルダー中にはフォルダーがありません。 @@ -117,7 +117,7 @@ 戻る 保存 & 終了 エラー - 読込中... + 読込中… 不明 不明なエラー 中断 @@ -161,7 +161,7 @@ WiFiの接続を待っています アップロード待ち サポートされていない形式のメディア - ダウンロード中... + ダウンロード中… %1$d%% ダウンロード中 %2$s ダウンロードに成功 %1$s は正常にダウンロードされました @@ -223,8 +223,8 @@ 再生/一時停止ボタン 早送りボタン カメラのピクチャー - 認証中... - ログインしています... + 認証中… + ログインしています… ネットワークに接続されていません 暗号化通信が利用できません。 接続が確立しました @@ -245,7 +245,7 @@ 予期せぬ状態；別のサーバーアドレスを入力してみてください 認証情報は有効期限切れです。再度認証を行ってください。 現在のパスワードを入力してください - 認証サーバーに接続中... + 認証サーバーに接続中… サーバーはこの認証方式をサポートしていません %1$s は複数アカウントをサポートしていません サーバーが正しいユーザーIDを返しませんでした。管理者に問い合わせてください。 @@ -281,7 +281,7 @@ リンクを送信 プライベートストレージからファイルをコピー中 oAuth2でログイン - OAuth2サーバーに接続中... + OAuth2サーバーに接続中… このサーバーは検証できませんでした。 - サーバー証明書は信頼されていません - サーバー証明書は有効期限切れです @@ -331,11 +331,8 @@ ピクチャーアップロードパス すみませんが、サーバーで共有が有効になっていません。 管理者に問い合わせてください。 - 共有できません。ファイルがあるか確認してください。 このファイルまたはフォルダーを共有する際にエラーが発生しました - 共有を解除できません。ファイルがあるか確認してください。 このファイルまたはフォルダーの共有を解除する際にエラーが発生しました - 更新できません。ファイルがあるか確認してください。 共有を更新する際にエラーが発生しました パスワードを入力 パスワードを入力しなければなりません @@ -367,7 +364,7 @@ 履歴を送信 ログを送信するアプリが見つかりませんでした。メールアプリをインストールしてください。 %1$s アンドロイドアプリログ - 読込中 ... + 読込中 … すべて選択 移動 何もありません。フォルダーを追加してください。 diff --git a/owncloudApp/src/main/res/values-jv/strings.xml b/owncloudApp/src/main/res/values-jv/strings.xml index e7e4c39ca6d..4ab643141c4 100644 --- a/owncloudApp/src/main/res/values-jv/strings.xml +++ b/owncloudApp/src/main/res/values-jv/strings.xml @@ -1,7 +1,4 @@ - - Njipuk - diff --git a/owncloudApp/src/main/res/values-ka-rGE/strings.xml b/owncloudApp/src/main/res/values-ka-rGE/strings.xml index e025dd7d470..1a216631757 100644 --- a/owncloudApp/src/main/res/values-ka-rGE/strings.xml +++ b/owncloudApp/src/main/res/values-ka-rGE/strings.xml @@ -6,8 +6,6 @@ ახალი ფოლდერი პარამეტრები გაგზავნა - - გახსნა უკუკავშირი დახმარება @@ -44,16 +42,16 @@ ჩვენს შესახებ პაროლის შეცვლა ანგარიშის შექმნა - ატვირთე აქედან... + ატვირთე აქედან… ფოლდერის სახელი - მიმდინარეობს ატვირთვა... + მიმდინარეობს ატვირთვა… %1$d%% მიმდინარეობს ატვირთვა %2$s ატვირთვა განხორციელდა ატვირთვა ვერ განხორციელდა %1$s ატვირთვა ვერ დასრულდა ატვირთულია უცნობი შეცდომა - ჩამოტვირთვა... + ჩამოტვირთვა… %1$d%% ჩამოტვირთვა %2$s გადმოწერა დასრულდა ჩამოტვირთვა ვერ განხორციელდა @@ -129,5 +127,4 @@ შეგიძლია შეცვლა შექმნა წაშლა - diff --git a/owncloudApp/src/main/res/values-km/strings.xml b/owncloudApp/src/main/res/values-km/strings.xml index 6533f1b2cc2..ec1a85467d2 100644 --- a/owncloudApp/src/main/res/values-km/strings.xml +++ b/owncloudApp/src/main/res/values-km/strings.xml @@ -12,8 +12,6 @@ ផ្ញើ តម្រៀប តម្រៀបដោយ - - បើក មតិត្រឡប់ ជំនួយ @@ -53,13 +51,13 @@ អំពី ប្តូរ​ពាក្យសម្ងាត់ បង្កើតគណនី - ផ្ទុកឡើងពី... + ផ្ទុកឡើងពី… ឈ្មោះ​ថត - កំពុង​តែផ្ទុកឡើង... + កំពុង​តែផ្ទុកឡើង… ការផ្ទុកឡើងបាន​ជោគជ័យ ការផ្ទុកឡើងបាន​បរាជ័យ មិន​ស្គាល់​កំហុស - កំពុង​ធ្វើការទាញយក... + កំពុង​ធ្វើការទាញយក… ការទាញយក​បានជោគជ័យ ការទាញយក​បានបរាជ័យ ជ្រើស​គណនី @@ -94,5 +92,4 @@ អាច​កែប្រែ បង្កើត លុប - diff --git a/owncloudApp/src/main/res/values-kn/strings.xml b/owncloudApp/src/main/res/values-kn/strings.xml deleted file mode 100644 index 3ab2c6f9384..00000000000 --- a/owncloudApp/src/main/res/values-kn/strings.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - ಪೇರಿಸು - ಕಡತಗಳು - ಹೊಸ ಕಡತಕೋಶ - ಆಯ್ಕೆ - ಕಳುಹಿಸಿ - - - ತೆರೆ - ಸಹಾಯ - ಇನ್ನಷ್ಟು - ಭದ್ರತೆ - ಸಹಾಯ - ಮುದ್ರೆ - ಬಳಕೆಯ ಹೆಸರು - ಗುಪ್ತ ಪದ - ಕಡತಗಳು - ಪೇರಿಸು - ಪ್ರತಿಯನ್ನು ಸ್ಥಳೀಯವಾಗಿ ಉಳಿಸಿಕೊಳ್ಳಿ - ಹಂಚಿಕೊಳ್ಳಿ - ಹೌದು - ಇಲ್ಲ - ತಪ್ಪಾಗಿದೆ - ಗೊತ್ತಿಲ್ಲದ ದೋಷ - ಬಾಕಿ ಇದೆ - ಗುಪ್ತ ಪದವನ್ನು ಬದಲಾಯಿಸಿ - ಗೊತ್ತಿಲ್ಲದ ದೋಷ - ಮರುಹೆಸರಿಸು - ತೆಗೆದುಹಾಕಿ - ಕಳುಹಿಸಿ - ಆಯ್ಕೆ - ಪರಿಚಾರಕ ಗಣಕಯಂತ್ರದ ವಿಳಾಸ - ಹಂಚಿಕೊಳ್ಳಿ - ರದ್ದು - ಉಳಿಸಿ - ಮುಕ್ತಾಯ - ಗುಪ್ತಪದ - ಹುಡುಕು - ಹಂಚಿಕೊಳ್ಳಬಹುದು - ಸಂಪಾದಿಸಬಹುದು - ಸೃಷ್ಟಿಸು - ಬದಲಾವಣೆ - ಅಳಿಸಿ - - diff --git a/owncloudApp/src/main/res/values-ko/strings.xml b/owncloudApp/src/main/res/values-ko/strings.xml index 50028bff5bd..a93957835e8 100644 --- a/owncloudApp/src/main/res/values-ko/strings.xml +++ b/owncloudApp/src/main/res/values-ko/strings.xml @@ -155,7 +155,7 @@ Wi-Fi 연결을 기다리는 중 업로드 대기 중 지원하지 않는 미디어 형식 - 다운로드중... + 다운로드중… %1$d%% %2$s 다운로드 중 다운로드됨 %1$s 다운로드됨 @@ -216,8 +216,8 @@ 되감기 단추 재생 혹은 일시 정지 단추 빨리감기 단추 - 인증 정보 가져오는 중... - 로그인 시도중... + 인증 정보 가져오는 중… + 로그인 시도중… 네트워크에 연결할 수 없음 암호화된 연결을 사용할 수 없습니다. 연결됨 @@ -322,11 +322,8 @@ %1$s을(를) 로컬 폴더 %2$s(으)로 복사할 수 없습니다 사진 업로드 경로 서버에서 공유가 활성화되지 않았습니다. 시스템 관리자에게 연락하십시오. - 공유할 수 없습니다. 파일이 있는지 확인하십시오 이 파일이나 폴더를 공유하는 중 오류 발생 - 공유를 해제할 수 없습니다. 파일이 있는지 확인하십시오 이 파일이나 폴더의 공유를 해제하는 중 오류 발생 - 업데이트할 수 없습니다. 파일이 있는지 확인하십시오. 공유를 업데이트하는 중 오류 발생 암호 입력 암호를 입력해야 합니다 @@ -359,7 +356,7 @@ 기록 보내기 로그를 보내는 데 사용할 수 있는 앱이 없습니다. 이메일 앱을 설치하십시오. %1$s Android 앱 로그 - 데이터 불러오는 중... + 데이터 불러오는 중… 모두 선택 이동 항목이 없습니다. 폴더를 추가할 수 있습니다! diff --git a/owncloudApp/src/main/res/values-ku-rIQ/strings.xml b/owncloudApp/src/main/res/values-ku-rIQ/strings.xml index 0ea8c63e2e9..ea613b54642 100644 --- a/owncloudApp/src/main/res/values-ku-rIQ/strings.xml +++ b/owncloudApp/src/main/res/values-ku-rIQ/strings.xml @@ -3,8 +3,6 @@ بارکردن په‌ڕگەکان ده‌ستكاری - - بیکەوە یارمەتی گشتی @@ -35,5 +33,4 @@ پاشکه‌وتکردن وشەی تێپەربو بگەڕێ - diff --git a/owncloudApp/src/main/res/values-la/strings.xml b/owncloudApp/src/main/res/values-la/strings.xml deleted file mode 100644 index 169dfefffda..00000000000 --- a/owncloudApp/src/main/res/values-la/strings.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/owncloudApp/src/main/res/values-lb/strings.xml b/owncloudApp/src/main/res/values-lb/strings.xml index 8ba659273fb..8359b3e5738 100644 --- a/owncloudApp/src/main/res/values-lb/strings.xml +++ b/owncloudApp/src/main/res/values-lb/strings.xml @@ -13,8 +13,6 @@ Schécken Zortéieren Zortéieren no - - All d\'Fichieren Astellungen Uploads @@ -86,16 +84,16 @@ Synchronisatioun ofbriechen Zeréck Feeler - Et gëtt gelueden ... + Et gëtt gelueden … Onbekannt Onbekannte Feeler Iwwer Passwuert änneren De Kont läschen Kont uleeën - Eropluede vun ... + Eropluede vun … Dossiersnumm: - Lueden erop ... + Lueden erop … %1$d%% eroplueden %2$s Eroplueden ofgeschloss %1$s eropgelueden @@ -170,8 +168,8 @@ Zréckspull-Knäppchen Ofspill- oder Paus-Knäppchen Virspull-Knäppche - Authoriséierung kréien ... - Versuch fir sech anzeloggen ... + Authoriséierung kréien … + Versuch fir sech anzeloggen … Keng Netzwierkconnectioun Keng geséchert Connectioun disponibel. Connectioun hiergestallt @@ -265,11 +263,8 @@ Dëst Bild kann net ugewise ginn %1$s konnt net an de lokalen Dossier %2$s kopéiert ginn Pardon, Deelen ass net erlaabt op ärem Server. W.e.g. kontaktéier däin Administrateur. - Konnt net gedeelt ginn. Kontrolléier w.e.g. ob de Fichier existéiert Beim Deele vun dësem Fichier oder Dossier ass e Feeler opgetrueden - Konnt net ongedeelt ginn. Kontrolléier w.e.g. ob de Fichier existéiert Beim Zesummeleeë vun dësem Fichier oder Dossier ass e Feeler opgetrueden - Konnt net aktualiséiert ginn. Kontrolléier w.e.g. ob de Fichier existéiert Beim Deele vun dësem Fichier oder Dossier ass e Feeler opgetrueden E Passwuert aginn Du muss e Passwuert aginn @@ -297,7 +292,7 @@ Protokoller Historique schécken Protokoller vun der %1$s-Android-App - Donnée gi gelueden ... + Donnée gi gelueden … Réckelen Hei ass näischt. Setz en Dossier dobäi! Auswielen @@ -328,8 +323,8 @@ %1$d Fichieren 1 Fichier, %1$d Dossieren %1$d Fichieren, %2$d Dossieren - Den original Fichier gëtt ... - Den original Fichier gëtt ... + Den original Fichier gëtt … + Den original Fichier gëtt … Fichier kopéieren Fichier réckelen Am original Dossier gehalen @@ -359,5 +354,4 @@ Donnéeë läschen Verschidde Fichiere konnten net geläscht ginn. De Fichier konnt net am lokale Fichier System fonnt ginn - diff --git a/owncloudApp/src/main/res/values-lo/strings.xml b/owncloudApp/src/main/res/values-lo/strings.xml index 9a7cd6687a4..e485e1680be 100644 --- a/owncloudApp/src/main/res/values-lo/strings.xml +++ b/owncloudApp/src/main/res/values-lo/strings.xml @@ -1,8 +1,5 @@ - - ຂໍ້ຜິດພາດທີ່ບໍ່ຮູ້ສາເຫດ ຂໍ້ຜິດພາດທີ່ບໍ່ຮູ້ສາເຫດ - diff --git a/owncloudApp/src/main/res/values-lt-rLT/strings.xml b/owncloudApp/src/main/res/values-lt-rLT/strings.xml index f301c7c5568..a3dcdf5574f 100644 --- a/owncloudApp/src/main/res/values-lt-rLT/strings.xml +++ b/owncloudApp/src/main/res/values-lt-rLT/strings.xml @@ -93,7 +93,7 @@ Įvyko klaida kopijuojant failą į laikinąjį katalogą. Pabandykite siųsti iš naujo. prieš sekundę Čia tuščia. Įkelkite ką nors! - Įkeliama... + Įkeliama… Nerasta programėlė šiam failo tipui Šiame aplanke nėra failų. Šiame aplanke nėra aplankų. @@ -123,7 +123,7 @@ Atgal Išsaugoti & išeiti Klaida - Įkeliama... + Įkeliama… nežinomas Neatpažinta klaida Laukiantis @@ -229,7 +229,7 @@ Grojimo arba pauzės mygtukas Prasukimo mygtukas Nuotrauka iš kameros - Gaunama autorizaciją... + Gaunama autorizaciją… Nėra tinklo ryšio Saugus prisijungimas negalimas. Ryšys užmegztas @@ -250,7 +250,7 @@ Netikėta problema: įveskite serverio adresą dar kartą Autorizacijos laikas baigėsi. Prašome autorizuotis iš naujo Įveskite dabartinį slaptažodį - Jungiasi į authorizacijos serverį ... + Jungiasi į authorizacijos serverį … Serveris nepalaiko šio autentikacijos metodo %1$s nepalaiko kelių paskyrų iš karto Serveris negražina tinkamo vartotojo ID, susisiekite su administratoriumi @@ -284,7 +284,7 @@ Joks failas nebuvo pasirinktas Kopijuoti failą iš privačios talpyklos Prisijungti naudojant oAuth2 - Jungiamasi prie OAuth2 serverio ... + Jungiamasi prie OAuth2 serverio … Nepavyko atpažinti serverio - Nepatikimas serverio sertifikatas - Serverio sertifikatas galiojimo laikas pasibaigęs @@ -333,11 +333,8 @@ %1$s negali būti nukopijuota į %2$s vietinį katalogą Nuotraukų įkėlimo kelias Atsiprašome, bet serveris nepalaiko dalijimosi. Susisiekite su administratoriumi. - Nepavyko pasidalinti. Patikrinkite ar failas egzistuoja Įvyko klaida bandant dalinti šį failą ar aplanką - Nepavyksta nebedalinti. Patikrinkite ar failas egzistuoja Įvyko klaida bandant nebedalinti šio failu ar aplanku - Nepavyko atnaujinti. Prašau patikrinti ar failas egzistuoja Įvyko klaida atnaujinant dalinimosi nuorodą Įveskite slaptažodį Slaptažodis privalomas @@ -370,7 +367,7 @@ Išsiųsti istorija Nėra programos siųsti laiškam. Įdiekite pašto programa. %1$s Android žurnalai - Įkeliama... + Įkeliama… Pažymėti viską Pasirinkite atvirkštinį perkelti diff --git a/owncloudApp/src/main/res/values-lv/strings.xml b/owncloudApp/src/main/res/values-lv/strings.xml index 20c61deec8c..e243ec4d5ed 100644 --- a/owncloudApp/src/main/res/values-lv/strings.xml +++ b/owncloudApp/src/main/res/values-lv/strings.xml @@ -12,8 +12,6 @@ Sūtīt Kārtot Kārtot pēc - - Visas datnes Iestatījumi Aizvērt @@ -63,9 +61,9 @@ Par Mainīt paroli Izveidot kontu - Augšupielādēt no... + Augšupielādēt no… Mapes nosaukums - Augšupielādē ... + Augšupielādē … %1$d%% augšupielādē %2$s Augšupielāde ir veiksmīga Neizdevās augšupielādēt @@ -75,7 +73,7 @@ Pabeigts Atcelts Nezināma kļūda - Lejupielādē ... + Lejupielādē … %1$d%% lejupielādē %2$s Lejupielāde beidzās veiksmīgi Neizdevās lejupielādēt @@ -169,5 +167,4 @@ veikt izmaiņas dzēst Katram, kuram ir saite, ir pieeja datnei/mapei - diff --git a/owncloudApp/src/main/res/values-mg/strings.xml b/owncloudApp/src/main/res/values-mg/strings.xml deleted file mode 100644 index 1647fff6c53..00000000000 --- a/owncloudApp/src/main/res/values-mg/strings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/owncloudApp/src/main/res/values-mk/strings.xml b/owncloudApp/src/main/res/values-mk/strings.xml index 8e908a0fba4..7757bbf7976 100644 --- a/owncloudApp/src/main/res/values-mk/strings.xml +++ b/owncloudApp/src/main/res/values-mk/strings.xml @@ -17,8 +17,6 @@ A-Z Постари - Најнови Помали - Поголеми - - Сите датотеки Подесувања Прикачувања @@ -80,15 +78,15 @@ Не Назад Грешка - Вчитувам ... + Вчитувам … Непозната грешка Чека За Смени лозинка Креирај сметка - подигни од ... + подигни од … Име на папка - Подигнувам... + Подигнувам… %1$d%% Прикачување %2$s Прикачувањето беше успешно Прикачувањето не успеа @@ -98,7 +96,7 @@ Завршено Откажано Непозната грешка - Преземање... + Преземање… %1$d%% Превземање %2$s Преземањето е успешно Преземањето не беше успешно @@ -187,7 +185,7 @@ Почекајте малку Неочекуван проблем ; ве молам одберете датотека од друга апликација Нема избрано датотека - Пратете линк на ... + Пратете линк на … Копирам датотека од приватното складиште Најави се со oAuth2 - Сертификатот на серверот не е доверлив @@ -225,9 +223,7 @@ %1$s не може да се копира во локалната папка %2$s Жалиме, споделувањето не е овозможено на вашиот сервер. Ве молам контактирајте го вашиот администратор. - Не можам да споделам. Ве молам проверете дали постои датотеката Се случи грешка кога пробав да ја споделам оваа папка - Не можам да го тргнам споделувањето. Ве молам проверете дали постои датотеката Се случи грешка кога пробав да го тргнам споделувањето на оваа датотека или папка Внесете лозинка Морате да внесете лозинка @@ -278,5 +274,4 @@ избриши Било кој што го знае овој линк ќе има пристап до датотеката/директориумот Прикачувања - diff --git a/owncloudApp/src/main/res/values-ml-rIN/strings.xml b/owncloudApp/src/main/res/values-ml-rIN/strings.xml index 833a669edaa..9bb8089acca 100644 --- a/owncloudApp/src/main/res/values-ml-rIN/strings.xml +++ b/owncloudApp/src/main/res/values-ml-rIN/strings.xml @@ -1,8 +1,5 @@ ഫയലുകൾ - - ഫയലുകൾ - diff --git a/owncloudApp/src/main/res/values-ml/strings.xml b/owncloudApp/src/main/res/values-ml/strings.xml deleted file mode 100644 index 1647fff6c53..00000000000 --- a/owncloudApp/src/main/res/values-ml/strings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/owncloudApp/src/main/res/values-mn/strings.xml b/owncloudApp/src/main/res/values-mn/strings.xml index 17bad833e0e..6e40fc5d8c8 100644 --- a/owncloudApp/src/main/res/values-mn/strings.xml +++ b/owncloudApp/src/main/res/values-mn/strings.xml @@ -3,8 +3,6 @@ Байршуулах Файлууд Тохиргоо - - Ерөнхий Аюулгүй байдал Хэрэглэгчийн нэр @@ -21,5 +19,4 @@ Цуцлах Хадгалах Нууц үг - diff --git a/owncloudApp/src/main/res/values-mr/strings.xml b/owncloudApp/src/main/res/values-mr/strings.xml deleted file mode 100644 index 1647fff6c53..00000000000 --- a/owncloudApp/src/main/res/values-mr/strings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/owncloudApp/src/main/res/values-ms-rMY/strings.xml b/owncloudApp/src/main/res/values-ms-rMY/strings.xml index b6033c2163d..a6357f9fe4d 100644 --- a/owncloudApp/src/main/res/values-ms-rMY/strings.xml +++ b/owncloudApp/src/main/res/values-ms-rMY/strings.xml @@ -9,8 +9,6 @@ Susun Menurun Susun mengikut - - Buka Bantuan Umum @@ -60,5 +58,4 @@ Cari boleh berkongsi boleh mengubah - diff --git a/owncloudApp/src/main/res/values-mt-rMT/strings.xml b/owncloudApp/src/main/res/values-mt-rMT/strings.xml index 1647fff6c53..8850a563a5a 100644 --- a/owncloudApp/src/main/res/values-mt-rMT/strings.xml +++ b/owncloudApp/src/main/res/values-mt-rMT/strings.xml @@ -1,6 +1,3 @@ - - - diff --git a/owncloudApp/src/main/res/values-my/strings.xml b/owncloudApp/src/main/res/values-my/strings.xml index 3d59c59e769..e8e8ce133a1 100644 --- a/owncloudApp/src/main/res/values-my/strings.xml +++ b/owncloudApp/src/main/res/values-my/strings.xml @@ -1,8 +1,6 @@ ဖိုင်များ - - အကူအညီ အကူအညီ သုံးစွဲသူအမည် @@ -18,5 +16,4 @@ ပြင်ဆင်နိုင် ဖန်တီးမည် ဖျက်မည် - diff --git a/owncloudApp/src/main/res/values-nb-rNO/strings.xml b/owncloudApp/src/main/res/values-nb-rNO/strings.xml index 4646b740cab..7a3d6dddbc0 100644 --- a/owncloudApp/src/main/res/values-nb-rNO/strings.xml +++ b/owncloudApp/src/main/res/values-nb-rNO/strings.xml @@ -63,7 +63,7 @@ Jeg ønsker å invitere deg til å bruke %1$s på smarttelefonen din!\nLast ned her: %2$s Logg inn Sjekk server - Serveradresse https://... + Serveradresse https://… Brukernavn Passord Ny med %1$s? @@ -84,7 +84,7 @@ Det skjedde en feil under kopiering av filen til en foreløpig mappe. Prøv å sende igjen. for få sekunder siden Ingenting her. Last opp noe! - Laster... + Laster… Ingen apper funnet for filtypen Det er ingen filer i denne mappen. Det er ingen mapper i denne mappen. @@ -113,7 +113,7 @@ Tilbake Lagre & avslutt Feil - Laster... + Laster… ukjent Ukjent feil Venter @@ -219,7 +219,7 @@ Spill eller pause Spol fremover Bilde fra kamera - Henter godkjenning... + Henter godkjenning… Ingen nettverkstilkobling Sikker tilkobling ikke tilgjengelig. Tilkobling opprettet @@ -275,7 +275,7 @@ Ingen fil ble valgt Kopierer fil fra privat lager Logg inn med oAuth2 - Kobler til OAuth2-server... + Kobler til OAuth2-server… Kunne ikke verifisere dentiteten til serveren - Serverens sertifikat er ikke til å stole på - Serverens sertifikat er utløpt @@ -325,11 +325,8 @@ Bilde opplastings-sti Beklager, deling er ikke skrudd på for din tjener. Ta kontakt med administratoren. - Kan ikke dele. Sjekk om filen eksisterer. Det skjedde en feil under deling av denne filen eller mappen - Kan ikke fjerne deling. Sjekk om filen eksisterer. En feil oppstod ved avslutting av delingen av denne filen eller mappen - Kan ikke oppdatere. Sjekk om filen eksisterer Det oppstod en feil ved oppdatering av delingen Skriv inn ett passord Du må skrive inn ett passord @@ -362,7 +359,7 @@ Send historik Ingen app for sending av logger funnet. Installer epost-app. %1$s Android app logger - Laster data... + Laster data… Velg alle Flytt Ingenting her. Du kan legge til en mappe! diff --git a/owncloudApp/src/main/res/values-ne/strings.xml b/owncloudApp/src/main/res/values-ne/strings.xml index 169dfefffda..8850a563a5a 100644 --- a/owncloudApp/src/main/res/values-ne/strings.xml +++ b/owncloudApp/src/main/res/values-ne/strings.xml @@ -1,8 +1,3 @@ - - - - diff --git a/owncloudApp/src/main/res/values-nl/strings.xml b/owncloudApp/src/main/res/values-nl/strings.xml index a8acb6cf82a..8c2b965f7c4 100644 --- a/owncloudApp/src/main/res/values-nl/strings.xml +++ b/owncloudApp/src/main/res/values-nl/strings.xml @@ -102,7 +102,7 @@ Download hier: %2$s seconden geleden Er bevindt zich hier niets. Upload een bestand! Er zijn geen offline bestanden beschikbaar - Laden... + Laden… Geen app gevonden voor het bestandsformaat Er staan geen bestanden in deze map. Er zitten geen mappen in deze map. @@ -132,7 +132,7 @@ Download hier: %2$s Terug Opslaan & einde Fout - Laden... + Laden… onbekend Onbekende fout In behandeling @@ -143,7 +143,7 @@ Download hier: %2$s Maak account aan Upload vanaf Mapnaam - uploaden... + uploaden… %1$d%% Uploaden %2$s Upload succesvol %1$s geüpload @@ -248,8 +248,8 @@ Hieronder staan de lokale bestanden en de externe bestanden in %5$s waar ze naar Speel of pauze knop Doorspoel knop Afbeelding vanaf de camera - Ophalen autorisaties... - Proberen in te loggen... + Ophalen autorisaties… + Proberen in te loggen… Geen netwerkverbinding Veilige verbinding niet beschikbaar. Verbinding tot stand gebracht @@ -270,7 +270,7 @@ Hieronder staan de lokale bestanden en de externe bestanden in %5$s waar ze naar Onverwachte toestand; voer a.u.b. nogmaals de server-URL in Uw autorisatie is verstreken. Autoriseer opnieuw. Voer uw huidige wachtwoord in - Verbinden met authenticatieserver... + Verbinden met authenticatieserver… De server ondersteunt deze authenticatiemethode niet %1$s ondersteunt het gebruik van meerdere accounts niet Uw server geeft geen goede userid terug, neem contact op met uw beheerder @@ -361,11 +361,8 @@ Hieronder staan de lokale bestanden en de externe bestanden in %5$s waar ze naar Een probleem is ontstaan tijdens het ophalen van gebruikers en groepen Sorry, delen is niet mogelijk op uw server. Neem contact op met uw beheerder. - Kan dit niet delen. Controleer of dit bestand wel bestaat. Er trad een fout op bij uw poging dit bestand of deze map te delen - Kan delen niet beëindigen. Ga na of het bestand bestaat Er trad een fout op bij uw poging het delen van dit bestand of deze map te beëindigen - Kan niet bijwerken. Ga na of het bestand bestaat Er trad een fout op bij uw poging de share bij te werken Vul het wachtwoord in U moet een wachtwoord opgeven @@ -398,7 +395,7 @@ Hieronder staan de lokale bestanden en de externe bestanden in %5$s waar ze naar Verstuur geschiedenis Geen applicatie gevonden voor het versturen van de logs. Installeer een mail applicatie. %1$s Android app logs - Laden data... + Laden data… Alles selecteren Selecteer omgekeerd Verplaatsen diff --git a/owncloudApp/src/main/res/values-nn-rNO/strings.xml b/owncloudApp/src/main/res/values-nn-rNO/strings.xml index d6ed3806103..def98403afb 100644 --- a/owncloudApp/src/main/res/values-nn-rNO/strings.xml +++ b/owncloudApp/src/main/res/values-nn-rNO/strings.xml @@ -14,8 +14,6 @@ Sorter Sorter etter A-Å - - Alle filer Innstillingar Opplastingar @@ -64,7 +62,7 @@ Feil ved kopi av fil til mellombels katalog, prøv å sende fil på ny. sekund sidan Ingenting her. Last noko opp! - Lastar... + Lastar… Ingen program funnen for denne fil type Ingen filer i denne mappa Ingen mappe i denne mappa. @@ -91,7 +89,7 @@ Tilbake Lagre & avslutt Feil - Lastar... + Lastar… ukjend Ukjend feil Under vegs @@ -191,8 +189,8 @@ Tilbake knapp Avspeling eller pause knapp Raskt framover knapp - Blir autorisert... - Førsøker å logge inn... + Blir autorisert… + Førsøker å logge inn… Inga nettilkopling Trygg tilkopling ikkje tilgjengeleg. Tilkopling oppretta @@ -263,5 +261,4 @@ Prøv feila på nytt Fjern feila Alle med lenke har tilgang til fil eller mappe - diff --git a/owncloudApp/src/main/res/values-oc/strings.xml b/owncloudApp/src/main/res/values-oc/strings.xml index ead8c599128..2d584681177 100644 --- a/owncloudApp/src/main/res/values-oc/strings.xml +++ b/owncloudApp/src/main/res/values-oc/strings.xml @@ -14,8 +14,6 @@ Triar Triar A-Z - - Totes los fichièrs Paramètres Cargaments @@ -69,7 +67,7 @@ Telecargatz-lo aicí : %2$s Una error s\'es produita al moment de la còpia d\'aqueste fichièr dens un dorsièr temporari. Perfavor assajatz un aut cop. i a qualques segondas I a pas res aicí ! Mandatz doncas quicòm :) - Cargament... + Cargament… Cap de fichièr es pas present dins aqueste dorsièr. I a pas de dorsièrs dins aqueste dorsièr. Cap de mandadís pas disponible. @@ -184,8 +182,8 @@ En rason d\'aquesta modificacion, totes los fichièrs mandats amb de versions an Boton de rembobinatge Boton de lectura o de pausa Boton d\'avança rapida - Contraròtle d\'autorizacion... - Temptativa de connexion... + Contraròtle d\'autorizacion… + Temptativa de connexion… Pas de connexion ret Connexion securizada pas disponibla Connexion establida @@ -270,9 +268,7 @@ En rason d\'aquesta modificacion, totes los fichièrs mandats amb de versions an Aqueste imatge pòt pas èsser afichada %1$s a pas pogut èsser copiat dins lo dorsièr local %2$s O planhèm, lo partiment es pas disponible sus vòstre servidor. Contactatz vòstre administrator. - Impossible de partejar. Verificatz que lo fichièr es plan present Una error s\'es produita al moment de la temptativa de partiment d\'aqueste fichièr o repertòri - Impossible de suprimir lo partiment. Verificatz que lo fichièr es ben present Una error s\'es produita al moment de la temptativa d’anullacion del partiment d\'aqueste fichièr o repertòri Sasissètz un senhal Vos cal sasir un senhal @@ -298,7 +294,7 @@ En rason d\'aquesta modificacion, totes los fichièrs mandats amb de versions an Jornals Mandar l\'istoric Jornals de l\'aplicacion Android %1$s - Cargament de las donadas... + Cargament de las donadas… Desplaçar I a pas res aicí. Podètz apondre un dorsièr ! Causir @@ -332,8 +328,8 @@ En rason d\'aquesta modificacion, totes los fichièrs mandats amb de versions an Dorsièr de l\'aparelh fòto (%1$s) Requesit Opcional - Lo fichièr original serà... - Lo fichièr original serà... + Lo fichièr original serà… + Lo fichièr original serà… Copiar lo fichièr Desplaçar lo fichièr gardat dins lo dorsièr original @@ -348,7 +344,7 @@ En rason d\'aquesta modificacion, totes los fichièrs mandats amb de versions an Senhal Securizat Obténer lo ligam - Partejar amb... + Partejar amb… Partejar amb %1$s Recercar Recercar d\'utilizaires e de gropes @@ -374,5 +370,4 @@ En rason d\'aquesta modificacion, totes los fichièrs mandats amb de versions an %d seleccionat %d seleccionats - diff --git a/owncloudApp/src/main/res/values-or-rIN/strings.xml b/owncloudApp/src/main/res/values-or-rIN/strings.xml deleted file mode 100644 index 169dfefffda..00000000000 --- a/owncloudApp/src/main/res/values-or-rIN/strings.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/owncloudApp/src/main/res/values-pa/strings.xml b/owncloudApp/src/main/res/values-pa/strings.xml index bd556cf538e..4379f9ec317 100644 --- a/owncloudApp/src/main/res/values-pa/strings.xml +++ b/owncloudApp/src/main/res/values-pa/strings.xml @@ -13,8 +13,6 @@ ਭੇਜੋ ਛਾਂਟੋ ਦੁਆਰਾ ਕ੍ਰਮਬੱਧ - - ਸਾਰੀਆਂ ਫਾਈਲਾਂ ਸੈਟਿੰਗ ਅੱਪਲੋਡਜ਼ @@ -72,16 +70,16 @@ ਪਿੱਛੇ ਸੰਭਾਲੋ ਅਤੇ ਬੰਦ ਕਰੋ ਗਲਤੀ - ...ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ + …ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ ਅਣਜਾਣ ਅਣਜਾਣ ਗਲਤੀ ਇਸ ਬਾਰੇ ਪਾਸਵਰਡ ਬਦਲੋ ਅਕਾਊਂਟ ਹਟਾਓ ਅਕਾਊਂਟ ਬਣਾਓ - ... ਤੋਂ ਅੱਪਲੋਡ + … ਤੋਂ ਅੱਪਲੋਡ ਫੋਲਡਰ ਨਾਂ - ... ਅੱਪਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ + … ਅੱਪਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ %1$d%% ਅੱਪਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ %2$s ਅੱਪਲੋਡ ਸਫ਼ਲ ਹੈ %1$s ਅੱਪਲੋਡਿਡ @@ -102,7 +100,7 @@ ਅਪਵਾਦ ਐਪ ਬੰਦ ਕੀਤੀ ਗਈ ਸੀ ਅਣਜਾਣ ਗਲਤੀ - ... ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ + … ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ ਹਾਲੇ ਡਾਊਨਲੋਡ ਨਹੀਂ ਅਕਾਊਂਟ ਚੁਣੋ %1$s ਲਈ ਗਲਤ ਪਾਸਵਰਡ @@ -180,5 +178,4 @@ ਸਾਂਝਾ ਕਰਨਾ ਬੰਦ ਕਰੋ ਜਗ੍ਹਾਂ ਪ੍ਰਬੰਧਨ ਡਾਟਾ ਸਾਫ਼ ਕਰੋ - diff --git a/owncloudApp/src/main/res/values-pl/strings.xml b/owncloudApp/src/main/res/values-pl/strings.xml index d90afa9abfb..706f19e970f 100644 --- a/owncloudApp/src/main/res/values-pl/strings.xml +++ b/owncloudApp/src/main/res/values-pl/strings.xml @@ -75,7 +75,7 @@ Zmień konto Zaloguj Sprawdź serwer - Adres serwera https://... + Adres serwera https://… Nazwa użytkownika Hasło Nowe %1$s? @@ -97,7 +97,7 @@ sekund temu Pusto. Wyślij coś! Nie ma plików dostępnych offline. - Wczytywanie... + Wczytywanie… Nie znaleziono aplikacji dla tego rodzaju pliku Nie ma plików w tym folderze. W tym folderze nie ma żadnych folderów. @@ -127,7 +127,7 @@ Wróć Zapisz i wyjdź Błąd - Wczytywanie... + Wczytywanie… nieznane Nieznany błąd Oczekujące @@ -238,7 +238,7 @@ Przycisk odtwarzania / pauzowania Przycisk przewijania do przodu Obraz z kamery - Pobieram autoryzację... + Pobieram autoryzację… Brak połączenia sieciowego Nie można nawiązać bezpiecznego połączenia. Połączenie nawiązane @@ -259,7 +259,7 @@ Nieoczekiwany stan. Podaj ponownie adres serwera Twoja sesja wygasła. Proszę zaloguj się ponownie Podaj aktualne hasło - Łączenie z serwerem poświadczeń... + Łączenie z serwerem poświadczeń… Serwer nie obsługuje tej metody autoryzacji %1$s nie wspiera wielu kont Twój serwer nie zwraca prawidłowego id użytkownika, proszę skontaktuj się z administratorem @@ -295,7 +295,7 @@ Wyślij link do Kopiowanie pliku z prywatnego zasobu Loguj przez oAuth2 - Łącze do serwera OAuth2... + Łącze do serwera OAuth2… Nie można zweryfikować serwera - Certyfikat serwera jest niezaufany - Certyfikat serwera wygasł @@ -346,11 +346,8 @@ Ścieżka wrzucania obrazu Przepraszamy, ale współdzielenie nie jest włączone na Twoim serwerze. Proszę skontaktuj się z administratorem. - Nie można udostępnić. Proszę sprawdzić, czy plik istnieje Wystąpił błąd podczas udostępniania tego pliku lub folderu. - Nie można wyłączyć udostępniania. Proszę sprawdzić, czy plik istnieje Wystąpił błąd podczas anulowania udostępniania tego pliku lub folderu. - Błąd aktualizacji. Upewnij się, że plik istnieje. Wystąpił błąd podczas aktualizacji udziału Wprowadź hasło Musisz wprowadzić hasło @@ -383,7 +380,7 @@ Wyślij historię Brak aplikacji do wysyłania logów. Zainstaluj klienta poczty. %1$s Logi aplikacji Android - Ładuję dane... + Ładuję dane… Wybierz wszystko Zaznacz odwrotnie Przenieś diff --git a/owncloudApp/src/main/res/values-pt-rBR/strings.xml b/owncloudApp/src/main/res/values-pt-rBR/strings.xml index e8740d5bb12..e3fc71a04c4 100644 --- a/owncloudApp/src/main/res/values-pt-rBR/strings.xml +++ b/owncloudApp/src/main/res/values-pt-rBR/strings.xml @@ -82,7 +82,7 @@ O token de acesso expirou ou se tornou inválido. Faça login novamente para recuperar o acesso Entrar Verificar servidor - Endereço do servidor https://... + Endereço do servidor https://… Nome de usuário Senha Novo para %1$s? @@ -105,7 +105,7 @@ Nada aqui. Envie alguma coisa! Não há arquivos externos disponíveis. Nenhum arquivo foi compartilhado por linque. - Carregando... + Carregando… Nenhum aplicativo encontrado para esse tipo de arquivo Não existe nenhum arquivo nesta pasta. Não existem pastas nessa pasta. @@ -135,7 +135,7 @@ Voltar Salvar & e sair Erro - Carregando... + Carregando… desconhecido Erro desconhecido Pendente @@ -146,7 +146,7 @@ Criar conta Enviando de Nome da pasta - Enviando... + Enviando… %1$d%% Enviando %2$s Envio bem sucedido %1$s enviado @@ -185,7 +185,7 @@ Aguardando conexão wi-fi Aguardando para enviar Tipo de mídia não suportada - Baixando... + Baixando… %1$d%% Baixando %2$s Download bem sucedido %1$s baixado @@ -250,12 +250,12 @@ Botão reproduzir parar Botão de adiantamento rápido Imagem da câmera - Obtendo autorização... + Obtendo autorização… Tentando fazer o login… Sem conexão de rede Conexão segura indisponível. Conexão estabelecida - Testando conexão... + Testando conexão… Configuração do servidor mal formada Uma conta para o mesmo usuário e servidor já existe no dispositivo As informações que o usuário digitou não correspondem ao usuário da conta @@ -272,7 +272,7 @@ Estado inesperado; por favor insira o endereço do servidor novamente Sua autorização expirou. Por favor, solicite autorizar novamente Por favor, digite a senha atual - Conectando ao servidor de autenticação ... + Conectando ao servidor de autenticação … O servidor não suporta este método de autenticação %1$s não suporta múltiplas contas Seu servidor não está retornando um ID de usuário correto, por favor, entre em contato com um administrador @@ -364,11 +364,8 @@ Ocorreu um erro enquanto tentava recuperar potencialidades Desculpe, o compartilhamento não está habilitado em seu servidor. Entre em contato com seu ⇥⇥ administrador. - Não é possível compartilhar. Por favor verifique se o arquivo existe Ocorreu um erro durante a tentativa de compartilhar esse arquivo ou pasta - Não é possível cancelar o compartilhamento. Por favor verifique se o arquivo existe Ocorreu um erro ao tentar descompartilhar este arquivo ou pasta - Não é possível atualizar. Por favor verifique se o arquivo existe Ocorreu um erro enquanto tentava atualizar o compartilhamento Digite uma senha Você deve digitar uma senha @@ -401,7 +398,7 @@ Enviar histórico Nenhum aplicativo para envio de logs foi encontrado. Por favor instale um aplicativo de e-mail %1$s logs do Android app - Carregando dados... + Carregando dados… Selecionar tudo Selecione inverso Mover diff --git a/owncloudApp/src/main/res/values-pt-rPT/strings.xml b/owncloudApp/src/main/res/values-pt-rPT/strings.xml index ec0dada071a..8d670dc988b 100644 --- a/owncloudApp/src/main/res/values-pt-rPT/strings.xml +++ b/owncloudApp/src/main/res/values-pt-rPT/strings.xml @@ -71,7 +71,7 @@ Ocorreu um erro durante a cópia do ficheiro para uma pasta temporária. Por favor, tente submeter novamente. segundos atrás Aqui não existe nada. Envie qualquer coisa! - A carregar... + A carregar… Nenhuma aplicação encontrada para o tipo de ficheiro Não existem ficheiros nesta pasta. Não existem pastas dentro desta pasta @@ -100,7 +100,7 @@ Voltar Guardar e sair Erro - A carregar... + A carregar… desconhecido Erro desconhecido Pendente @@ -201,7 +201,7 @@ Botão de Reproduzir/Pausar Botão de avanço rápido Fotografia da camera - A obter autorização... + A obter autorização… Nenhuma ligação de rede Ligação segura indisponível. Ligação estabelecida @@ -222,7 +222,7 @@ Estado inesperado; por favor, introduza novamente o endereço do servidor A sua autenticação expirou. Por favor, autentique novamente Por favor, introduza a sua passe actual - A ligar ao servidor de autenticação... + A ligar ao servidor de autenticação… O servidor não suporta este método de autenticação %1$s não suporta contas múltiplas O seu servidor não está a devolver a id. correcta, por favor, contacte um administrador. @@ -256,7 +256,7 @@ Nenhum ficheiro foi seleccionado A copiar o ficheiro do armazenamento privado Iniciar sessão com oAuth2 - A ligar ao servidor OAuth2... + A ligar ao servidor OAuth2… Não foi possivel verificar a identidade do servidor - O certificado do servidor não é de confiança - O certificado do servidor expirou @@ -303,11 +303,8 @@ Não foi possível copiar %1$s para a pasta local %2$s Desculpe, a partilha não está activada no seu servidor. Por favor entre em contacto com o seu administrador. - Não é possível partilhar. Por favor verifique se o ficheiro existe Ocorreu um erro enquanto tentava partilhar este ficheiro ou pasta - Não é possível retirar a partilha. Verifique se o ficheiro existe Ocorreu um erro enquanto retirava a partilha deste ficheiro ou pasta - Não é possível atualizar. Por favor, verifique se o ficheiro existe. Ocorreu um erro ao tentar atualizar a partilha Introduza uma palavra-passe Você deve introduzir uma palavra-passe @@ -340,7 +337,7 @@ Histórico de envio Não foi encontrada nenhuma app para enviar logs. Por favor, instale uma aplicação de envio. %1$s registos de aplicação Android - A carregar os dados... + A carregar os dados… Selecionar todos Mover Não está aqui nada. Pode adicionar uma pasta! diff --git a/owncloudApp/src/main/res/values-rm/strings.xml b/owncloudApp/src/main/res/values-rm/strings.xml deleted file mode 100644 index 169dfefffda..00000000000 --- a/owncloudApp/src/main/res/values-rm/strings.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/owncloudApp/src/main/res/values-ro/strings.xml b/owncloudApp/src/main/res/values-ro/strings.xml index 176bcfc0678..b69f955f171 100644 --- a/owncloudApp/src/main/res/values-ro/strings.xml +++ b/owncloudApp/src/main/res/values-ro/strings.xml @@ -59,7 +59,7 @@ Modifică contul Înregistraţi-vă Verifică serverul - Adresa serverului https://... + Adresa serverului https://… Nume utilizator Parolă Nou la %1$s? @@ -80,7 +80,7 @@ A apărut o eroare în timpul copierii fișierului in dosarul temporar. Te rog încearcă să îl retrimiți. secunde în urmă Nimic aici. Încarcă ceva! - Se încarcă... + Se încarcă… Nu s-a găsit nici o aplicație pentru acest tip de fișier/ În acest folder nu sunt fișiere. Nu există dosare în acest dosar. @@ -109,7 +109,7 @@ Înapoi Salvează &amps ieși. Eroare - Se încarcă... + Se încarcă… necunoscut Eroare necunoscută În așteptare @@ -120,7 +120,7 @@ Crează cont Încarcă din Nume director - Încărcare în curs... + Încărcare în curs… %1$d%% Se încarcă %2$s Încărcat cu succes %1$s incarcat @@ -156,7 +156,7 @@ Se asteapta conexiune WiFi Se așteaptă încărcarea Tip media nesuportat - Descărcare în curs... + Descărcare în curs… %1$d%% Se descarcă %2$s Descărcarea a reușit %1$s descarcat @@ -219,8 +219,8 @@ Buton de play sau pauză Butonul pentru repede înainte Fotografii din cameră - Obținerea autorizației... - Încercare de autentificare... + Obținerea autorizației… + Încercare de autentificare… Nu exista conexiune Conexiune securizată indisponibilă Conexiune stabilită @@ -241,7 +241,7 @@ Stare neașteptată; te rog introdu adresa serverului din nou Autorizarea dvs. a expirat. Vă rugăm să autorizați din nou. Introdu te rog parola curenta - Conectare la serverul de autentificare... + Conectare la serverul de autentificare… Serverul nu soporta aceasta metoda de autentificare %1$s nu suporta conturi multiple Server-ul dvs. nu întoarce un ID de utilizator corect, vă rugăm să contactați un administrator @@ -276,7 +276,7 @@ Trimite legătura la Copiere fișier din stocare privată Întră în cont cu oAuth2 - Conectare la serverul OAuth2... + Conectare la serverul OAuth2… Identitatea serverului nu a putut fi veriificată Certificatul serverului nu este de incredere Certificatul serverului a expirat @@ -322,11 +322,8 @@ Aceasta imagine nu poate fi arătată %1$s nu a putut fi copiat in dosarul local %2$s Ne pare rău, partajarea nu este activată pe server. Vă rugăm să contactați administratorul dvs. - Imposibil de partajat. Te rugăm să verifici dacă există fișierul. A apărut o eroare în timp ce încerca să partajeze acest fișier sau folder - Imposibil de șters partajarea. Te rugăm să verifici dacă există fișierul. A apărut o eroare în timp ce încerca să departajeze sau unshare acest fișier sau folder - Imposibil de actualizat. Verifică te rog dacă fișierul există. A apărut o eroare în încercarea de actualizare a partajării Introduceţi o parolă Trebuie să introduci o parolă @@ -359,7 +356,7 @@ Istoric trimiteri Nu s-a găsit nicio aplicație de trimitere a logurilor. Te rog instalează o aplicație de e-mail. %1$s înregistrările app-ului Android - Datele se încarcă... + Datele se încarcă… Selectează tot Inversează selecția Mută diff --git a/owncloudApp/src/main/res/values-ru/strings.xml b/owncloudApp/src/main/res/values-ru/strings.xml index 66ab112e575..7faedd17d21 100644 --- a/owncloudApp/src/main/res/values-ru/strings.xml +++ b/owncloudApp/src/main/res/values-ru/strings.xml @@ -83,7 +83,7 @@ Токен доступа устарел или стал недопустимым. Перевойдите, чтобы восстановить доступ Войти Проверить сервер - Адрес сервера https://... + Адрес сервера https://… Имя пользователя Пароль Незнакомы с %1$s? @@ -106,7 +106,7 @@ Здесь ничего нет. Загрузите что-нибудь! Нет доступных автономных файлов. Отсутствуют файлы общего доступа по ссылке - Загрузка... + Загрузка… Не найдено приложение для типа файла В этом каталоге нет файлов. В этом каталоге нет каталогов. @@ -136,7 +136,7 @@ Назад Сохранить и выйти Ошибка - Загрузка... + Загрузка… неизвестно Неизвестная ошибка Ожидается @@ -251,7 +251,7 @@ Воспроизведение или пауза Перемотка вперед Изображение из камеры - Выполняется авторизация... + Выполняется авторизация… Пробую войти… Нет подключения к сети Защищённое соединение недоступно. @@ -273,7 +273,7 @@ Неожиданное состояние; пожалуйста укажите адрес сервера повторно Время авторизации истекло. Пожалуйста, авторизуйтесь снова Пожалуйста укажите текущий пароль - Подключение к серверу авторизации ... + Подключение к серверу авторизации … Сервер не поддерживает выбранный метод аутентификации %1$s не поддерживает несколько учётных записей Сервер вернул некорректный пользовательский идентификатор. Пожалуйста, свяжитесь с вашим администратором @@ -309,7 +309,7 @@ Отправка ссылки пользователю Копирование файла из частной хранилища Войти через oAuth2 - Подключение к oAuth2 серверу... + Подключение к oAuth2 серверу… Не удалось проверить подлинность сервера - Сертификат сервера не является доверенным - Срок действия сертификата сервера истёк @@ -365,11 +365,8 @@ Произошла ошибка при попытке получить возможности Механизм общего доступа не включен на данном сервере. Пожалуйста, свяжитесь с вашим ⇥⇥администратором. - Невозможно поделиться. Убедитесь, что файл существует При попытке поделиться этим файлом или каталогом произошла ошибка - Невозможно закрыть доступ. Убедитесь что файл существует При попытке закрыть доступ к этому файлу или каталогу произошла ошибка - Не удается обновить. Пожалуйста, проверьте, существует ли файл Произошла ошибка во время обновления ссылки доступа Введите пароль Вы должны ввести пароль diff --git a/owncloudApp/src/main/res/values-si-rLK/strings.xml b/owncloudApp/src/main/res/values-si-rLK/strings.xml index ea087d39ff2..d00e5db2e32 100644 --- a/owncloudApp/src/main/res/values-si-rLK/strings.xml +++ b/owncloudApp/src/main/res/values-si-rLK/strings.xml @@ -3,8 +3,6 @@ උඩුගත කිරීම ගොනු සිටුවම් - - විවෘත කරන්න උදව් සාමාන්‍යයෙන් @@ -43,7 +41,7 @@ උඩුගත කිරීම සාර්ථකයි උඩුගත කිරීම අසාර්ථකයි අනුමැතියේ දෝෂයක් - බාගතවේ... + බාගතවේ… බාගත කිරීම සාර්ථකයි බාගත කිරීම අසාර්ථකයි ගිණුම තෝරන්න @@ -79,5 +77,4 @@ සංස්කරණය කළ හැක සදන්න මකන්න - diff --git a/owncloudApp/src/main/res/values-sk-rSK/strings.xml b/owncloudApp/src/main/res/values-sk-rSK/strings.xml index 71b391a962c..4c4bab07b44 100644 --- a/owncloudApp/src/main/res/values-sk-rSK/strings.xml +++ b/owncloudApp/src/main/res/values-sk-rSK/strings.xml @@ -14,8 +14,6 @@ Zostupne Zoradiť podľa A-Z - - Všetky súbory Nastavenia Nahranie @@ -42,7 +40,7 @@ Zapamätať posledné umiestnenie pre nahranie zdieľaných súborov Skúste %1$s na vašom telefóne! Chcel by som vám odporučiť %1$s na vašom smartfóne!\nSťahujte tu: %2$s - Adresa servera https://... + Adresa servera https://… Používateľské meno Heslo Ste nový v %1$s? @@ -57,7 +55,7 @@ Súbor nie je možné nahrať pred sekundami Žiadny súbor. Nahrajte niečo! - Načítavam... + Načítavam… V tomto priečinku nie sú žiadne súbory. priečinok priečinky @@ -78,7 +76,7 @@ Zrušiť synchronizáciu Späť Chyba - Načítavam... + Načítavam… neznámy Neznáma chyba Čaká @@ -86,9 +84,9 @@ Zmeniť heslo Odstrániť účet Vytvoriť účet - Odoslať z ... + Odoslať z … Názov priečinka - Odosielam ... + Odosielam … %1$d%% Odosielam %2$s Odoslanie bolo úspešné Odoslanie bolo neúspešné @@ -110,7 +108,7 @@ Konflikt Neznáma chyba Čaká sa na nahratie - Sťahujem ... + Sťahujem … %1$d%% Sťahovanie %2$s Sťahovanie bolo úspešné Stiahnutie zlyhalo @@ -200,7 +198,7 @@ Počkať chvíľu Neočakávaný problém; skúste vybrať súbor inou aplikáciou Nebol vybraný súbor - Odošli link do ... + Odošli link do … Kopírovanie súboru z privátneho úložiska Prihlásiť sa z oAuth2 - Certifikát servera nie je overený @@ -245,9 +243,7 @@ %1$s nemožno skopírovať do lokálneho priečinka %2$s Je nám to ľúto, ale zdieľanie nie je na vašom serveri povolené. Prosím kontaktujte vášho administrátora. - Nemožno zdieľať. Skontrolujte, či súbor existuje Pri pokuse o zdieľanie tohto súboru alebo priečinka došlo k chybe - Nemožno ukončiť zdieľanie. Skontrolujte, či súbor existuje Pri pokuse zrušiť zdieľanie tohto súboru alebo priečinka došlo k chybe Vložte heslo Musíte vložiť heslo @@ -318,5 +314,4 @@ vytvoriť zmeniť vymazať - diff --git a/owncloudApp/src/main/res/values-sk/strings.xml b/owncloudApp/src/main/res/values-sk/strings.xml index cd753235b0c..91b6fde778d 100644 --- a/owncloudApp/src/main/res/values-sk/strings.xml +++ b/owncloudApp/src/main/res/values-sk/strings.xml @@ -3,5 +3,4 @@ Nastavenia Všeobecné Stiahnuť - diff --git a/owncloudApp/src/main/res/values-sl/strings.xml b/owncloudApp/src/main/res/values-sl/strings.xml index 56ee541d644..d7d8f08f16b 100644 --- a/owncloudApp/src/main/res/values-sl/strings.xml +++ b/owncloudApp/src/main/res/values-sl/strings.xml @@ -14,7 +14,7 @@ Pošlji Razvrsti Padajoče - Razvrsti ... + Razvrsti … A-Z Starejše - Novejše Manjše - Večje @@ -77,7 +77,7 @@ Prišlo je do napake med kopiranjem datoteke v začasno mapo. Poskusite znova poslati kasneje. pred nekaj sekundami Tukaj še ni ničesar. Najprej je treba datoteke poslati v oblak! - Poteka nalaganje ... + Poteka nalaganje … Ni nameščenega programa za to vrsto datoteke V tej mapi ni datotek. V tej mapi ni drugih map. @@ -106,10 +106,10 @@ Nazaj Shrani in končaj Napaka - Poteka nalaganje ... + Poteka nalaganje … neznano Neznana napaka - V čakanju ... + V čakanju … Pomembno O oblaku %1$s Spremeni geslo @@ -146,7 +146,7 @@ Spor Program je končan Neznana napaka - Čakanje na povezavo WiFi ... + Čakanje na povezavo WiFi … Čakanje na pošiljanje Nepodprta vrsta predstavne vsebine %1$d%% Prejemanje %2$s @@ -205,7 +205,7 @@ Gumb za predvajanje in premor Gumb za hitro predvajanje naprej Slika s kamere - Pridobivanje overitve ... + Pridobivanje overitve … Ni omrežne povezave Varna povezava ni na voljo. Povezava je vzpostavljena @@ -255,13 +255,13 @@ Nedovoljeni znaki: characters: / \\ < > : \" | ? * Ime datoteke vsebuje vsaj en neveljaven znak. Ime datoteke ne sme biti prazno - Počakajte trenutek ... + Počakajte trenutek … Poteka preverjanje shranjenih poveril Prišlo je do nepričakovane napake. Poskusite datoteko izbrati z drugim programom. Ni izbranih datotek Kopiranje datoteke iz zasebne shrambe Prijava z oAuth2 - Vzpostavljanje povezave s strežnikom OAuth2 ... + Vzpostavljanje povezave s strežnikom OAuth2 … Istovetnosti strežnika ni mogoče preveriti - potrdilo strežnika ni vredno zaupanja - potrdilo strežnika je poteklo @@ -311,11 +311,8 @@ Mapa v oblaku za odlaganje slik Souporaba je na strežniku onemogočena. Možnost lahko spreminjajo le uporabniki s skrbniškimi dovoljenji. - Souporaba ni mogoča. Preverite, ali datoteka obstaja. Prišlo je do napake med poskusom omogočanja souporabe te datoteke ali mape - Ni mogoče prekiniti souporabe. Preverite, ali datoteka obstaja. Prišlo je do napake med poskusom odstranjevanja souporabe te datoteke ali mape - Posodobitev ni mogoča. Preverite, ali datoteka obstaja. Prišlo je do napake med posodabljanjem mesta souporabe Vpis gesla Vpisati je treba geslo. @@ -348,7 +345,7 @@ Pošlji zgodovino Ni programa za pošiljanje dnevniških datotek. Namestite vsaj poštni program. %1$s dnevniki programa - Poteka nalaganje podatkov ... + Poteka nalaganje podatkov … izberi vse Premakni Ni vsebine in datotek. Lahko ustvarite na primer mapo. diff --git a/owncloudApp/src/main/res/values-sq/strings.xml b/owncloudApp/src/main/res/values-sq/strings.xml index 8dde8b273ef..cefc56062e2 100644 --- a/owncloudApp/src/main/res/values-sq/strings.xml +++ b/owncloudApp/src/main/res/values-sq/strings.xml @@ -362,11 +362,8 @@ Ndodhi një gabim teksa provohej të merreshin përdorues dhe grupe Ndodhi një gabim teksa provohej të merreshin aftësi Na ndjeni, ndarja me të tjerët s\’është e aktivizuar te shërbyesi juaj. Ju lutemi, lidhuni me përgjegjësin tuaj. - S\’arrihet të ndahet me të tjerët. Ju lutemi, kontrolloni nëse ekziston apo jo kartela Ndodhi një gabim teksa përpiqej të ndahej me të tjerët kjo kartelë apo dosje - S\’arrihet të zhbëhet ndarja me të tjerët. Ju lutemi, kontrolloni nëse kartela ekziston Ndodhi një gabim teksa përpiqej të zhbëhej ndarja me të tjerët e kësaj kartele apo dosjeje - S\’u arrit të përditësohej gjë. Ju lutemi, kontrolloni nëse ekziston apo jo kartela. Ndodhi një gabim teksa provohej të përditësohej ndarja Jepni një fjalëkalim Duhet të jepni një fjalëkalim diff --git a/owncloudApp/src/main/res/values-sr-rSP/strings.xml b/owncloudApp/src/main/res/values-sr-rSP/strings.xml index 3187f7f9b69..b32867d0afd 100644 --- a/owncloudApp/src/main/res/values-sr-rSP/strings.xml +++ b/owncloudApp/src/main/res/values-sr-rSP/strings.xml @@ -9,8 +9,6 @@ Detaljnije Pošalji A-Z - - Svi fajlovi Podešavanja Zatvori @@ -24,7 +22,7 @@ Pomoć Žig Proveri server - Server adresa https://... + Server adresa https://… Korisničko ime Lozinka Fajlovi @@ -34,7 +32,7 @@ Napusti Pre par sekundi Ovde nema ničeg. Pošaljite nešto! - Učitavanje... + Učitavanje… fascikla fascikle fajl @@ -52,12 +50,12 @@ Izmeni lozinku Novi nalog Ime fascikle - Otpremanje... + Otpremanje… Uspešno otpremljeno Otpremanje nije uspelo Otpremljeno Nepoznata greška - Preuzimanje... + Preuzimanje… Uspešno preuzeto Preuzimanje nije uspelo Odaberite nalog @@ -94,5 +92,4 @@ napravi izmeni brisanje - diff --git a/owncloudApp/src/main/res/values-sr/strings.xml b/owncloudApp/src/main/res/values-sr/strings.xml index fbcf4952a0a..9caca3b3c27 100644 --- a/owncloudApp/src/main/res/values-sr/strings.xml +++ b/owncloudApp/src/main/res/values-sr/strings.xml @@ -13,8 +13,6 @@ Пошаљи Разврставање Разврставање - - Сви фајлови Поставке Отпремања @@ -77,7 +75,7 @@ Назад Сачувај и изађи Грешка - Учитавам... + Учитавам… непознато Непозната грешка На чекању @@ -217,7 +215,7 @@ Сачекајте тренутак Неочекивани проблем. Изаберите фајл другом апликацијом Нисте изабрали фајл - Пошаљи везу ... + Пошаљи везу … Копирам фајл из личног складишта Пријави се помоћу „oAuth2“ – Сертификат сервера није од поверења @@ -263,11 +261,8 @@ %1$s се не може копирати у локалну фасциклу %2$s Дељење није укључено на вашем серверу. Контактирајте администратора. - Не могу да делим. Проверите да ли фајл постоји Дошло је до грешке приликом покушаја дељења овог фајла или фасцикле - Не могу да прекинем дељење. Проверите да ли фајл постоји Дошло је до грешке приликом покушаја укидања дељења овог фајла или фасцикле - Не могу да ажурирам. Проверите да ли фајл постоји Дошло је до грешке при покушају ажурирања дељења Унесите лозинку Морате унети лозинку @@ -326,8 +321,8 @@ %1$d фајлова, %2$d фасцикли неопходно опционо - Оригинални фајл ће бити... - Оригинални фајл ће бити... + Оригинални фајл ће бити… + Оригинални фајл ће бити… Копирај фајл Премести фајл остављен у изворној фасцикли @@ -362,5 +357,4 @@ %d изабрана %d изабрано - diff --git a/owncloudApp/src/main/res/values-su/strings.xml b/owncloudApp/src/main/res/values-su/strings.xml deleted file mode 100644 index 1647fff6c53..00000000000 --- a/owncloudApp/src/main/res/values-su/strings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/owncloudApp/src/main/res/values-sv/strings.xml b/owncloudApp/src/main/res/values-sv/strings.xml index bbb8bd35ad4..cc187683030 100644 --- a/owncloudApp/src/main/res/values-sv/strings.xml +++ b/owncloudApp/src/main/res/values-sv/strings.xml @@ -46,7 +46,7 @@ Jag skullje vilja bjuda in dig till att prova %1$s på din smartphone!\nLadda ner appen från Google Play här: %2$s Logga in Testa servern - Serveradress https://... + Serveradress https://… Användarnamn Lösenord Ny på %1$s? @@ -67,7 +67,7 @@ Ett fel uppstod när filen kopierades till en temporär mapp. Vänligen försök skicka den igen. sekunder sedan Ingenting här. Ladda upp något! - Laddar... + Laddar… Ingen app hittades för filtypen Det finns inga filer i den här mappen. Det finns inga mappar i den här mappen. @@ -94,7 +94,7 @@ Tillbaka Spara & avsluta Fel - Laddar... + Laddar… okänt Okänt fel Väntar @@ -192,7 +192,7 @@ Bakåtspolningsknapp Spela- / Pausknapp Snappspolningsknapp - Får tillstånd... + Får tillstånd… Ingen nätverksanslutning Säker anslutning inte tillgänglig. Anslutning etablerad @@ -213,7 +213,7 @@ Oväntat tillstånd; var god ange serverns adress igen Din inloggning har gått ut. Var god logga in igen Var god ange ditt nuvarande lösenord - Ansluter till autentiseringsserver ... + Ansluter till autentiseringsserver … Servern har inte stöd för denna autentiseringsmetod %1$s har inte stöd för multipla konton Din server returnerar inte ett korrekt användare id, vänligen kontakta en administratör @@ -248,7 +248,7 @@ Ingen fil vald Kopierar fil från privat lagring Logga in med oAuth2. - Ansluter till OAuth2 autentiseringsservern... + Ansluter till OAuth2 autentiseringsservern… Identiteten av servern kunde inte verifieras - Servercertifikatet är inte tillförlitligt - Servercertifikatet har gått ut @@ -294,11 +294,8 @@ %1$s kunde inte kopieras till %2$s lokal mapp Ledsen, delning är inte aktiverat på din server. Vänligen kontakta din administratör. - Lyckades ej dela. Vänligen kontrollera om filen eisterar Ett fel uppstod vid försök att dela denna fil eller mapp - Lyckades ej sluta dela. Vänligen kontrollera om filen existerar Ett fel uppstod vid försök att sluta dela denna fil eller mapp - Kunde inte uppdatera. Var god kolla om filen existerar. Ett fel inträffade när delningen skulle uppdateras Ange ett lösenord Du måste ange ett lösenord @@ -331,7 +328,7 @@ Historik skickat Kunde inte hitta program för att skicka loggar. Installera ett e-postprogram %1$s Android app logs - Laddar data... + Laddar data… Välj allt Flytta Ingenting här. Du kan skapa en mapp! diff --git a/owncloudApp/src/main/res/values-sw-rKE/strings.xml b/owncloudApp/src/main/res/values-sw-rKE/strings.xml deleted file mode 100644 index 1647fff6c53..00000000000 --- a/owncloudApp/src/main/res/values-sw-rKE/strings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/owncloudApp/src/main/res/values-ta-rIN/strings.xml b/owncloudApp/src/main/res/values-ta-rIN/strings.xml index 645aea96a15..06d2eeedd86 100644 --- a/owncloudApp/src/main/res/values-ta-rIN/strings.xml +++ b/owncloudApp/src/main/res/values-ta-rIN/strings.xml @@ -10,8 +10,6 @@ அமைப்புகள் விவரங்கள் அனுப்பவும் - - பொது மேலும் கணக்குகள் @@ -22,5 +20,4 @@ விவரங்கள் அனுப்பவும் கணக்குகள் - diff --git a/owncloudApp/src/main/res/values-ta-rLK/strings.xml b/owncloudApp/src/main/res/values-ta-rLK/strings.xml index b54e755fdd9..530036aa7cd 100644 --- a/owncloudApp/src/main/res/values-ta-rLK/strings.xml +++ b/owncloudApp/src/main/res/values-ta-rLK/strings.xml @@ -5,8 +5,6 @@ கோப்புகள் அமைப்புகள் விவரங்கள் - - திறக்க உதவி பொதுவான @@ -42,7 +40,7 @@ கணக்கை உருவாக்குக பதிவேற்றல் படிவம் கோப்புறை பெயர் - பதிவேற்றல்... + பதிவேற்றல்… %1$d%% பதிவேற்றல்g %2$s வெற்றிகரமாக பதிவேற்றப்பட்டது பதிவேற்றல் தோல்வியுற்றது @@ -114,5 +112,4 @@ தொகுக்க முடியும் உருவவாக்கல் நீக்குக - diff --git a/owncloudApp/src/main/res/values-te/strings.xml b/owncloudApp/src/main/res/values-te/strings.xml index 88603a4c82c..df76262e8d5 100644 --- a/owncloudApp/src/main/res/values-te/strings.xml +++ b/owncloudApp/src/main/res/values-te/strings.xml @@ -3,8 +3,6 @@ కొత్త సంచయం అమరికలు పంపించు - - సహాయం మరిన్ని సహాయం @@ -21,5 +19,4 @@ భద్రపరచు సంకేతపదం తొలగించు - diff --git a/owncloudApp/src/main/res/values-tg-rTJ/strings.xml b/owncloudApp/src/main/res/values-tg-rTJ/strings.xml deleted file mode 100644 index 1647fff6c53..00000000000 --- a/owncloudApp/src/main/res/values-tg-rTJ/strings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/owncloudApp/src/main/res/values-th-rTH/strings.xml b/owncloudApp/src/main/res/values-th-rTH/strings.xml index 4770b47d7dc..8d208b67abe 100644 --- a/owncloudApp/src/main/res/values-th-rTH/strings.xml +++ b/owncloudApp/src/main/res/values-th-rTH/strings.xml @@ -105,7 +105,7 @@ ยังไม่มีไฟล์ใดๆเลยลองอัปโหลดดูสิ! ยังไม่มีไฟล์ออฟไลน์ที่พร้อมใช้งาน ไม่มีการแชร์ไฟล์แบบลิงก์ - กำลังโหลด... + กำลังโหลด… ไม่พบแอปฯที่ตรงกับประเภทของไฟล์ ยังไม่มีไฟล์ในโฟลเดอร์นี้ ไม่มีโฟลเดอร์ในโฟลเดอร์นี้ @@ -135,7 +135,7 @@ ย้อนกลับ บันทึก & ออก ข้อผิดพลาด - กำลังโหลด... + กำลังโหลด… ไม่รู้จัก ข้อผิดพลาดที่ไม่ทราบสาเหตุ อยู่ระหว่างดำเนินการ @@ -185,7 +185,7 @@ กำลังรอการเชื่อมต่อ WiFi กำลังรออัปโหลด ประเภทของสื่อไม่ได้รับการสนับสนุน - กำลังดาวน์โหลด... + กำลังดาวน์โหลด… %1$d%% กำลังดาวน์โหลด %2$s ดาวน์โหลดเสร็จสิ้น ดาวน์โหลด %1$s แล้ว @@ -250,8 +250,8 @@ เล่นหรือกดปุ่มหยุดชั่วคราว ปุ่มเลื่อนไปข้างหน้า รูปภาพจากกล้อง - กำลังขออนุมัติ... - กำลังเข้าสู่ระบบ... + กำลังขออนุมัติ… + กำลังเข้าสู่ระบบ… ไม่มีการเชื่อมต่อเครือข่ายใดๆ การเชื่อมต่อแบบปลอดภัยไม่สามารถใช้งานได้ ติดตั้งการเชื่อมต่อแล้ว @@ -307,7 +307,7 @@ ส่งลิงก์ไปที่ คัดลอกไฟล์จากพื้นที่จัดเก็บส่วนตัว เข้าสู่ระบบด้วย oAuth2 - กำลังเชื่อมต่อกับเซิร์ฟเวอร์ OAuth2 ... + กำลังเชื่อมต่อกับเซิร์ฟเวอร์ OAuth2 … ไม่สามารถตรวจสอบตัวตนของเซิร์ฟเวอร์ - ใบรับรองความปลอดภัยของเซิร์ฟเวอร์ไม่น่าเชื่อถือ - ใบรับรองความปลอดภัยของเซิร์ฟเวอร์หมดอายุแล้ว @@ -362,11 +362,8 @@ เกิดข้อผิดพลาดขณะพยายามดึงผู้ใช้และกลุ่ม เกิดข้อผิดพลาดขณะพยายามเร่งขีดความสามารถ ขออภัยการแชร์ไม่ได้เปิดใช้งานบนเซิร์ฟเวอร์ของคุณ กรุณาติดต่อผู้ดูแลระบบ - ไม่สามารถแชร์ กรุณาตรวจสอบว่ายังมีไฟล์นั้นอยู่ เกิดข้อผิดพลาดในขณะที่พยายามจะแชร์ไฟล์หรือโฟลเดอร์นี้ - ไม่สามารถยกเลิกการแชร์ กรุณาตรวจสอบว่ายังมีไฟล์นั้นอยู่ เกิดข้อผิดพลาดในขณะยกเลิกการอชร์ไฟล์หรือโฟลเดอร์นี้ - ไม่สามารถอัปเดต กรุณาตรวจสอบว่ายังมีไฟล์นั้นอยู่ เกิดข้อผิดพลาดในขณะที่พยายามอัปเดตการแชร์ ป้อนรหัสผ่าน คุณจะต้องใส่รหัสผ่าน @@ -399,7 +396,7 @@ ส่งประวัติการใช้งานย้อนหลัง ไม่พบแอปสำหรับส่งข้อมูล log กรุณาติดตั้งแอปสำหรับส่งเมล %1$s ข้อมูล log สำหรับแอปแอนดรอยด์ - กำลังโหลดข้อมูล ... + กำลังโหลดข้อมูล … เลือกทั้งหมด เลือกตรงกันข้าม ย้าย diff --git a/owncloudApp/src/main/res/values-tr/strings.xml b/owncloudApp/src/main/res/values-tr/strings.xml index 2be5179858d..2b7a317ed33 100644 --- a/owncloudApp/src/main/res/values-tr/strings.xml +++ b/owncloudApp/src/main/res/values-tr/strings.xml @@ -102,7 +102,7 @@ saniyeler önce Burada hiçbir şey yok. Bir şeyler yükleyin! Erişilebilir hiçbir çevrimdışı dosya yok. - Yükleniyor... + Yükleniyor… Dosya türü için hiçbir uygulama bulunamadı Bu klasörde dosya yok. Bu klasör içinde klasör yok. @@ -132,7 +132,7 @@ Geri Kaydet ve çık Hata - Yükleniyor... + Yükleniyor… bilinmiyor Bilinmeyen hata Bekliyor @@ -143,7 +143,7 @@ Hesap oluştur Şuradan yükle Klasör adı - Yükleniyor... + Yükleniyor… %%%1$d Yüklenen: %2$s Yükleme başarılı %1$s yüklendi @@ -181,7 +181,7 @@ Kablosuz bağlantısı bekleniyor Yüklemek için bekliyor Desteklenmeyen ortam türü - İndiriliyor... + İndiriliyor… %%%1$d İndirilen: %2$s İndirme başarılı %1$s indirildi. @@ -245,8 +245,8 @@ Oynat veya duraklat düğmesi Hızlı ileri düğmesi Kameradan resim - Kimlik doğrulama alınıyor... - Giriş deneniyor... + Kimlik doğrulama alınıyor… + Giriş deneniyor… Ağ bağlantısı yok Güvenli bağlantı mevcut değil. Bağlantı kuruldu @@ -303,7 +303,7 @@ Bağlantıyı gönder Dosya özel depolamadan kopyalanıyor oAuth2 ile oturum aç - OAuth2 sunucusuna bağlanıyor... + OAuth2 sunucusuna bağlanıyor… Sunucunun kimliği doğrulanamadı. - Sunucu sertifikasına güvenilmiyor - Sunucu sertifikasının süresi dolmuş @@ -359,11 +359,8 @@ Yetenekleri almaya çalışırken bir hata oluştu Üzgünüz, paylaşım sunucunuzda etkin değil. Lütfen yöneticinizle iletişime geçin. - Paylaşma başarısız. Lütfen dosyanın mevcut olup olmadığını denetleyin Bu dosya veya klasörü paylaşmaya çalışılırken bir hata oluştu - Paylaşımı kaldırma başarısız. Lütfen dosyanın mevcut olup olmadığını denetleyin Bu dosya veya klasör paylaşımı kaldırılmaya çalışılırken bir hata oluştu - Güncelleme yapılamıyor. Lütfen dosyanın mevcut olup olmadığını kontrol edin. Paylaşım güncellenmeye çalışırken bir hata oluştu Bir parola girin Bir parola girmelisiniz @@ -396,7 +393,7 @@ Geçmişi gönder Kayıtları göndermek için uygulama bulunamadı. Lütfen bir e-posta uygulaması yükleyin! %1$s Android uygulama kayıtları - Veri yükleniyor... + Veri yükleniyor… Tümünü seç Seçimi tersine çevir Taşı diff --git a/owncloudApp/src/main/res/values-tzl/strings.xml b/owncloudApp/src/main/res/values-tzl/strings.xml deleted file mode 100644 index 169dfefffda..00000000000 --- a/owncloudApp/src/main/res/values-tzl/strings.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/owncloudApp/src/main/res/values-ug/strings.xml b/owncloudApp/src/main/res/values-ug/strings.xml index 80cf035fd60..29c8c184590 100644 --- a/owncloudApp/src/main/res/values-ug/strings.xml +++ b/owncloudApp/src/main/res/values-ug/strings.xml @@ -5,8 +5,6 @@ يېڭى قىسقۇچ تەڭشەكلەر يوللا - - ئاچ قايتۇرما ئىنكاس ياردەم @@ -51,5 +49,4 @@ ئىم ئىزدە ئۆچۈر - diff --git a/owncloudApp/src/main/res/values-uk/strings.xml b/owncloudApp/src/main/res/values-uk/strings.xml index 48690a112ee..846762e182e 100644 --- a/owncloudApp/src/main/res/values-uk/strings.xml +++ b/owncloudApp/src/main/res/values-uk/strings.xml @@ -58,7 +58,7 @@ Пропоную вам користуватися %1$s на вашому смартфоні!\nЗавантажити можна за посиланням: %2$s Автентифікація не виконана Змінити обліковий запис - Ввійти... + Ввійти… Перевірити сервер Адреса серверу https://… Ім\'я користувача @@ -215,7 +215,7 @@ Відтворення або пауза Перемотка вперед Зображення з камери - Виконується вхід... + Виконується вхід… Відсутнє підключення до мережі Безпечне з\'єднання не доступне. З\'єднання встановлено @@ -236,7 +236,7 @@ Неочікуваний стан; будь ласка, введіть адресу сервера знову Час авторизації минув. Будь ласка, увійдіть знову Будь ласка, введіть поточний пароль - Підключення до серверу аутентифікації ... + Підключення до серверу аутентифікації … Цей сервер не підтримує обраний метод аутентифікації %1$s не підтримує одночасно декілька облікових записів Ваш сервер не повертає коректний ідентифікатор користувача, будь ласка зверніться до адміністратора @@ -317,11 +317,8 @@ %1$s неможливо скопіювати до %2$s Шлях для завантаження зображень На жаль, обмін не включений на вашому сервері. Будь ласка, зв\'яжіться з вашим адмінистратором. - Неможливо поділитися. Будь ласка, перевірте, чи існує файл Виникла помилка при спробі поділитися файлом або текою - Неможливо заборонити доступ. Будь ласка, перевірте, чи існує файл Виникла помилка при спробі заборонити доступ до файлу або теки - Неможливо оновити. Будь ласка, перевірте, чи існує файл Виникла помилка при спробі оновити дані доступу Ввести пароль Ви повинні ввести пароль @@ -354,7 +351,7 @@ Надіслати історію Не знайдено програм для висилання журналів. Будь ласка, встановіть поштову програму. %1$s Android лог додатку - Завантаження даних... + Завантаження даних… Вибрати всі Перемістити Тут нічого немає. Ви можете додати теку! diff --git a/owncloudApp/src/main/res/values-ur-rPK/strings.xml b/owncloudApp/src/main/res/values-ur-rPK/strings.xml index ef34f742873..74340787bc4 100644 --- a/owncloudApp/src/main/res/values-ur-rPK/strings.xml +++ b/owncloudApp/src/main/res/values-ur-rPK/strings.xml @@ -3,8 +3,6 @@ فائلیں سیٹینگز بھجیں - - کھولیں مدد مزید @@ -32,5 +30,4 @@ تبدیل کر سکے ھیں نیا بنائیں ختم کریں - diff --git a/owncloudApp/src/main/res/values-ur/strings.xml b/owncloudApp/src/main/res/values-ur/strings.xml index 63dbc495ac3..141427dbe5f 100644 --- a/owncloudApp/src/main/res/values-ur/strings.xml +++ b/owncloudApp/src/main/res/values-ur/strings.xml @@ -1,5 +1,4 @@ خرابی - diff --git a/owncloudApp/src/main/res/values-uz/strings.xml b/owncloudApp/src/main/res/values-uz/strings.xml deleted file mode 100644 index 1647fff6c53..00000000000 --- a/owncloudApp/src/main/res/values-uz/strings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/owncloudApp/src/main/res/values-vi/strings.xml b/owncloudApp/src/main/res/values-vi/strings.xml index 31f1c938750..4b4a52086e4 100644 --- a/owncloudApp/src/main/res/values-vi/strings.xml +++ b/owncloudApp/src/main/res/values-vi/strings.xml @@ -15,8 +15,6 @@ Giảm dần Sắp xếp theo A-Z - - Tất cả tệp tin Thiết lập Tải lên @@ -68,7 +66,7 @@ Có lỗi khi copy file sang thư mục tạm. Mời thử lại vài giây trước Không có gì ở đây .Hãy tải lên một cái gì đó ! - Đang tải... + Đang tải… Không có ứng dụng để mở file Không có file nào trong thư mục này Không có thư mục con trong thư mục này @@ -97,7 +95,7 @@ Trở lại Lưu & thoát Lỗi - Đang tải... + Đang tải… Chưa biết Lỗi chưa biết Đang chờ @@ -105,9 +103,9 @@ Đổi mật khẩu Xóa tài khoản Tạo tài khoản - Tải lên từ ... + Tải lên từ … Tên thư mục - Đang tải lên ... + Đang tải lên … %1$d%% Đang tải lên %2$s Tải lên thành công %1$s đã được tải lên @@ -132,7 +130,7 @@ Lỗi kết nối Lỗi quyền truy cập Lỗi chưa biết - Đang tải về ... + Đang tải về … %1$d%% Đang tải về %2$s Tải về thành công Tải về thất bại @@ -203,7 +201,7 @@ Chờ một lúc Vấn đề bất ngờ ; hãy thử ứng dụng khác để chọn tập tin Không có tập tin nào được chọn - Gửi liên kết đến... + Gửi liên kết đến… Đăng nhập bằng oAuth2. Chứng chỉ này không đáng tin cậy Chứng chỉ đã hết hạn @@ -257,5 +255,4 @@ thay đôi xóa Bất cứ ai liên kết đều có quyền truy cập tệp tin/thư mục - diff --git a/owncloudApp/src/main/res/values-yo/strings.xml b/owncloudApp/src/main/res/values-yo/strings.xml deleted file mode 100644 index 169dfefffda..00000000000 --- a/owncloudApp/src/main/res/values-yo/strings.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/owncloudApp/src/main/res/values-zh-rCN/strings.xml b/owncloudApp/src/main/res/values-zh-rCN/strings.xml index 60363cf0ec3..c835ce7b4e0 100644 --- a/owncloudApp/src/main/res/values-zh-rCN/strings.xml +++ b/owncloudApp/src/main/res/values-zh-rCN/strings.xml @@ -77,7 +77,7 @@ 更换账户 登录 检查服务器 - 服务器地址 https://... + 服务器地址 https://… 用户名 密码 初次使用 %1$s? @@ -99,7 +99,7 @@ 几秒前 这里还什么都没有。上传些东西吧！ 无可用的离线文件 - 加载中... + 加载中… 没有支持此文件的应用 在该文件夹中不存在文件。 在该文件夹中不存在其它文件夹。 @@ -129,7 +129,7 @@ 返回 保存并退出 错误 - 加载中... + 加载中… 未知 未知错误 等待 @@ -176,7 +176,7 @@ 应用已被终止 未知错误 等待WiFi连接 - 等待上传... + 等待上传… 不支持的媒体类型 下载中…… %1$d%% 下载中 %2$s @@ -242,7 +242,7 @@ 播放暂停按钮 快进按钮 从相机获取照片 - 正在认证... + 正在认证… 尝试登录中.…… 没有网络连接 安全连接不可用。 @@ -264,7 +264,7 @@ 未知状态，请重新输入服务器地址 你的授权已经过期。请重新授权。 请输入当前的密码 - 连接认证服务器... + 连接认证服务器… 服务器不支持这种验证方式 %1$s不支持多个账户 您的服务器没有返回一个正确的用户 id，请联系管理员 @@ -354,11 +354,8 @@ 尝试获取共享时发生错误 尝试获取用户和用户组时发生错误 抱歉，共享功能未启用。请联系管理员。 - 无法共享。请检查文件是否存在 共享文件或目录出错 - 无法取消共享。请检查文件是否存在 解除文件或目录共享时出错 - 无法上传，请检查文件是否存在 更新共享时发生错误 输入密码 您必须输入密码 @@ -391,7 +388,7 @@ 发送历史日志 无法发送日志，请安装邮箱应用。 %1$s Android 程序日志 - 载入数据... + 载入数据… 全部选择 反向选择 移动 diff --git a/owncloudApp/src/main/res/values-zh-rHK/strings.xml b/owncloudApp/src/main/res/values-zh-rHK/strings.xml index d78a476c23d..96ddcd97025 100644 --- a/owncloudApp/src/main/res/values-zh-rHK/strings.xml +++ b/owncloudApp/src/main/res/values-zh-rHK/strings.xml @@ -7,8 +7,6 @@ 設定 詳述 傳送 - - 設定 開啟 反饋 @@ -82,5 +80,4 @@ 可編輯 新增 刪除 - diff --git a/owncloudApp/src/main/res/values-zh-rTW/strings.xml b/owncloudApp/src/main/res/values-zh-rTW/strings.xml index 32c5b3e4921..6c422f98f2d 100644 --- a/owncloudApp/src/main/res/values-zh-rTW/strings.xml +++ b/owncloudApp/src/main/res/values-zh-rTW/strings.xml @@ -46,7 +46,7 @@ 我想邀起您也在智慧型手機上使用%1$s!\n下載:%2$s 登入 檢查伺服器 - 伺服器位址 https://... + 伺服器位址 https://… 使用者名稱 密碼 新增到 %1$s? @@ -106,7 +106,7 @@ 建立帳號 上傳來自 資料夾名稱 - 上傳中... + 上傳中… %1$d%% 上傳中 %2$s 更新成功 %1$s 已上傳 @@ -136,7 +136,7 @@ 等待無線網路連線 上傳等候中 不支援的媒體類型 - 下載中 ... + 下載中 … %1$d%% 下載中 %2$s 下載成功 %1$s 已下載 @@ -193,8 +193,8 @@ 播放或暫停按鍵 快轉按鍵 相片 - 登入中... - 輸入來登入... + 登入中… + 輸入來登入… 沒有網際網路連線 安全連線不可用。 連線已建立 @@ -215,7 +215,7 @@ 未知狀態; 請重新輸入伺服器的位址 你的登入授權已過期. 請再次登入 請輸入目前的密碼 - 連接驗證伺服器中... + 連接驗證伺服器中… 伺服器不支援這種認證方式 %1$s 不支援複數賬戶 你的伺服器並沒有傳回正確的使用者 ID, 請聯絡伺服器的管理員 @@ -286,7 +286,6 @@ 經由 wifi 上傳視訊 確認 檔案衝突 - 您要保留那個檔案? 如果您同時選擇兩個版本, 本地的檔案將在檔案名稱後面會加上編號 都保留 本地版本 伺服器版本 @@ -296,11 +295,8 @@ 圖片上傳路徑 很抱歉, 您的伺服器並未開啟分享的功能. 請聯絡您的 伺服器管理員. - 無法分享。請檢查檔案是否存在 在分享檔案或資料夾時發生了錯誤 - 無法取消分享. 請檢查檔案是否存在 在取消分享檔案或資料夾時發生了錯誤 - 無法更新, 請檢查檔案是否存在 當嘗試更新分享時發生錯誤 輸入密碼 您必須輸入密碼 @@ -332,7 +328,7 @@ 傳送歷史 沒有傳送紀錄的軟體. 請安裝郵件軟體 %1$s Android 應用程式記錄 - 資料載入中... + 資料載入中… 全選 移動 這裡什麼也沒有，您可以增加目錄！ diff --git a/owncloudData/src/main/java/com/owncloud/android/data/ProviderMeta.java b/owncloudData/src/main/java/com/owncloud/android/data/ProviderMeta.java index e4d8c229fc6..1ca73ced351 100644 --- a/owncloudData/src/main/java/com/owncloud/android/data/ProviderMeta.java +++ b/owncloudData/src/main/java/com/owncloud/android/data/ProviderMeta.java @@ -59,9 +59,6 @@ static public class ProviderTableMeta implements BaseColumns { public static final String OCSHARES_NAME = "name"; public static final String OCSHARES_URL = "url"; - public static final String OCSHARES_DEFAULT_SORT_ORDER = OCSHARES_FILE_SOURCE - + " collate nocase asc"; - // Columns of capabilities table public static final String CAPABILITIES_ACCOUNT_NAME = "account"; public static final String CAPABILITIES_VERSION_MAYOR = "version_mayor"; @@ -97,8 +94,5 @@ static public class ProviderTableMeta implements BaseColumns { public static final String CAPABILITIES_FILES_BIGFILECHUNKING = "files_bigfilechunking"; public static final String CAPABILITIES_FILES_UNDELETE = "files_undelete"; public static final String CAPABILITIES_FILES_VERSIONING = "files_versioning"; - - public static final String CAPABILITIES_DEFAULT_SORT_ORDER = CAPABILITIES_ACCOUNT_NAME - + " collate nocase asc"; } } diff --git a/owncloudData/src/main/java/com/owncloud/android/data/capabilities/datasources/RemoteCapabilitiesDataSource.kt b/owncloudData/src/main/java/com/owncloud/android/data/capabilities/datasources/RemoteCapabilitiesDataSource.kt index f6ce549faf5..0a02dd2e359 100644 --- a/owncloudData/src/main/java/com/owncloud/android/data/capabilities/datasources/RemoteCapabilitiesDataSource.kt +++ b/owncloudData/src/main/java/com/owncloud/android/data/capabilities/datasources/RemoteCapabilitiesDataSource.kt @@ -20,7 +20,6 @@ package com.owncloud.android.data.capabilities.datasources import com.owncloud.android.domain.capabilities.model.OCCapability -import com.owncloud.android.lib.resources.status.GetRemoteCapabilitiesOperation interface RemoteCapabilitiesDataSource { fun getCapabilities( diff --git a/owncloudData/src/main/java/com/owncloud/android/data/sharing/sharees/datasources/RemoteShareeDataSource.kt b/owncloudData/src/main/java/com/owncloud/android/data/sharing/sharees/datasources/RemoteShareeDataSource.kt index 88dcc0e0263..9dde52e4ae6 100644 --- a/owncloudData/src/main/java/com/owncloud/android/data/sharing/sharees/datasources/RemoteShareeDataSource.kt +++ b/owncloudData/src/main/java/com/owncloud/android/data/sharing/sharees/datasources/RemoteShareeDataSource.kt @@ -19,7 +19,6 @@ package com.owncloud.android.data.sharing.sharees.datasources -import com.owncloud.android.lib.resources.shares.GetRemoteShareesOperation import org.json.JSONObject interface RemoteShareeDataSource { diff --git a/owncloudData/src/main/java/com/owncloud/android/data/sharing/shares/db/OCShareEntity.kt b/owncloudData/src/main/java/com/owncloud/android/data/sharing/shares/db/OCShareEntity.kt index 09cecc9dbd6..8fd21a429d7 100644 --- a/owncloudData/src/main/java/com/owncloud/android/data/sharing/shares/db/OCShareEntity.kt +++ b/owncloudData/src/main/java/com/owncloud/android/data/sharing/shares/db/OCShareEntity.kt @@ -67,63 +67,11 @@ data class OCShareEntity( val name: String?, @ColumnInfo(name = ProviderTableMeta.OCSHARES_URL) val shareLink: String? -) : Parcelable { +) { @PrimaryKey(autoGenerate = true) var id: Int = 0 - constructor(parcel: Parcel) : this( - parcel.readLong(), - parcel.readLong(), - parcel.readInt(), - parcel.readString(), - parcel.readString(), - parcel.readInt(), - parcel.readLong(), - parcel.readLong(), - parcel.readString(), - parcel.readString(), - parcel.readString(), - parcel.readByte() != 0.toByte(), - parcel.readLong(), - parcel.readLong(), - parcel.readString(), - parcel.readString(), - parcel.readString() - ) { - id = parcel.readInt() - } - companion object { - /** - * Generated - should be refreshed every time the class changes!! - */ - private const val serialVersionUID = 4124975224281327921L - - private val TAG = OCShareEntity::class.java.simpleName - - const val DEFAULT_PERMISSION = -1 - const val READ_PERMISSION_FLAG = 1 - const val UPDATE_PERMISSION_FLAG = 2 - const val CREATE_PERMISSION_FLAG = 4 - const val DELETE_PERMISSION_FLAG = 8 - const val SHARE_PERMISSION_FLAG = 16 - const val MAXIMUM_PERMISSIONS_FOR_FILE = READ_PERMISSION_FLAG + - UPDATE_PERMISSION_FLAG + - SHARE_PERMISSION_FLAG - const val MAXIMUM_PERMISSIONS_FOR_FOLDER = MAXIMUM_PERMISSIONS_FOR_FILE + - CREATE_PERMISSION_FLAG + - DELETE_PERMISSION_FLAG - const val FEDERATED_PERMISSIONS_FOR_FILE_UP_TO_OC9 = READ_PERMISSION_FLAG + UPDATE_PERMISSION_FLAG - const val FEDERATED_PERMISSIONS_FOR_FILE_AFTER_OC9 = READ_PERMISSION_FLAG + - UPDATE_PERMISSION_FLAG + - SHARE_PERMISSION_FLAG - const val FEDERATED_PERMISSIONS_FOR_FOLDER_UP_TO_OC9 = READ_PERMISSION_FLAG + - UPDATE_PERMISSION_FLAG + - CREATE_PERMISSION_FLAG + - DELETE_PERMISSION_FLAG - const val FEDERATED_PERMISSIONS_FOR_FOLDER_AFTER_OC9 = - FEDERATED_PERMISSIONS_FOR_FOLDER_UP_TO_OC9 + SHARE_PERMISSION_FLAG - fun fromCursor(cursor: Cursor): OCShareEntity { return OCShareEntity( cursor.getLong(cursor.getColumnIndex(ProviderTableMeta.OCSHARES_FILE_SOURCE)), @@ -167,40 +115,5 @@ data class OCShareEntity( values.getAsString(ProviderTableMeta.OCSHARES_URL) ) } - - /** - * Parcelable Methods - */ - @JvmField - val CREATOR: Parcelable.Creator = object : Parcelable.Creator { - override fun createFromParcel(source: Parcel): OCShareEntity { - return OCShareEntity(source) - } - - override fun newArray(size: Int): Array { - return arrayOfNulls(size) - } - } - } - - override fun describeContents(): Int = this.hashCode() - - override fun writeToParcel(dest: Parcel?, flags: Int) { - dest?.writeInt(id) - dest?.writeString(shareWith) - dest?.writeString(path) - dest?.writeString(token) - dest?.writeString(sharedWithDisplayName) - dest?.writeString(sharedWithAdditionalInfo) - dest?.writeString(name) - dest?.writeString(shareLink) - dest?.writeLong(fileSource) - dest?.writeLong(itemSource) - dest?.writeInt(shareType) - dest?.writeInt(permissions) - dest?.writeLong(sharedDate) - dest?.writeLong(expirationDate) - dest?.writeInt(if (isFolder) 1 else 0) - dest?.writeLong(userId) } } diff --git a/owncloudData/src/main/res/values/strings.xml b/owncloudData/src/main/res/values/strings.xml deleted file mode 100644 index 50141a9ed9b..00000000000 --- a/owncloudData/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - ownCloudDataLayer - diff --git a/owncloudDomain/src/main/AndroidManifest.xml b/owncloudDomain/src/main/AndroidManifest.xml index c6120e875dd..aaddb46dbbf 100644 --- a/owncloudDomain/src/main/AndroidManifest.xml +++ b/owncloudDomain/src/main/AndroidManifest.xml @@ -1,2 +1 @@ - + diff --git a/owncloudDomain/src/main/java/com/owncloud/android/domain/auth/GetServerInfoUseCase.kt b/owncloudDomain/src/main/java/com/owncloud/android/domain/auth/GetServerInfoUseCase.kt deleted file mode 100644 index 0b178937975..00000000000 --- a/owncloudDomain/src/main/java/com/owncloud/android/domain/auth/GetServerInfoUseCase.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.owncloud.android.domain.auth - -class GetServerInfoUseCase { - -} \ No newline at end of file diff --git a/owncloudDomain/src/main/java/com/owncloud/android/domain/sharing/shares/usecases/BaseUseCase.kt b/owncloudDomain/src/main/java/com/owncloud/android/domain/sharing/shares/usecases/BaseUseCase.kt index 2aeae1c08b7..e281502a2e0 100644 --- a/owncloudDomain/src/main/java/com/owncloud/android/domain/sharing/shares/usecases/BaseUseCase.kt +++ b/owncloudDomain/src/main/java/com/owncloud/android/domain/sharing/shares/usecases/BaseUseCase.kt @@ -19,8 +19,6 @@ package com.owncloud.android.domain.sharing.shares.usecases -import com.owncloud.android.domain.UseCaseResult - /** * Parent class for use cases that do not require network operations, e.g. get data from database. That's why error * handling is not needed as it is in [com.owncloud.android.domain.BaseUseCaseWithResult] diff --git a/owncloudDomain/src/main/res/values/strings.xml b/owncloudDomain/src/main/res/values/strings.xml deleted file mode 100644 index 2a8800ecfed..00000000000 --- a/owncloudDomain/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - ownCloudDomainLayer -