wamo/Qvitter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Added "antisemitism" to terms and translated shortcuts list to German.



See merge request !66
This commit is contained in:
hannes 2016-09-07 08:58:32 -04:00
commit 52a213a707
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
doc/de/shortcuts.html Normal file
View File

@ -0,0 +1,13 @@
<h3>Aktionen</h3>
<p><span class="shortcut">n</span><span class="description">Neuer Queet</span></p>
<p><span class="shortcut">f</span><span class="description">Als Favorit markieren</span></p>
<p><span class="shortcut">r</span><span class="description">Antworten</span></p>
<p><span class="shortcut">t</span><span class="description">Requeet</span></p>
<p><span class="shortcut">Enter</span><span class="description">Queet erweitern</span></p>
<p><span class="shortcut">Ctrl</span><span class="shortcut">Enter</span>oder <span class="shortcut">Cmd ⌘</span><span class="shortcut">Enter</span><span class="description">Queet posten</span></p>
<p><span class="shortcut">Esc</span><span class="description">Alle erweiterten Queets zuklappen</span></p>
<h3>Navigation</h3>
<p><span class="shortcut">?</span><span class="description">Dieses Menu</span></p>
<p><span class="shortcut">j</span><span class="description">Nächster Queet</span></p>
<p><span class="shortcut">k</span><span class="description">Vorheriger Queet</span></p>

2
doc/de/terms.html
View File

@ -11,7 +11,7 @@ Struktur. Es ist hier deshalb möglich, Nutzer vor Belästigungen und Unterdrüc
Dieses geschieht aber ohne jegliche Zensur.</p>
<p>Auf {instance-name} werden Nutzer die andere Nutzer belästigen gelöscht. Wir gehen ebenfalls
konsequent gegen Rassismus, Sexismus, Behindertenfeindlichkeit, Homo- und Transphobie vor.
konsequent gegen Rassismus, Sexismus, Behindertenfeindlichkeit, Antisemitismus, Homo- und Transphobie vor.
Derartige Äußerungen würden diese Webseite unsicher für andere Nutzer machen und deren
Meinungsfreiheit einschränken.</p>

2
doc/en/terms.html
View File

@ -9,7 +9,7 @@ of flat power structure. We are enabled to protect eachother from harassment and
but without centralized censorship.</p>
<p>On this instance, users who harass others will be removed. We also take a strong stance
against e.g. racism, sexism, ableism, homo- and transphobia. Such expressions make the
against e.g. racism, sexism, ableism, antisemitism, homo- and transphobia. Such expressions make the
site unsafe for other users, and in practice limit their freedom of speech.</p>
<p>The Public Timeline is considered an especially sensitive place. It is what new users see,