Skip to content

Conversation

@XTorLukas
Copy link
Contributor

@XTorLukas XTorLukas commented May 31, 2024

Resolved / Related Issues

To prevent extra work, all changes to the Files codebase must link to an approved issue marked as Ready to build. Please insert the issue number following the hashtag with the issue number that this Pull Request resolves.

TODO list: #15503 (comment)

Fix word order problem

☑️ ConflictingItemsDialogSubtitleMultipleConflictsMultipleNonConflicts, ConflictingItemsDialogSubtitleSingleConflictMultipleNonConflicts, ConflictingItemsDialogSubtitleSingleConflictNoNonConflicts, ConflictingItemsDialogSubtitleMultipleConflictsNoNonConflicts ----> ConflictingItemsDialogSubtitleConflicts, ConflictingItemsDialogSubtitleConflictsNonConflicts

<data name="ConflictingItemsDialogSubtitleMultipleConflictsMultipleNonConflicts" xml:space="preserve">
<value>There are {0} conflicting file names, and {1} outgoing item(s).</value>
</data>

<data name="ConflictingItemsDialogSubtitleSingleConflictMultipleNonConflicts" xml:space="preserve">
<value>There is one conflicting file name, and {0} outgoing item(s).</value>
</data>

<data name="ConflictingItemsDialogSubtitleMultipleConflictsNoNonConflicts" xml:space="preserve">
<value>There are {0} conflicting file names.</value>
</data>
<data name="ConflictingItemsDialogSubtitleSingleConflictNoNonConflicts" xml:space="preserve">
<value>There is one conflicting file name.</value>
</data>

☑️ PropertiesFilesFoldersAndLocationsCountString ----> PropertiesFilesAndFoldersAndLocationsCountString

<data name="PropertiesFilesFoldersAndLocationsCountString" xml:space="preserve">
<value>{0:#,##0} files, {1:#,##0} folders from {2:#,##0} locations</value>
</data>

@XTorLukas
Copy link
Contributor Author

@hishitetsu Check if solved

@XTorLukas XTorLukas requested a review from hishitetsu May 31, 2024 15:44
Copy link
Member

@hishitetsu hishitetsu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Member

@0x5bfa 0x5bfa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code became beter 👍

@yaira2 yaira2 merged commit 03ca804 into files-community:main Jun 2, 2024
@yaira2 yaira2 added the ready to merge Pull requests that are approved and ready to merge label Jun 2, 2024
@XTorLukas XTorLukas deleted the xtorlukas/Fix-ProblemForLanguageDiffWordOrder branch June 2, 2024 07:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready to merge Pull requests that are approved and ready to merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants