Skip to content
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

Translation sync #631

Merged
merged 303 commits into from
Mar 3, 2020
Merged

Translation sync #631

merged 303 commits into from
Mar 3, 2020

Conversation

hosy
Copy link
Collaborator

@hosy hosy commented Feb 26, 2020

Description

Get the latest translation into Transifex and back into the App.

Motivation and Context

Translate all keys in all all languages.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

ownCloud Jenkins and others added 30 commits June 14, 2019 10:01
- Make Info.plist for app, File Provider and File Provider UI use it
…e server response was cut off, prompting a retry and resulting in a "item already exists" error
# Conflicts:
#	ownCloud/Resources/de-DE.lproj/Localizable.strings
#	ownCloud/Resources/de.lproj/Localizable.strings
#	ownCloud/Resources/es.lproj/Localizable.strings
#	ownCloud/Resources/pt-BR.lproj/Localizable.strings
#	ownCloud/Resources/sq.lproj/Localizable.strings
#	ownCloud/Resources/th-TH.lproj/Localizable.strings
#	ownCloud/Resources/zh-Hans.lproj/Localizable.strings
- uploads use new OCCoreOptionAutomaticConflictResolutionNameStyle option to automatically resolve naming conflicts during upload
- Duplicate action uses the new OCCore name suggestion API to
	- determine naming conflicts and resolve them automatically
	- match the name style of the file to duplicate, f.ex.
		- duplicating "File copy.jpg" will create "File copy 2.jpg"
		- duplicating "File (1).jpg" will create "File (2).jpg"
		- duplicating "File Kopie 2.jpg" will create "File Kopie 3.jpg"
- folder creation uses the new OCCore name suggestion API to
	- detect naming conflicts beforehand
	- pre-fill the new folder name name with an unused name directly
…es will be deleted to give the user a UI feedback
…y log file using new SDK protocol

- Show SDK commit hash in Settings
hosy and others added 23 commits February 10, 2020 17:52
- added ImageSystemName key value to show native system icons on iOS 13
- added missing release notes since version 1.2.0
# Conflicts:
#	ios-sdk
#	ownCloud Intents/Info.plist
#	ownCloud/AppDelegate.swift
#	ownCloud/Resources/es.lproj/Localizable.strings
#	ownCloud/Resources/sq.lproj/Localizable.strings
#	ownCloud/Resources/th-TH.lproj/Localizable.strings
# Conflicts:
#	ios-sdk
#	ownCloud/Resources/ar.lproj/Localizable.strings
#	ownCloud/Resources/eu.lproj/Localizable.strings
# Conflicts:
#	ios-sdk
#	ownCloud/Resources/de.lproj/Localizable.strings
#	ownCloud/Resources/ru.lproj/Localizable.strings
@CLAassistant
Copy link

CLAassistant commented Mar 3, 2020

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
3 out of 4 committers have signed the CLA.

✅ hosy
✅ dschmidt
✅ jesmrec
❌ felix-schwarz
You have signed the CLA already but the status is still pending? Let us recheck it.

@hosy hosy requested review from jesmrec and mneuwert March 3, 2020 13:14
@hosy hosy merged commit e4cb434 into release/1.3.1 Mar 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants