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.

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

Backport of translation string fixes #6935

Merged
merged 4 commits into from Oct 25, 2017

Conversation

Projects
None yet
4 participants
@MorrisJobke
Member

MorrisJobke commented Oct 24, 2017

MorrisJobke and others added some commits Aug 23, 2017

Replace ... with …
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Update file-upload.js
Fixed tiny translation issues. Removed space before ellipsis.
@rakekniven

Common grammar at Nextcloud

@jancborchardt

This comment has been minimized.

Show comment
Hide comment
@jancborchardt

jancborchardt Oct 24, 2017

Member

Good on using proper ellipsis, but as in the other one please with space like "Uploading …" :)

Member

jancborchardt commented Oct 24, 2017

Good on using proper ellipsis, but as in the other one please with space like "Uploading …" :)

Add space between ellipsis and word
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@codecov

This comment has been minimized.

Show comment
Hide comment
@codecov

codecov bot Oct 24, 2017

Codecov Report

Merging #6935 into stable12 will decrease coverage by <.01%.
The diff coverage is n/a.

@@              Coverage Diff               @@
##             stable12    #6935      +/-   ##
==============================================
- Coverage       53.76%   53.75%   -0.01%     
  Complexity      22577    22577              
==============================================
  Files            1384     1384              
  Lines           86622    86622              
  Branches         1329     1329              
==============================================
- Hits            46569    46567       -2     
- Misses          40053    40055       +2
Impacted Files Coverage Δ Complexity Δ
apps/files/templates/list.php 0% <ø> (ø) 0 <0> (ø) ⬇️
lib/private/Files/Cache/Propagator.php 94.93% <0%> (-1.27%) 16% <0%> (ø)
apps/files_trashbin/lib/Trashbin.php 72.28% <0%> (-0.25%) 136% <0%> (ø)

codecov bot commented Oct 24, 2017

Codecov Report

Merging #6935 into stable12 will decrease coverage by <.01%.
The diff coverage is n/a.

@@              Coverage Diff               @@
##             stable12    #6935      +/-   ##
==============================================
- Coverage       53.76%   53.75%   -0.01%     
  Complexity      22577    22577              
==============================================
  Files            1384     1384              
  Lines           86622    86622              
  Branches         1329     1329              
==============================================
- Hits            46569    46567       -2     
- Misses          40053    40055       +2
Impacted Files Coverage Δ Complexity Δ
apps/files/templates/list.php 0% <ø> (ø) 0 <0> (ø) ⬇️
lib/private/Files/Cache/Propagator.php 94.93% <0%> (-1.27%) 16% <0%> (ø)
apps/files_trashbin/lib/Trashbin.php 72.28% <0%> (-0.25%) 136% <0%> (ø)
@MorrisJobke

This comment has been minimized.

Show comment
Hide comment
@MorrisJobke

MorrisJobke Oct 24, 2017

Member

Good on using proper ellipsis, but as in the other one please with space like "Uploading …" :)

Done.

Member

MorrisJobke commented Oct 24, 2017

Good on using proper ellipsis, but as in the other one please with space like "Uploading …" :)

Done.

Merge vendor/core.js
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobke

This comment has been minimized.

Show comment
Hide comment
@MorrisJobke

MorrisJobke Oct 25, 2017

Member

vendor/core.js was outdated on stable12 -> fixed.

Member

MorrisJobke commented Oct 25, 2017

vendor/core.js was outdated on stable12 -> fixed.

@MorrisJobke MorrisJobke merged commit 7ec5689 into stable12 Oct 25, 2017

@MorrisJobke MorrisJobke deleted the 12-5780 branch Oct 25, 2017

@MorrisJobke MorrisJobke referenced this pull request Nov 20, 2017

Merged

12.0.4 RC #7225

1 of 1 task complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment