Skip to content

Fix typo #6936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 1 commit into from
Oct 24, 2017
+1 −1
Merged

Fix typo #6936

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/files/templates/list.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="actions creatable hidden">
<div id="uploadprogresswrapper">
<div id="uploadprogressbar">
<em class="label outer" style="display:none"><span class="desktop"><?php p($l->t('Uploading @'));?></span><span class="mobile"><?php p($l->t('…'));?></span></em>
<em class="label outer" style="display:none"><span class="desktop"><?php p($l->t('Uploading…'));?></span><span class="mobile"><?php p($l->t('…'));?></span></em>

@ChristophWurst ChristophWurst Oct 24, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

At least in Mail, @jancborchardt always tells me that there should be a space between the last word and the …. In case this applies here too, we should have it consistent like Uploading …

@rakekniven rakekniven Oct 24, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Some of the translators at Transifex changed hundreds of occurences the last year.

@comradekingu Do you have a link or explanation at hand to prove our changes?

@comradekingu comradekingu Oct 24, 2017 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@rakekniven @ChristophWurst
"Word …" is the official convention, for single action words in infinite form. Actual use is both ways. As long as it isn't tripledot, it isn't erroneous in English.
What I don't understand is why " @" is replaced by "…", outside of the spacing issue.

@MorrisJobke MorrisJobke Oct 24, 2017

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

The @ was the typo that should be fixed by this here. I will fix the spacing in a followup PR, okay?

@MorrisJobke MorrisJobke Oct 24, 2017

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Fix is in #6940

</div>
<button class="stop icon-close" style="display:none">
<span class="hidden-visually"><?php p($l->t('Cancel upload')) ?></span>
Expand Down