diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index 5c21a028017e0511a71c0e9a3709871c61955c74..c736d122294c974588d00bf802b7f8d051d7e53d 100644
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -33,8 +33,8 @@ $weekdays = array('monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'satur
 				var oc_cal_dayshort = new Array("<?php echo $l -> t("Sun.");?>", "<?php echo $l -> t("Mon.");?>", "<?php echo $l -> t("Tue.");?>", "<?php echo $l -> t("Wed.");?>", "<?php echo $l -> t("Thu.");?>", "<?php echo $l -> t("Fri.");?>", "<?php echo $l -> t("Sat.");?>");
 				var oc_cal_monthlong = new Array("<?php echo $l -> t("January");?>", "<?php echo $l -> t("February");?>", "<?php echo $l -> t("March");?>", "<?php echo $l -> t("April");?>", "<?php echo $l -> t("May");?>", "<?php echo $l -> t("June");?>", "<?php echo $l -> t("July");?>", "<?php echo $l -> t("August");?>", "<?php echo $l -> t("September");?>", "<?php echo $l -> t("October");?>", "<?php echo $l -> t("November");?>", "<?php echo $l -> t("December");?>");
 				var oc_cal_monthshort = new Array("<?php echo $l -> t("Jan.");?>", "<?php echo $l -> t("Feb.");?>", "<?php echo $l -> t("Mar.");?>", "<?php echo $l -> t("Apr.");?>", "<?php echo $l -> t("May");?>", "<?php echo $l -> t("Jun.");?>", "<?php echo $l -> t("Jul.");?>", "<?php echo $l -> t("Aug.");?>", "<?php echo $l -> t("Sep.");?>", "<?php echo $l -> t("Oct.");?>", "<?php echo $l -> t("Nov.");?>", "<?php echo $l -> t("Dec.");?>");
-				var cw_label = "<?php echo $l->t("CW");?>";
-				var cws_label = "<?php echo $l->t("CWs");?>";
+				var cw_label = "<?php echo $l->t("Week");?>";
+				var cws_label = "<?php echo $l->t("Weeks");?>";
 				</script>
 				<div id="sysbox"></div>
 				<div id="controls">
diff --git a/core/templates/resetpassword.php b/core/templates/resetpassword.php
index adcfafd45f41e01d6cc674fca96154f7efb33b98..2f43a93cfb595a7d7b7025f370c5786ff6c200d6 100644
--- a/core/templates/resetpassword.php
+++ b/core/templates/resetpassword.php
@@ -1,7 +1,7 @@
-<form action="<?php echo "index.php?".$_SERVER['QUERY_STRING']; ?>" method="post">
+<form action="<?php echo 'index.php?'.$_SERVER['QUERY_STRING']; ?>" method="post">
 	<fieldset>
 		<?php if($_['success']): ?>
-			<?php echo $l->t('Your password was successfully reset'); ?>
+			<?php echo $l->t('Your password was reset'); ?>
 		<?php else: ?>
 			<input type="password" name="password" id="password" placeholder="<?php echo $l->t('New password'); ?>" value="" required />
 			<input type="submit" id="submit" value="<?php echo $l->t('Reset password'); ?>" />