Merge branch 'flameshot-org-master' into feature/RND-656-flameshot-ability-to-lock-switching-between-s3-and-imgur-and-use-s3-only

# Conflicts:
#	data/translations/Internationalization_eu.ts
This commit is contained in:
Yuriy Puchkov
2020-10-06 16:13:45 +03:00
3 changed files with 315 additions and 635 deletions

View File

@@ -21,7 +21,7 @@ Comment[sk]=Mocný, no tiež jednoduchý softvér na zachytávanie obrazovky.
Comment[sr]=Једноставан, а моћан алат за снимање екрана
Comment[uk]=Потужний простий у використанні додаток для створення знімків екрану.
Comment[es]=Software de captura de pantalla potente y fácil de usar.
Comment[de]=Einfache, umfängliche Sreenshot-Software
Comment[de]=Schlichte, leistungsstarke Screenshot-Software
Keywords=flameshot;screenshot;capture;shutter;
Keywords[zh_CN]=flameshot;screenshot;capture;shutter;截图;屏幕;
Keywords[fr]=flameshot;capture d'écran;capter;shutter;