Merge branch 'main' into next-v4

src/main/java/com/crowdin/cli/commands/functionality/TranslationsUtils.java

@@ -43,6 +43,8 @@ public static String replaceDoubleAsterisk(String sourcePattern, String translat
                             } else {
                                 sourceFile = "";
                             }
+                        } else if (Utils.noSepAtStart(s).length() > 0 && sourceFile.startsWith(Utils.noSepAtStart(s))) {
+                            sourceFile = "";
                         }
                     }
                 } else if (sourceFile.contains(".")) {

src/main/resources/messages/messages.properties

@@ -193,7 +193,7 @@ crowdin.string.comment.usage.description=Add a comment to the given string
 crowdin.string.comment.usage.customSynopsis=@|fg(green) crowdin string comment|@ <text> [CONFIG OPTIONS] [OPTIONS]
 crowdin.string.comment.text=String comment text
 crowdin.string.comment.string-id=Numeric string identifier
-crowdin.string.comment.language=Target language the comment will belong to
+crowdin.string.comment.language=Target language to which the comment belongs
 crowdin.string.comment.type=Defines the comment type. Supported types: comment, issue
 crowdin.string.comment.issue-type=Defines the issue type. Supported types: general_question, translation_mistake, context_request, source_mistake
 
@@ -291,7 +291,7 @@ crowdin.tm.download.id=Translation memory identifier
 crowdin.tm.download.format=Format of the file. Supported formats: tmx, csv, xlsx
 crowdin.tm.download.source-language-id=Defines source language in the language pair
 crowdin.tm.download.target-language-id=Defines target language in the language pair
-crowdin.tm.download.to=Path the translation memory should be downloaded to
+crowdin.tm.download.to=Path where the translation memory should be downloaded
 
 # CROWDIN BUNDLE DOWNLOAD COMMAND
 crowdin.bundle.download.id=Numeric ID of the bundle
@@ -710,23 +710,23 @@ message.screenshot.list=@|yellow #%d|@ @|bold %s|@ @|green %d tags|@
 message.task.list=@|yellow #%d|@ @|bold %s|@ @|green %s|@
 message.task.list.verbose=@|yellow #%d|@ @|bold %s|@ @|green '%s'|@ @|bold %s|@ @|yellow %d|@ @|red %s|@
 message.task.list_empty=No tasks found
-message.task.added=@|green,bold Task '%s'|@ @|green added successfully|@
+message.task.added=@|green,bold Task '%s'|@ @|green has been successfully added|@
 
 message.distribution.list=@|yellow %s|@ @|bold %s|@
 message.distribution.list_empty=No distributions found
-message.distribution.added=@|green,bold Distribution '%s'|@ @|green added successfully|@
-message.distribution.released=@|green,bold Distribution '%s'|@ @|green released successfully|@
+message.distribution.added=@|green,bold Distribution '%s'|@ @|green has been successfully added|@
+message.distribution.released=@|green,bold Distribution '%s'|@ @|green has been successfully released|@
 
-message.bundle.download_success=@|yellow #%d|@ @|green,bold '%s'|@ @|green downloaded successfully|@
+message.bundle.download_success=@|yellow #%d|@ @|green,bold '%s'|@ @|green has been successfully downloaded|@
 message.bundle.list=@|yellow #%d|@ @|bold %s|@ @|green %s|@ @|red %s|@
 message.bundle.list_empty=No bundles found
-message.bundle.added=@|green,bold Bundle #%s '%s'|@ @|green added successfully|@
+message.bundle.added=@|green,bold Bundle #%s '%s'|@ @|green has been successfully added|@
 
 message.comment.list=@|yellow #%d|@ @|bold %s|@
 message.comment.list.verbose=@|yellow #%d|@ @|bold %s|@ @|green %s|@ @|bold %s|@
 message.comment.list_empty=No comments found
-message.comment.resolved=@|green String comment|@ @|yellow #%s|@ @|green successfully resolved|@
-message.comment.added=@|green Comment|@ @|yellow #%s|@ @|green,bold '%s'|@ @|green added successfully|@
+message.comment.resolved=@|green A string issue|@ @|yellow #%s|@ @|green has been successfully resolved|@
+message.comment.added=@|green A comment|@ @|yellow #%s|@ @|green,bold '%s'|@ @|green has been successfully added|@
 
 message.pre_translate.local_files_message=Out of %d files, only %d of them were found locally. Use '--verbose' to list them
 message.pre_translate.local_files_message_verbose=Out of %d files, %d of them were found locally:
@@ -749,16 +749,16 @@ message.html_page.main_text_exception=Something went wrong.
 message.html_page.close_page_text=You may now close this page.
 message.html_page.body=<link href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;600&display=swap" rel="stylesheet"> <style type="text/css">* { font-family: 'Open Sans', sans-serif; }</style> <title>%s</title><br/><br/><br/><div><h1 style='text-align: center;'>%s</h1><p style='text-align: center;'>%s</p></div>
 
-message.no_manager_access=You need to have @|yellow manager access|@ in the project to perform this action
-message.no_manager_access_in_upload_sources=You need to have @|yellow manager access|@ in the project to apply 'excluded-languages' or/and 'delete-obsolete' options
-message.no_manager_access_in_upload_sources_dryrun=You need to have @|yellow manager access|@ in the project to apply 'delete-obsolete' options
+message.no_manager_access=You must have @|yellow manager or developer role|@ in the project to perform this action
+message.no_manager_access_in_upload_sources=You must have @|yellow manager or developer role|@ in the project to apply 'excluded-languages' or/and 'delete-obsolete' options
+message.no_manager_access_in_upload_sources_dryrun=You must have @|yellow manager or developer role|@ in the project to apply 'delete-obsolete' options
 
 message.warning.not_yml=File @|bold '%s'|@ is not a YAML or YML file
 message.warning.browser_not_found=\nError opening a web browser. Please open the following link manually:\n@|bold %s|@
 message.warning.file_not_uploaded_cause_of_language=Translation file @|yellow,bold '%s'|@ @|yellow hasn't been uploaded|@ since @|bold %s|@ is not enabled as a target language for the source file in your Crowdin project
 message.warning.auto_approve_option_with_mt='--auto-approve-option' is used only for the TM Pre-Translation method
 message.warning.no_file_to_download=Couldn't find any file to download
-message.warning.no_file_to_download_skipuntranslated=Couldn't find any file to download. As you are using the 'Skip untranslated files' option, please make sure you have fully translated files
+message.warning.no_file_to_download_skipuntranslated=Couldn't find any file to download. Since you are using the 'Skip untranslated files' option, please make sure you have fully translated files
 message.warning.another_build_in_progress=Another build is currently in progress. Please wait until it's finished
 message.spinner.fetching_project_info=Fetching project info
 message.spinner.building_translations=Building translations

src/test/java/com/crowdin/cli/commands/functionality/TranslationsUtilsTest.java

@@ -63,6 +63,16 @@ static Stream<Arguments> testReplaceDoubleAsterisk() {
                 Utils.normalizePath("/%two_letters_code%/**/%original_file_name%"),
                 Utils.normalizePath("en/here/file.po"),
                 Utils.normalizePath("/%two_letters_code%/here/%original_file_name%")),
+            arguments(
+                Utils.normalizePath("/en/**/folder/*.po"),
+                Utils.normalizePath("/%two_letters_code%/**/%original_file_name%"),
+                Utils.normalizePath("en/folder/file.po"),
+                Utils.normalizePath("/%two_letters_code%/%original_file_name%")),
+            arguments(
+                Utils.normalizePath("/en/**/folder/*.po"),
+                Utils.normalizePath("/%two_letters_code%/**/folder/%original_file_name%"),
+                Utils.normalizePath("en/here/folder/file.po"),
+                Utils.normalizePath("/%two_letters_code%/here/folder/%original_file_name%")),
             arguments(
                 Utils.normalizePath("/*/**/*.po"),
                 Utils.normalizePath("/%two_letters_code%/**/%original_file_name%"),