From e69cce064d68a6955fd78bdb5b07ea52c1420d87 Mon Sep 17 00:00:00 2001 From: EParzefall Date: Sat, 7 Oct 2023 15:46:17 +0200 Subject: [PATCH 1/4] language review --- owncloudApp/src/main/res/values/strings.xml | 288 ++++++++++---------- 1 file changed, 144 insertions(+), 144 deletions(-) diff --git a/owncloudApp/src/main/res/values/strings.xml b/owncloudApp/src/main/res/values/strings.xml index 1d5dd3d2f6c..5e30a4441c9 100644 --- a/owncloudApp/src/main/res/values/strings.xml +++ b/owncloudApp/src/main/res/values/strings.xml @@ -56,11 +56,11 @@ Touches with other visible windows Allow touches when the view is obscured by another visible window. Enable it to use light filtering apps. Are you sure you want to enable this feature? - Use this feature under your own responsibility, a malicious application could try to spoof you into performing some actions, unaware, using other views. - Auto upload pictures - Manage location and behaviour of the pictures uploaded automatically - Auto upload videos - Manage location and behaviour of the videos uploaded automatically + Use this feature at your own risk. A malicious application could try to spoof you into unknowingly performing some actions, using other views. + Auto-upload pictures + Manage location and behavior of the pictures uploaded automatically + Auto-upload videos + Manage location and behavior of the videos uploaded automatically Picture uploads Automatically upload pictures taken by camera Picture upload path @@ -79,17 +79,17 @@ Show hidden files Log files Empty log folder! - Enable logging and log files will show up here + Enable logging and log files will show up here. Enable logging - This is used to log problems + This is used to log problems. Logging history - This shows the recorded logs + This shows the recorded logs. Delete history Help Sync your contacts, calendars and tasks Install DAVx⁵ Access document provider - Suggested app to browse the files of your device via the Android native file explorer + Suggested app to browse the files on your device via the Android native file explorer Recommend to a friend Feedback Imprint @@ -105,16 +105,16 @@ Enter your pattern Remove your pattern Incorrect pattern - Please re-enter your pattern - The patterns are not same - An error occurred while setting the pattern lock - An error occurred while removing the pattern lock - Pattern and passcode locks cannot be enabled at the same time, please disable pattern first - Pattern and passcode locks cannot be enabled at the same time, please disable passcode first - The pattern will not be asked anymore - The pattern will be requested every time the app is started + Please re-enter your pattern. + The patterns are not the same. + An error occurred while setting the pattern lock. + An error occurred while removing the pattern lock. + Pattern and passcode locks cannot be enabled at the same time, please disable pattern first. + Pattern and passcode locks cannot be enabled at the same time, please disable passcode first. + The pattern will not be asked for anymore. + The pattern will be requested every time the app is started. Locked - A valid ACTION is needed in the Intent passed to + A valid ACTION is needed in the intent passed to Files @@ -129,9 +129,9 @@ because Authentication failed - Your server version is lower than 10 so is not supported, please upgrade your server to newer version + Your server version is lower than 10 so is not supported, please upgrade your server to a newer version. Change account - The access token has expired or become invalid. Sign in again to regain access + The access token has expired or become invalid. Sign in again to regain access. Sign in Check server Server address https://… @@ -151,7 +151,7 @@ %1$s cannot upload a piece of text as a file. Received data do not include any valid file. File cannot be uploaded - %1$s is not allowed to read a received file + %1$s is not allowed to read a received file. File to upload was not found in its location. Please check whether the file exists. An error occurred while copying the file to a temporary folder. Please try to send again. seconds ago @@ -162,10 +162,10 @@ No shared links Upload some content or sync with your devices! No shares - You are not collaborating on other people\'s resources + You are not collaborating on other people\'s resources. You don\'t have access to any space! - Files and folders you mark as available offline will show up here - Files and folders you share by link will show up here + Files and folders you mark as available offline will show up here. + Files and folders you share by link will show up here. Loading… No app found for file type No app found for this action @@ -173,7 +173,7 @@ There are no folders in this folder. No matches for this search No uploads available. - Upload something and it will show up here + Upload something and it will show up here. folder folders file @@ -219,22 +219,22 @@ Upload succeeded %1$s uploaded Upload failed - Upload of %1$s could not be completed - Upload failed, you need to log in again - Server certificate is not trusted - Insert a name for the new file - Filename must not be empty - Filename must not be longer than %d characters - Filename + Upload of %1$s could not be completed. + Upload failed, you need to log in again. + Server certificate is not trusted. + Insert a name for the new file. + File name must not be empty. + File name must not be longer than %d characters. + File name Uploading camera upload files - %d new pictures will be uploaded - %d new videos will be uploaded - Camera Uploads failed - Picture uploads source path is not valid anymore - Video uploads source path is not valid anymore + %d new pictures will be uploaded. + %d new videos will be uploaded. + Camera uploads failed. + Picture uploads source path is not valid anymore. + Video uploads source path is not valid anymore. Uploading available offline files Uploading requested from wifi files - Server certificate is not trusted + Server certificate is not trusted. Uploads Current Failed (tap to retry) @@ -272,29 +272,29 @@ Unable to display the file Download of %1$s could not be completed Not downloaded yet - Download failed, you need to log in again + Download failed, you need to log in again. to download this file Choose account Sync failed - Sync failed, you need to log in again - Sync of %1$s could not be completed + Sync failed, you need to log in again. + Sync of %1$s could not be completed. Invalid password for %1$s Conflicts found %1$d kept-in-sync files could not be sync\'ed Kept-in-sync files failed Contents of %1$d files could not be sync\'ed (%2$d conflicts) - Folder %1$s does not exist anymore - - Please insert your passcode - Enter your passcode - Enter a new %1$d-digit passcode - The passcode will be requested every time the app is started - Please reenter your passcode - Remove your passcode - The passcodes are not the same + Folder %1$s does not exist anymore. + + Please insert your passcode. + Enter your passcode. + Enter a new %1$d-digit passcode. + The passcode will be requested every time the app is started. + Please reenter your passcode. + Remove your passcode. + The passcodes are not the same. Incorrect passcode - An error occurred while setting the passcode lock - An error occurred while removing the passcode lock + An error occurred while setting the passcode lock. + An error occurred while removing the passcode lock. Backspace button Biometric button @@ -311,9 +311,9 @@ Please, try again in %1$s - Register at least one biometric to use this feature + Register at least one biometric to use this feature. Biometric log in - Log in using your biometric credential + Log in using your biometric credential. Do you want to additionally activate biometric security? %1$s music player @@ -344,8 +344,8 @@ Connection established Testing connection Malformed server configuration - An account for the same user and server already exists in the device - The entered user does not match the user of this account + An account for the same user and server already exists on the device. + The entered user does not match the user of this account. Unknown error occurred! Server instance not found Wrong server address format @@ -361,7 +361,7 @@ Please enter the current password Connecting to authentication server … The server does not support this authentication method - Your server is not returning a correct user id, please contact an administrator + Your server is not returning a correct user ID. Please contact an administrator. Cannot authenticate to this server Account does not exist in the device yet @@ -381,7 +381,7 @@ Removal succeeded Removal failed Enter a new name - A folder that containing this file is available offline + A folder containing this file is available offline. "Local copy could not be renamed; try a different name" "Rename could not be completed" File already exists @@ -401,7 +401,7 @@ File name cannot be that long Wait a moment Checking stored credentials - "Unexpected problem ; please select the file from a different app" + "Unexpected problem; please select the file from a different app" No file was selected Send link to Copying file from private storage @@ -410,13 +410,13 @@ Connecting to OAuth2 server… Connection is not secure, http traffic is not allowed. - The identity of the server could not be verified - - The server certificate is not trusted - - The server certificate expired - - The server certificate valid dates are in the future + The identity of the server could not be verified. + - The server certificate is not trusted. + - The server certificate expired. + - The server certificate valid dates are in the future. - The URL does not match the hostname in the certificate Do you want to trust this certificate anyway? - The certificate could not be saved + The certificate could not be saved. Details Hide Issued to: @@ -438,7 +438,7 @@ The certificate could not be shown. - No information about the error - This is a placeholder + This is a placeholder. placeholder.txt PNG Image 389 KB @@ -446,34 +446,34 @@ 12:23:45 Confirm - Are you sure you want to disable this feature? The pending pictures will not be uploaded - Are you sure you want to disable this feature? The pending videos will not be uploaded - "Please make sure the folder selected is where the camera you are using saves the pictures taken. Otherwise, the feature will not be able to detect your pictures. Keep in mind that pictures will be uploaded in at least 15 minutes after taking them." - "Please make sure the folder selected is where the camera you are using saves the videos recorded. Otherwise, the feature will not be able to detect your videos. Keep in mind that videos will be uploaded in at least 15 minutes after recording them." + Are you sure you want to disable this feature? The pending pictures will not be uploaded. + Are you sure you want to disable this feature? The pending videos will not be uploaded. + "Please make sure the folder selected is where the camera you are using saves the pictures. Otherwise, the feature will not be able to detect your pictures. Keep in mind that pictures will be uploaded in at least 15 minutes after taking them." + "Please make sure the folder selected is where the camera you are using saves the videos. Otherwise, the feature will not be able to detect your videos. Keep in mind that videos will be uploaded in at least 15 minutes after recording them." File in conflict - There is a conflict in file %1$s, tap to solve it + There is a conflict in file %1$s, tap to solve it. Which files do you want to keep? If you select both versions, the local file will have a number added to its name. Keep both local version server version - An error occurred in the destination folder + An error occurred in the destination folder. Replace Image preview - This image cannot be shown + This image cannot be shown. - %1$s could not be copied to %2$s local folder + %1$s could not be copied to %2$s local folder. - It was not possible to retrieve the shares from server - It was not possible to retrieve users and groups from server - It was not possible to retrieve the capabilities from server + It was not possible to retrieve the shares from the server. + It was not possible to retrieve users and groups from the server. + It was not possible to retrieve the capabilities from the server. Sorry, sharing is not enabled on your server. Please contact your administrator. - It was not possible to share this file or folder - It was not possible to unshare this file or folder - It was not possible to update this file or folder + It was not possible to share this file or folder. + It was not possible to unshare this file or folder. + It was not possible to update this file or folder. Enter a password - You must enter a password + You must enter a password. Send @@ -485,11 +485,11 @@ Critical error: cannot perform operations - An error occurred while connecting with the server. - The server took too long to respond - The server took too long to connect - Server could not be reached - An error occurred in the network + An error occurred while connecting to the server. + The server took too long to respond. + The server took too long to connect. + Server could not be reached. + An error occurred in the network. You do not have permission %s @@ -501,7 +501,7 @@ to create the file to upload in this folder Upload not allowed - The file is no longer available on the server + The file is no longer available on the server. Accounts Add account @@ -518,22 +518,22 @@ Select inverse Move - Nothing in here. You can add a folder! + Nothing in here. You can add a folder. Choose - Move Here - Copy Here - You have no permissions to add content here! - - Unable to move. Please check whether the file exists - It is not possible to move a folder into a descendant - The file exists already in the destination folder - An error occurred while trying to move this file or folder + Move here + Copy here + You do not have permission to add content here! + + Unable to move. Please check whether the file exists. + It is not possible to move a folder into a descendant. + The file exists already in the destination folder. + An error occurred while trying to move this file or folder. to move this file - Unable to copy. Please check whether the file exists - It is not possible to copy a folder into a descendant - The file exists already in the destination folder - An error occurred while trying to copy this file or folder + Unable to copy. Please check whether the file exists. + It is not possible to copy a folder into a descendant. + The file exists already in the destination folder. + An error occurred while trying to copy this file or folder. to copy this file Camera uploads @@ -590,7 +590,7 @@ Password Secured Download / View - Download / View / Upload + Download/View/Upload Upload Only (File Drop) Get link Share with @@ -603,7 +603,7 @@ %1$s (remote) %1$s ( at %2$s ) - Sorry, your server version does not allow share with users within clients. + Sorry, your server version does not allow sharing with users within clients. \nPlease contact your administrator can share can edit @@ -630,39 +630,39 @@ Privacy policy Privacy policy An error has occurred: - Server is unavailable + Server is unavailable. - Streaming cannot be initialized because your server certificate is untrusted. File download will start automatically - This video format is not supported - This video file is no longer available in the server - Streaming is not allowed via crossed redirections - This video cannot be reproduced + Streaming cannot be initialized because your server certificate is untrusted. File download will start automatically. + This video format is not supported. + This video file is no longer available in the server. + Streaming is not allowed via crossed redirections. + This video cannot be reproduced. Video previewing is not supported in your Android version. File download will start automatically. \"Position not available\" - Device is not connected to a network - No public links created yet - This share has no link - Anyone with the link has access to the file/folder + Device is not connected to a network. + No public links created yet. + This share has no link. + Anyone with the link has access to the file/folder. ***** "Password *" "Expiration *" - The public link will expire no later than %1$d days after it is created + The public link will expire no later than %1$d days after it has been created. %1$s link - The password is empty - Private link: Only people who have access to the file/folder can use it. Use it as a permanent link for yourself or to point others to files within shares - Private link is not available for this file + The password is empty. + Private link: Only people who have access to the file/folder can use it. Use it as a permanent link for yourself or to point others to files within shares. + Private link is not available for this file. Downloads - See the download file name and progress + See the download file name and progress. Uploads - See the upload file name and progress + See the upload file name and progress. Music player See music player File sync See file sync result File conflicts - See file conflicts when they occur - You %1$d clicks away to enable developer menus + See file conflicts when they occur. + You are %1$d clicks away to enable developer menus Rate %1$s app! If you enjoy using this app, could you take a moment to rate it? Your feedback is very important for us. @@ -686,11 +686,11 @@ Your pictures/videos automatically uploaded Video streaming Play your videos without downloading them - No browser installed. Please install a Browser in order to allow a secure login. + No browser installed. Please install a browser in order to allow a secure login. it was not found - It was not possible to know if OAuth2 is supported - It was not possible to know the server base url + It was not possible to know if OAuth2 is supported. + It was not possible to know the server base URL. Log HTTP requests and responses Logs may contain sensitive information. Sharing logs with others is sole user responsibility @@ -703,7 +703,7 @@ Let\'s get started ⚠️ Your free space is currently limited on your device. Some files may not be migrated, please check that all downloaded files keep downloaded after the process has been completed. Migrate now - Migration completed successfully. Your files are now safer than ever before. + Migration completed successfully. Your files are now safer than ever. Access your files Migrating your files. Please don’t turn your device off. Working… Please wait @@ -727,33 +727,33 @@ Release note icon Support for Spaces - Introducing support for spaces feature (oCIS). Only available for newly logged-in accounts + Introducing support for spaces feature (Infinite Scale). Only available for newly logged-in accounts Bottom navigation bar Reordered some tabs End of support Lollipop This will be the last release with support for Android Lollipop (v5.0) Updated WebFinger flow - For WebFinger servers, lookup server will be requested first, and if not successful, regular authentication flow will be followed + For WebFinger servers, lookup server will be requested first, and if not successful, regular authentication flow will be followed. Permission handling - Now, when there is lack of permissions to perform some actions over a folder or a file, those actions will be hidden + Now, when there is lack of permissions to perform some actions over a folder or a file, those actions will be hidden. New "Manage notifications" setting - A new item has been added in the settings, which redirects to the app notifications settings of the device + A new item has been added in the settings, which redirects to the app notifications settings of the device. Minor bugfixes and improvements - Some minor bugs have been fixed, and minor technical improvements were introduced to improve the experience in the app + Some minor bugs have been fixed, and minor technical improvements were introduced to improve the experience in the app. Markdown support Markdown files rendered and displayed with proper format - List of providers (oCIS) - If your server supports app providers to open specific kind of files, all of them will be listed in Details view + List of providers (Infinite Scale) + If your server supports app providers to open specific kind of files, all of them will be listed in the Details view. Themed icons supported - Android 13 feature "Themed icons" will let you set app icon in monochrome - Create new documents via web (oCIS) - If oCIS server supports application providers, new documents can be created via browser and synced with oC + Android 13 feature "Themed icons" will let you set app icon in monochrome. + Create new documents via web (Infinite Scale) + If the Infinite Scale server supports application providers, new documents can be created via browser and synced with the server. New setting with app suggested to browse files - A new setting was added in "More" section with a suggested app to access files via document provider + A new setting was added in "More" section with a suggested app to access files via document provider. - Added 3 dot button to all list item - Added button to all list element to show a menu with all the options of the item - Improve details view + Added 3 dot button to all list items + Added button to all list elements to show a menu with all the options of the item. + Improved details view Redesign of the details view Support for new language change Added support for the new language change on Android 13+ @@ -764,21 +764,21 @@ Showing pop up on copy/move conflict Showing a 3 option pop up when having a naming conflict on copy or move action Minor bugfixes and improvements - Some minor bugs have been fixed, and minor technical improvements were introduced to improve the experience in the app - Http traffic banned - New accounts over servers running on http will not be longer allowed. Only https allowed + Some minor bugs have been fixed, and minor technical improvements were introduced to improve the experience in the app. + HTTP traffic banned + New accounts on servers running with HTTP will no longer be allowed. Only HTTPS is allowed. Open in web Open in %1$s (web) Couldn\'t open in web - there are no apps that support this file type - The requested file is not yet available, please try again later + There are no apps that support this file type. + The requested file is not yet available, please try again later. - oCIS accounts warning - Please, remove the account and login again to get the spaces feature + Infinite Scale accounts warning + Please remove the account and log in again to get the spaces feature. Don\'t show again Understood From 2c06b57bd96685e88a4ff7761cbaaf7f82be756b Mon Sep 17 00:00:00 2001 From: Edith Parzefall Date: Mon, 9 Oct 2023 14:54:04 +0200 Subject: [PATCH 2/4] Update owncloudApp/src/main/res/values/strings.xml Co-authored-by: Juan Carlos Garrote --- owncloudApp/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/owncloudApp/src/main/res/values/strings.xml b/owncloudApp/src/main/res/values/strings.xml index 5e30a4441c9..25be23c9350 100644 --- a/owncloudApp/src/main/res/values/strings.xml +++ b/owncloudApp/src/main/res/values/strings.xml @@ -129,7 +129,7 @@ because Authentication failed - Your server version is lower than 10 so is not supported, please upgrade your server to a newer version. + Your server version is lower than 10 so it is not supported, please upgrade your server to a newer version. Change account The access token has expired or become invalid. Sign in again to regain access. Sign in From 96c6fffb6c988ced74b1beb4d27d1f08d4edff56 Mon Sep 17 00:00:00 2001 From: Juan Carlos Garrote Date: Tue, 10 Oct 2023 08:40:43 +0200 Subject: [PATCH 3/4] Fixes in some strings --- owncloudApp/src/main/res/values/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/owncloudApp/src/main/res/values/strings.xml b/owncloudApp/src/main/res/values/strings.xml index 25be23c9350..c6f173ec2ee 100644 --- a/owncloudApp/src/main/res/values/strings.xml +++ b/owncloudApp/src/main/res/values/strings.xml @@ -448,8 +448,8 @@ Confirm Are you sure you want to disable this feature? The pending pictures will not be uploaded. Are you sure you want to disable this feature? The pending videos will not be uploaded. - "Please make sure the folder selected is where the camera you are using saves the pictures. Otherwise, the feature will not be able to detect your pictures. Keep in mind that pictures will be uploaded in at least 15 minutes after taking them." - "Please make sure the folder selected is where the camera you are using saves the videos. Otherwise, the feature will not be able to detect your videos. Keep in mind that videos will be uploaded in at least 15 minutes after recording them." + "Please make sure the folder selected is where the camera you are using saves the pictures taken. Otherwise, the feature will not be able to detect your pictures. Keep in mind that pictures will be uploaded in at least 15 minutes after taking them." + "Please make sure the folder selected is where the camera you are using saves the videos recorded. Otherwise, the feature will not be able to detect your videos. Keep in mind that videos will be uploaded in at least 15 minutes after recording them." File in conflict There is a conflict in file %1$s, tap to solve it. Which files do you want to keep? If you select both versions, the local file will have a number added to its name. @@ -518,7 +518,7 @@ Select inverse Move - Nothing in here. You can add a folder. + Nothing in here. You can add a folder! Choose Move here Copy here From 92a0100ab449a47bc7e9e9280550e85cc16bb2bf Mon Sep 17 00:00:00 2001 From: Juan Carlos Garrote Date: Wed, 11 Oct 2023 14:51:24 +0200 Subject: [PATCH 4/4] Fixes in UI tests due to string changes --- .../sharing/shares/ui/PublicShareCreationDialogFragmentTest.kt | 2 +- .../owncloud/android/sharing/shares/ui/ShareFileFragmentTest.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/PublicShareCreationDialogFragmentTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/PublicShareCreationDialogFragmentTest.kt index a79b9d0d36b..2b18770f54d 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/PublicShareCreationDialogFragmentTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/PublicShareCreationDialogFragmentTest.kt @@ -226,7 +226,7 @@ class PublicShareCreationDialogFragmentTest { publicShareCreationStatus.postValue( Event( UIResult.Error( - error = Throwable("It was not possible to share this file or folder") + error = Throwable("It was not possible to share this file or folder.") ) ) ) diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/ShareFileFragmentTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/ShareFileFragmentTest.kt index 99954f4cae3..1799858426c 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/ShareFileFragmentTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/ShareFileFragmentTest.kt @@ -291,7 +291,7 @@ class ShareFileFragmentTest { fun showError() { loadShareFileFragment( sharesUIResult = UIResult.Error( - error = Throwable("It was not possible to retrieve the shares from server") + error = Throwable("It was not possible to retrieve the shares from the server.") ) ) com.google.android.material.R.id.snackbar_text.withText(R.string.get_shares_error)