Michael Boke ba1270df2d Merge remote-tracking branch 'upstream/master' ... Conflicts: conf/app.ini		2014-10-03 22:51:07 +02:00
..
locale_de-DE.ini	Added some missing strings under the [action] category to german localization	2014-10-01 14:47:34 +02:00
locale_en-US.ini	UI: Confirmation box	2014-09-29 18:52:28 -04:00
locale_fr-CA.ini	typos	2014-09-16 20:58:17 -04:00
locale_nl-NL.ini	Added dutch translations	2014-10-03 22:43:42 +02:00
locale_zh-CN.ini	UI: Confirmation box	2014-09-29 18:52:28 -04:00