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

Continue translating plugins #2

Merged
merged 2 commits into from
Sep 2, 2020
Merged

Conversation

lisachev
Copy link
Contributor

Added File Explorer, Graph View, Quick Switcher, Page Preview, Open in default App, Daily note, Zettel, MD Converter

Added File Explorer, Graph View, Quick Switcher, Page Preview, Open in default App, Daily note, Zettel, MD Converter
@ericaxu
Copy link
Contributor

ericaxu commented Sep 2, 2020

Thank you for your work!

@ericaxu ericaxu merged commit ff3764f into obsidianmd:master Sep 2, 2020
ericaxu pushed a commit that referenced this pull request Jan 31, 2021
ericaxu pushed a commit that referenced this pull request Feb 1, 2021
ericaxu pushed a commit that referenced this pull request Mar 3, 2021
ericaxu pushed a commit that referenced this pull request Mar 4, 2021
ericaxu pushed a commit that referenced this pull request Dec 8, 2022
ryanjamurphy added a commit to ryanjamurphy/obsidian-docs that referenced this pull request Jan 7, 2023
Based on a conversation with a customer:
> Question is … the following two sentences seem to conflict (bold is mine):
> 
> 1- "You need to pay for Obsidian if and only if you use it to contribute, directly or indirectly, to revenue-generating, work-related activities in a company that has two or more people"
> 2- "You don't need a Commercial license if you work in any of the following settings: … Freelancing or companies with a single person". (And further clarified: "Unless you hire at least one additional person, you do not need a commercial license.")
> 
> What if both are true? I'm a self-employed consultant, and I work for a number of different clients at any point in time… so I am a freelancer, and my firm has one person, and I use it to contribute to work-related stuff at larger companies - not sure if that counts as 'direct', 'indirect', both, neither (in/'direct' is not defined).
> 
> Is obsidianmd#2 supposed to override obsidianmd#1? I think this is the intent, based on license clause B ('de minimis') preceding D (commercial).
ryanjamurphy added a commit to ryanjamurphy/obsidian-docs that referenced this pull request Jan 8, 2023
A customer made the following point:

> The following two sentences seem to conflict (bold is mine):
> 
> 1- "You need to pay for Obsidian if and only if you use it to contribute, directly or indirectly, to revenue-generating, work-related activities in a company that has two or more people"
> 2- "You don't need a Commercial license if you work in any of the following settings: … Freelancing or companies with a single person". (And further clarified: "Unless you hire at least one additional person, you do not need a commercial license.")
> 
> What if both are true? I'm a self-employed consultant, and I work for a number of different clients at any point in time… so I am a freelancer, and my firm has one person, and I use it to contribute to work-related stuff at larger companies - not sure if that counts as 'direct', 'indirect', both, neither (in/'direct' is not defined).
> 
> Is obsidianmd#2 supposed to override obsidianmd#1? I think this is the intent, based on license clause B ('de minimis') preceding D (commercial). 

So I'm proposing question 10 to clarify this possible contradiction. 

As a result, though, question 9 seemed like a stub. I think the answer should be expanded to be more useful to writers/bloggers — I've proposed a suggestion to do so.

Incidentally this PR also removes the capslocked "OBSIDIAN" mentions from the FAQ.
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.

2 participants