From 10bd64debdf15a181def233ef8685c15d528c5e1 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Sat, 1 Sep 2012 13:23:37 +0200
Subject: [PATCH] translation support enhanced

---
 apps/files_versions/templates/settings-personal.php | 11 ++++++++---
 settings/js/users.js                                |  2 +-
 settings/templates/admin.php                        |  6 ++++--
 3 files changed, 13 insertions(+), 6 deletions(-)
 mode change 100755 => 100644 settings/templates/admin.php

diff --git a/apps/files_versions/templates/settings-personal.php b/apps/files_versions/templates/settings-personal.php
index fe9ba381e5..6d97cea46c 100644
--- a/apps/files_versions/templates/settings-personal.php
+++ b/apps/files_versions/templates/settings-personal.php
@@ -1,9 +1,14 @@
 <form id="versions">
 	<fieldset class="personalblock">
 		<legend>
-			<strong>Versions</strong><!-- translate using echo $l->t('foo'); -->
+			<strong><?php echo $l->t('Versions'); ?></strong>
 		</legend>
-		<p>This will delete all existing backup versions of your files</p><!-- translate using echo $l->t('foo'); -->
-		<button id="expireAllBtn">Expire all versions<img style="display: none;" class="expireAllLoading" src="<?php echo OCP\Util::imagePath('core', 'loading.gif'); ?>" /></button>
+		<p>
+            <?php echo $l->t('This will delete all existing backup versions of your files'); ?>
+        </p>
+		<button id="expireAllBtn">
+            <?php echo $l->t('Expire all versions'); ?>
+            <img style="display: none;" class="expireAllLoading" src="<?php echo OCP\Util::imagePath('core', 'loading.gif'); ?>" />
+        </button>
 	</fieldset>
 </form>
diff --git a/settings/js/users.js b/settings/js/users.js
index 6026b22d1a..d0a3c1c21a 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -182,7 +182,7 @@ UserList={
 			};
 			var label;
 			if(isadmin){
-				label = t('files', 'add group');
+				label = t('core', 'add group');
 			}else{
 				label = null;
 			}
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
old mode 100755
new mode 100644
index b701b0e839..a02d3f5cfe
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -13,7 +13,9 @@ if(!$_['htaccessworking']) {
 <fieldset class="personalblock">
 	<legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
 
-	<span class="securitywarning">Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.</span>
+	<span class="securitywarning">
+        <?php echo $l->t('Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.'); ?>
+    </span>
 	
 </fieldset>	
 <?php	
@@ -100,6 +102,6 @@ if(!$_['htaccessworking']) {
 
 <p class="personalblock">
 	<strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?> (<?php echo(OC_Updater::ShowUpdatingHint()); ?>)<br />
-	Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.
+    <? echo $l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.'); ?>
 </p>