Merge branch 'release/1.3' into feature/imgur_via_greenshotweb

This commit is contained in:
Robin Krom 2021-01-02 22:02:27 +01:00
commit 411943d5b6

View file

@ -9,6 +9,7 @@
Greenshot comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to redistribute it under certain conditions. Greenshot comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to redistribute it under certain conditions.
Details about the GNU General Public License:</resource> Details about the GNU General Public License:</resource>
<resource name="about_title">About Greenshot</resource> <resource name="about_title">About Greenshot</resource>
<resource name="about_translation"><!-- diplayed in about dialog, use to add credits or other translation-related info, e.g. "English translation by Jane Doe" --></resource>
<resource name="application_title">Greenshot - the revolutionary screenshot utility</resource> <resource name="application_title">Greenshot - the revolutionary screenshot utility</resource>
<resource name="bugreport_cancel">Close</resource> <resource name="bugreport_cancel">Close</resource>
<resource name="bugreport_info">Sorry, an unexpected error occured. <resource name="bugreport_info">Sorry, an unexpected error occured.