Manual merge from Branch3

This commit is contained in:
Oliver Duis
2011-03-20 11:38:27 +01:00
parent f9d74687b9
commit bfb5012eb4
9 changed files with 153 additions and 160 deletions

View File

@@ -521,6 +521,7 @@ PREFERENCES_DARKFRAMEFOUND;Found
PREFERENCES_DARKFRAMESHOTS;shots
PREFERENCES_DARKFRAMETEMPLATES;templates
PREFERENCES_DATEFORMAT;Date Format
PREFERENCES_DATEFORMATFRAME;Date Format
PREFERENCES_DATEFORMATHINT;<i>You can use the following formatting strings:</i>\n<b>%y</b><i> : year</i>\n<b>%m</b><i> : month</i>\n<b>%d</b><i> : day</i>\n<i>\nFor example, the hungarian date format is:</i>\n<b>%y/%m/%d</b>
PREFERENCES_DEFAULTLANG;Default language
PREFERENCES_DEFAULTTHEME;Default theme