Commit Graph

980 Commits

Author SHA1 Message Date
Hannes Mannerheim
f03904a1e3 remove some stuff that librejs threw "parsing error" on for unknown reason. hopefully we don't need it 2016-03-12 15:09:28 +01:00
Hannes Mannerheim
88d8a8c1af add license that librejs understands 2016-03-12 15:08:46 +01:00
Hannes Mannerheim
0273158e47 replace unicode characters that librejs messes up 2016-03-12 15:08:22 +01:00
hannes
69f00546f7 Merge branch 'master' into 'master'
Updated Norwegian translation

Updated Norwegian translation

See merge request !46
2016-03-10 13:46:16 -05:00
abjectio
d1f04b3b9a Updated Norwegian translation 2016-03-10 19:20:43 +01:00
hannes
df49cd0d81 Merge branch 'patch-4' into 'master'
changed "stummschalten" into "sperren", "Sandkasten" into "Sandbox"



See merge request !43
2016-03-10 07:44:35 -05:00
hannes
9d81edfc67 Merge branch 'patch-5' into 'master'
Update some minor fixes

Translating it several times makes me do it quicker and quicker so I missed some words. Sorry about that.

See merge request !44
2016-03-10 07:43:29 -05:00
Moshpirit
b95e2a821a Update some minor fixes 2016-03-08 03:37:09 -05:00
Walter Sobchak
46841df539 changed "stummschalten" into "sperren", "Sandkasten" into "Sandbox" 2016-03-08 02:22:50 -05:00
Hannes Mannerheim
bcde8938b8 notices no longer get is_local=-1 for sandboxed users, so this info does not apply to newer gnu social 2016-03-08 01:36:01 +01:00
Hannes Mannerheim
72a21c07b0 new swedish words for silenced and sandboxed 2016-03-08 01:29:28 +01:00
hannes
ab46159b5c Merge branch 'patch-3' into 'master'
some translations updated



See merge request !42
2016-03-07 17:14:01 -05:00
Walter Sobchak
ab7cdc0b1f some translations updated 2016-03-07 16:04:14 -05:00
Hannes Mannerheim
0edcf5764c really fixes #15 2016-03-07 20:51:05 +01:00
Hannes Mannerheim
82da438dfb fixes #15 2016-03-07 20:33:21 +01:00
Hannes Mannerheim
6f732e3839 more rtl fix 2016-03-07 20:19:18 +01:00
hannes
72c7b97c38 Merge branch 'patch-3' into 'master'
Update Spanish translations (third merge request)

Finally, this is the Spanish translations for Qvitter in its last version (4/3/16)

See merge request !40
2016-03-07 14:17:23 -05:00
Moshpirit
11e177e724 Update Spanish translations (third merge request) 2016-03-07 14:03:09 -05:00
Hannes Mannerheim
c14a78a40a rtl fixes #45 2016-03-07 19:35:20 +01:00
hannes
a860b5c1eb Merge branch 'patch-1' into 'master'
Corrección de errores y traducción de lo faltante

Hola, buenas:

He corregido algunos errores de traducción (ortografía, gramática, etc.) y terminado de traducir lo faltante mediante la terminología que considero adecuada.

Un saludo.

See merge request !37
2016-03-07 12:44:00 -05:00
Hannes Mannerheim
351a1fc461 this actually solves #46 2016-03-07 18:43:01 +01:00
Hannes Mannerheim
e321f40a64 hopefully fixes #46 2016-03-07 18:35:25 +01:00
Hannes Mannerheim
6494335e79 incompatible with older gs, and unnecessary 2016-03-07 18:35:03 +01:00
Hannes Mannerheim
6ecf09bf5c fixes #47 2016-03-07 18:05:58 +01:00
Hannes Mannerheim
a743c6994e escape html in fullname !35 2016-03-07 17:45:40 +01:00
Hannes Mannerheim
be1d393706 some svg that someone might find useful 2016-03-07 17:44:52 +01:00
Hannes Mannerheim
17a2b7d7ee manual merge of !38 by @grmpyoldman because of merge conflict 2016-03-07 17:01:10 +01:00
hannes
84550f6d95 Merge branch 'patch-2' into 'master'
and german translations for lines 180–197…

just added some more missing translations for the lines 180–197…

