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

[stable9] Fix some ownCloud/Nextcloud references #170

Merged
merged 3 commits into from
Jun 20, 2016

Conversation

schiessle
Copy link
Member

Fix some references for stable9

cc @MorrisJobke @LukasReschke

@schiessle schiessle added the 3. to review Waiting for reviews label Jun 20, 2016
@schiessle schiessle changed the title Fix some ownCloud/Nextcloud references [stable9] Fix some ownCloud/Nextcloud references Jun 20, 2016
@@ -44,7 +44,7 @@
"New recovery key password" : "Nouveau mot de passe de la clé de récupération",
"Repeat new recovery key password" : "Répétez le nouveau mot de passe de la clé de récupération",
"Change Password" : "Changer de mot de passe",
"ownCloud basic encryption module" : "Module de chiffrement de base d'ownCloud",
"Nextcloud basic encryption module" : "Module de chiffrement de base d'Nextcloud",
Copy link
Member

Choose a reason for hiding this comment

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

Pretty sure this is wrong but 🙈 😉

Copy link
Member

Choose a reason for hiding this comment

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

  • It should be de Nextcloud instead of d'Nextcloud because N is not an vowel 😁
  • However: I think de chiffrement de base de Nexcloud is a bit overloaded with de's 😅 I think we can remove some of them ... but don't ask me which, because you don't want to ask what my grade in french is 😄

Copy link
Member Author

Choose a reason for hiding this comment

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

we should probably call it just "default encryption module", That's also how it is already called internally. But let's do this on master independently.

@LukasReschke
Copy link
Member

LGTM

@MariusBluem
Copy link
Member

Is this a backport 😕

@schiessle
Copy link
Member Author

@Mar1u5 it is basically a backport of #162 without changing strings in order not to break translations.

@MorrisJobke
Copy link
Member

👍

@MorrisJobke MorrisJobke merged commit 4ca0963 into stable9 Jun 20, 2016
@MorrisJobke MorrisJobke deleted the fix-references-stable9 branch June 20, 2016 14:02
@MorrisJobke MorrisJobke added this to the Nextcloud 9.1 milestone Jun 20, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants