merges with master

This commit is contained in:
kikito
2015-10-19 20:16:58 +02:00
51 changed files with 513 additions and 331 deletions

View File

@@ -311,6 +311,8 @@ en:
shared:
tags_cloud:
tags: Trend
print:
print_button: "Print this info"
flag: Flag as inappropriate
unflag: Undo flag
collective: Collective