diff --git a/src/main/java/com/commafeed/frontend/utils/InternationalizationDevelopmentFilter.java b/src/main/java/com/commafeed/frontend/utils/InternationalizationDevelopmentFilter.java
index ce6307c1..23603889 100644
--- a/src/main/java/com/commafeed/frontend/utils/InternationalizationDevelopmentFilter.java
+++ b/src/main/java/com/commafeed/frontend/utils/InternationalizationDevelopmentFilter.java
@@ -101,7 +101,7 @@ public class InternationalizationDevelopmentFilter implements Filter {
 			String var = m.group(1);
 			Object replacement = props.get(var);
 			String replacementValue = replacement == null ? var : replacement
-					.toString().split("#")[0].trim();
+					.toString().split("#")[0];
 			m.appendReplacement(sb, replacementValue);
 		}
 		m.appendTail(sb);
diff --git a/src/main/resources/i18n/en.properties b/src/main/resources/i18n/en.properties
index 6f9db777..e90fe496 100644
--- a/src/main/resources/i18n/en.properties
+++ b/src/main/resources/i18n/en.properties
@@ -84,10 +84,10 @@ profile.delete_account=Delete account
 
 about.rest_api=REST API
 about.keyboard_shortcuts=Keyboard shortcuts
-about.line1_prefix=CommaFeed is an open-source project. Sources are hosted on
+about.line1_prefix=CommaFeed is an open-source project. Sources are hosted on 
 about.line1_suffix=.
 about.line2_prefix=If you encounter an issue, please report it on the issues page of the 
-about.line2_suffix= project.
+about.line2_suffix=\ project.
 about.line3=If you like this project, please consider a donation to support the developer and help cover the costs of keeping this website online.
 about.goodies=Goodies
 about.goodies.subscribe_url=Subscribe URL
diff --git a/src/main/resources/i18n/fr.properties b/src/main/resources/i18n/fr.properties
index db2e0353..c24ed97b 100644
--- a/src/main/resources/i18n/fr.properties
+++ b/src/main/resources/i18n/fr.properties
@@ -16,7 +16,7 @@ subscribe.feed_url=URL du flux
 subscribe.feed_name=Nom du flux
 subscribe.category=Catégorie
 
-import.google_reader_prefix=Laissez-moi importer vos flux depuis votre compte
+import.google_reader_prefix=Laissez-moi importer vos flux depuis votre compte 
 import.google_reader_suffix=.
 import.google_download=Ou alors, téléchargez votre fichier subscriptions.xml.
 import.google_download_link=Récuperez-le ici.
@@ -82,7 +82,7 @@ profile.delete_account=Effacer le compte
 
 about.rest_api=API REST
 about.keyboard_shortcuts=Raccourcis clavier
-about.line1_prefix=CommaFeed est un projet open-source. Les sources sont disponibles sur
+about.line1_prefix=CommaFeed est un projet open-source. Les sources sont disponibles sur 
 about.line1_suffix=.
 about.line2_prefix=Si vous rencontrez un problème, rapportez-le sur la page du projet sur 
 about.line2_suffix=.
diff --git a/src/main/script/HTMLConcat.groovy b/src/main/script/HTMLConcat.groovy
index dcce8e55..ae05f7df 100644
--- a/src/main/script/HTMLConcat.groovy
+++ b/src/main/script/HTMLConcat.groovy
@@ -44,7 +44,7 @@ public class HTMLConcat {
 		while (m.find()) {
 			String var = m.group(1);
 			Object replacement = props.get(var);
-			m.appendReplacement(sb, replacement == null ? var : replacement.toString().split("#")[0].trim());
+			m.appendReplacement(sb, replacement == null ? var : replacement.toString().split("#")[0]);
 		}
 		m.appendTail(sb);
 		return sb.toString();
diff --git a/src/main/webapp/templates/_subscribe.html b/src/main/webapp/templates/_subscribe.html
index 910ee6d1..62c83886 100644
--- a/src/main/webapp/templates/_subscribe.html
+++ b/src/main/webapp/templates/_subscribe.html
@@ -58,7 +58,7 @@
 				<div class="control-group">
 					<div>${import.google_reader_prefix}
 						<a href="google/import/redirect">						
-							<img src="images/google_reader_icon.png" class="favicon" /> 
+							<img src="images/google_reader_icon.png" class="favicon" />
 							Google Reader
 						</a>${import.google_reader_suffix}
 					</div>
diff --git a/src/main/webapp/templates/feeds.help.html b/src/main/webapp/templates/feeds.help.html
index ff9ad207..ed8b7563 100644
--- a/src/main/webapp/templates/feeds.help.html
+++ b/src/main/webapp/templates/feeds.help.html
@@ -2,10 +2,10 @@
 	<div class="span6">
 		<h4><i class="icon-question-sign"></i> ${toolbar.about}</h4>
 		<p>
-			${about.line1_prefix} <a href="https://github.com/Athou/commafeed" target="_blank">GitHub</a> ${about.line1_suffix}
+			${about.line1_prefix}<a href="https://github.com/Athou/commafeed" target="_blank">GitHub</a>${about.line1_suffix}
 		</p>
 		<p>
-			${about.line2_prefix} <a href="https://github.com/Athou/commafeed/issues" target="_blank">GitHub</a> ${about.line2_suffix}
+			${about.line2_prefix}<a href="https://github.com/Athou/commafeed/issues" target="_blank">GitHub</a>${about.line2_suffix}
 		</p>
 		
 		<h4><i class="icon-money"></i> ${toolbar.donate}</h4>