See merge request !39
2016-03-07 10:57:44 -05:00
Grumpy OldMan
db3ffd5249 and german translations for lines 180–197… 2016-03-07 08:01:21 -05:00
Adrián
aac20dab52 He corregido algunos errores de traducción presentes y terminado de traducir lo faltante mediante la terminología que considero adecuada.
Un saludo.
2016-03-05 13:29:45 -05:00
Hannes Mannerheim
afb3c6450d add userArray in script tag in profile cards, to be used by e.g. plugins 2016-03-05 14:50:30 +01:00
hannes
68b3d377e8 Merge branch 'mediafile_fromfilehandle_avatar' into 'master'
MediaFile::fromFilehandle on profile avatar upload

This is mainly because I in GNU social want to change the constructor of
MediaFile and thus use fromFilehandle in Qvitter, so we don't have to sync
the changes as much.

This also will make sure that uploaded files can be reused if they match a
SHA256 hash of the avatar we want to set. Parts of my rewriting also provide
a pretty good example of how we can reuse existing File entries as Avatar sources.

See merge request !34
2016-03-05 04:57:46 -05:00
hannes
cafa618671 Merge branch 'patch-1' into 'master'
German translation edited and new translations added.



See merge request !33
2016-03-05 04:53:38 -05:00
Hannes Mannerheim
e224d98593 dutch update by @discussthang 2016-03-05 10:51:37 +01:00
Mikael Nordfeldth
2dbd6c539c FileNotFoundException won't be thrown if MediaFile works as it should
In newer GNU social MediaFile will make sure the local file exists, if
we're trying to upload something that matches by hash in the File table.
For the current 'master' when I'm pushing this that won't be handled
correctly, but then again it would only be a problem if something has
been f'd already and you're missing files from the filesystem that are
listed in the File table.
2016-03-05 02:30:28 +01:00
Mikael Nordfeldth
0e0a92638f Profile banner and background uploads with MediaFile::fromFilehandle 2016-03-05 02:27:58 +01:00
Mikael Nordfeldth
3bbfabfd4b Don't keep $this->img in memory the whole time 2016-03-05 01:52:16 +01:00
Mikael Nordfeldth
04eefb7836 MediaFile::fromFilehandle on profile avatar upload
This is mainly because I in GNU social want to change the constructor of
MediaFile and thus use fromFilehandle in Qvitter, so we don't have to sync
the changes as much.

This also will make sure that uploaded files can be reused if they match a
SHA256 hash of the avatar we want to set. Parts of my rewriting also provide
a pretty good example of how we can reuse existing File entries as Avatar sources.
2016-03-05 01:35:18 +01:00
Walter Sobchak
6f7370ad4b Übersetzung überarbeitet und weitere Übersetzungen. 2016-03-04 17:34:59 -05:00
Hannes Mannerheim
9bf92d11aa mute and bugfixes 2016-03-04 23:07:15 +01:00
hannes
4d5b8e2907 Merge branch 'master' into 'master'
Various grammar fixes to the eo translation



See merge request !31
2016-03-04 17:01:39 -05:00
hannes
40eed77d50 Merge branch 'master' into 'master'
Updated norwegian translation

Updated norwegian translation

See merge request !32
2016-03-04 17:01:25 -05:00
abjectio
974d964905 Updated norwegian translation 2016-03-04 20:57:11 +01:00
Nicolas Maia
d87cc71034 various grammar fixes to the eo translation 2016-03-04 16:46:49 -03:00
hannes
56e55bb253 Merge branch 'master' into 'master'
Update Esperanto translations

This is an update of the esperanto translations to include all previously untranslated strings. I have used the same vocabulary as the rest of the document where possible.

See merge request !30
2016-03-03 17:52:41 +00:00
hannes
9139b33bb4 Merge branch 'master' into 'master'
Update Brazilian Portuguese translation



See merge request !29
2016-03-03 17:52:25 +00:00
reality
08a35313a1 oops forgot one 2016-03-03 14:00:01 +00:00
reality
1f0e63cfa8 some fixes after review 2016-03-03 13:58:32 +00:00
reality
db30b4487b esperanto translations 2016-03-03 12:17:54 +00:00
Alexei Ivanov
3199c944c0 Update Brazilian Portuguese translation 2016-03-02 20:38:57 -03:00