summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
Diffstat (limited to 'settings')
-rw-r--r--settings/css/settings.css13
-rw-r--r--settings/help.php2
-rw-r--r--settings/l10n/el.php8
-rw-r--r--settings/l10n/fr.php14
-rw-r--r--settings/l10n/nl.php8
-rw-r--r--settings/languageCodes.php2
-rw-r--r--settings/templates/help.php34
-rw-r--r--settings/templates/personal.php6
8 files changed, 44 insertions, 43 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 2068389909c..587626bec07 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -29,17 +29,4 @@ span.version{margin-left:3em;color:#ddd}
/* HELP */
-
-table.help { border-spacing:1em; }
-table.help tr td { white-space:normal; }
-
-
-a.newquestion { font-size:1em; width:10em; margin:1.5em; padding:.6em .5em .4em; background:#fff; color:#333; border:1px solid #ddd; -moz-box-shadow:0 1px 1px #fff, 0 2px 0 #bbb inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; }
-a.newquestion:hover { background:#ddd; }
-
-
-td.entry { padding:1em; margin:2em; border:1px solid #ddd; -moz-box-shadow:0 1px 1px #fff, 0 2px 0 #bbb inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; }
-td.entry:hover { background:#eee; }
-tr.entryrow:hover { background:#fff; }
tr.pager:hover { background:#fff; }
-
diff --git a/settings/help.php b/settings/help.php
index 731ae09a0af..39dd83acc74 100644
--- a/settings/help.php
+++ b/settings/help.php
@@ -11,7 +11,7 @@ if( !OC_User::isLoggedIn()){
OC_Util::addStyle( "settings", "settings" );
OC_App::setActiveNavigationEntry( "help" );
-$pagesize=5;
+$pagesize=7;
if(isset($_GET['page'])) $page=$_GET['page']; else $page=0;
$kbe=OC_OCSClient::getKnownledgebaseEntries($page,$pagesize);
$totalitems=$kbe['totalitems'];
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 5fce8c5d12f..6c297afa02b 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -7,12 +7,18 @@
"Select an App" => "Επιλέξτε μια εφαρμογή",
"-licensed" => "-με άδεια",
"by" => "με",
+"You use" => "Χρησιμοποιείτε",
+"of the available" => "από τα διαθέσιμα",
"Your password got changed" => "Ο κωδικός πρόσβασής σας άλαλαξε",
+"Current password" => "Τρέχοντα κωδικό πρόσβασης",
"New password" => "Νέος κωδικός",
"show" => "Εμφάνιση",
+"Change password" => "Αλλαγή κωδικού πρόσβασης",
"Language" => "Γλώσσα",
+"Help translating" => "Βοηθήστε στη μετάφραση",
"Name" => "Όνομα",
"Password" => "Κωδικός",
"Groups" => "Ομάδες",
-"Create" => "Δημιουργία"
+"Create" => "Δημιουργία",
+"Delete" => "Διαγραφή"
);
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 202d3d14c92..60d3226338e 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -1,18 +1,24 @@
<?php $TRANSLATIONS = array(
"Authentication error" => "Erreur d'authentification",
-"OpenID Changed" => "Identifiant OpenID changé avec succès",
+"OpenID Changed" => "Identifiant OpenID changé",
"Invalid request" => "Requète invalide",
-"Language changed" => "Langue changée avec succès",
+"Language changed" => "Langue changée",
"Ask a question" => "Poser une question",
"Select an App" => "Sélectionner une Application",
"-licensed" => "sous licence",
"by" => "par",
+"You use" => "Vous utilisez",
+"of the available" => "sur un total de",
"Your password got changed" => "Votre mot de passe a été changé",
-"New password" => "Nouveau mot de passe :",
+"Current password" => "Mot de passe actuel",
+"New password" => "Nouveau mot de passe",
"show" => "Afficher",
+"Change password" => "Changer de mot de passe",
"Language" => "Langue",
+"Help translating" => "Aider à traduire",
"Name" => "Nom",
"Password" => "Mot de passe",
"Groups" => "Groupes",
-"Create" => "Créer"
+"Create" => "Créer",
+"Delete" => "Supprimer"
);
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 771004915d3..f279a567fdf 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -7,12 +7,18 @@
"Select an App" => "Selecteer een App",
"-licensed" => "-gelicenseerd",
"by" => "door",
+"You use" => "U gebruikt",
+"of the available" => "van de beschikbare",
"Your password got changed" => "Uw wachtwoord is aangepast",
+"Current password" => "Huidig wachtwoord",
"New password" => "Nieuw wachtwoord",
"show" => "weergeven",
+"Change password" => "Verander wachtwoord",
"Language" => "Taal",
+"Help translating" => "Help met vertalen",
"Name" => "Naam",
"Password" => "Wachtwoord",
"Groups" => "Groepen",
-"Create" => "Creëer"
+"Create" => "Creëer",
+"Delete" => "verwijderen"
);
diff --git a/settings/languageCodes.php b/settings/languageCodes.php
index aaf745d0457..5a6c734cfad 100644
--- a/settings/languageCodes.php
+++ b/settings/languageCodes.php
@@ -117,7 +117,7 @@
'es'=>'Espanol',
'su'=>'Sundanese',
'sw'=>'Swahili (Kiswahili)',
-'sv'=>'Swedish',
+'sv'=>'Svenska',
'tl'=>'Tagalog',
'tg'=>'Tajik',
'ta'=>'Tamil',
diff --git a/settings/templates/help.php b/settings/templates/help.php
index 3a7edfa9b22..31f6101c1ef 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -1,25 +1,21 @@
<?php if(is_null($_["kbe"])):?>
- Can't connect to Q&amp;A database
+ <div class="personalblock">
+ <p><?php echo $l->t('Problems connecting to help database.');?>
+ <a href="http://apps.owncloud.com/kb"><?php echo $l->t('Go there manually.');?></a>
+ </div>
<?php else:?>
- <table class="help">
- <tbody>
- <?php foreach($_["kbe"] as $kb): ?>
- <tr class="entryrow">
- <td width="1"><?php if($kb["preview1"] <> "") { echo('<img class="preview" border="0" src="'.$kb["preview1"].'" />'); } ?> </a></td>
- <td class="entry"><p><strong><?php echo $kb["name"]; ?></strong></p><?php echo('<span class="type">'.$kb['description'].'</span>'); ?>
- <?php if($kb['answer']<>'') echo('<br /><span class="type"><b>Answer:</b></span><br /><span class="type">'.$kb['answer'].'</span>');?>
- <?php if($kb['detailpage']<>'') echo('<br /><a target="_blank" href="'.$kb['detailpage'].'"><b>read more</b></a>')?>
- <br /></td>
- </tr>
- <?php endforeach; ?>
- </tbody>
- </table>
+ <?php foreach($_["kbe"] as $kb): ?>
+ <div class="personalblock">
+ <?php if($kb["preview1"] <> "") { echo('<img class="preview" src="'.$kb["preview1"].'" />'); } ?>
+ <p><strong><?php if($kb['detailpage']<>'') echo('<p><a target="_blank" href="'.$kb['detailpage'].'"><strong>'.$kb["name"].'</strong></a></p>');?></strong></p>
+ <p><?php echo $kb['description'];?></p>
+ <?php if($kb['answer']<>'') echo('<p><strong>'.$l->t('Answer').':</strong><p>'.$kb['answer'].'</p>');?>
+ </div>
+ <?php endforeach; ?>
+
+ <a class="button newquestion" href="http://apps.owncloud.com/knowledgebase/editquestion.php?action=new" target="_blank"><?php echo $l->t( 'Ask a question' ); ?></a>
<?php
$url=OC_Helper::linkTo( "settings", "help.php" ).'?page=';
$pageNavi=OC_Util::getPageNavi($_['pagecount'],$_['page'],$url);
$pageNavi->printPage();
- ?>
- <br /><a target="_blank" class="newquestion" href="http://apps.owncloud.com/knowledgebase/editquestion.php?action=new"><?php echo $l->t( 'Ask a question' ); ?></a>
-<?php endif;?>
-
-
+endif?>
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 95df4d8c712..7278c1221ae 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -16,18 +16,18 @@
<form>
<fieldset class="personalblock">
<label for="languageinput"><strong><?php echo $l->t('Language');?></strong></label>
- <select id="languageinput" name='lang'>
+ <select id="languageinput" name="lang">
<?php foreach($_['languages'] as $language):?>
<option value="<?php echo $language['code'];?>"><?php echo $language['name'];?></option>
<?php endforeach;?>
</select>
- <a href="https://www.transifex.net/projects/p/owncloud/"><?php echo $l->t('Help translating');?></a>
+ <a href="https://www.transifex.net/projects/p/owncloud/"><em><?php echo $l->t('Help translating');?></em></a>
</fieldset>
</form>
<p class="personalblock">
<label for="webdav"><strong>WebDAV</strong></label>
- <input id="webdav" type="text" value="<?php echo ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'].OC::$WEBROOT.'/files/webdav.php'; ?>" title="use this address to connect to your ownCloud in your file manager" />
+ <input id="webdav" type="text" value="<?php echo ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'].OC::$WEBROOT.'/files/webdav.php'; ?>" title="<?php echo $l->t('use this address to connect to your ownCloud in your file manager');?>" />
</p>
<?php foreach($_['forms'] as $form){
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 07:46:30 +0000