diff options
| author | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-08-15 17:38:33 -0400 |
|---|---|---|
| committer | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-08-15 17:38:33 -0400 |
| commit | 801e4f86116c0ef9af4ad93a39b955deaa2f6ce8 (patch) | |
| tree | 47c959a7f880c5d5c34d2b3170d7d742858139bb | |
| parent | 5b09aef1661c67e6d253041f78bf98c086ca0879 (diff) | |
| parent | 2cb231d0a409ae21141be19dddbbc2efc4aac19e (diff) | |
| download | nextcloud-server-801e4f86116c0ef9af4ad93a39b955deaa2f6ce8.tar.gz nextcloud-server-801e4f86116c0ef9af4ad93a39b955deaa2f6ce8.zip | |
Merge branch 'sharing' of git://anongit.kde.org/owncloud into sharing
138 files changed, 2054 insertions, 2935 deletions
diff --git a/.tx/config b/.tx/config index 55ae6df0f4e..0648c8e09b1 100644 --- a/.tx/config +++ b/.tx/config @@ -1,28 +1,31 @@ [main] host = https://www.transifex.net -[owncloud.admin] -file_filter = l10n/<lang>/admin.po -source_file = l10n/templates/admin.pot -source_lang = en - [owncloud.core] file_filter = l10n/<lang>/core.po +host = http://www.transifex.net source_file = l10n/templates/core.pot source_lang = en -[owncloud.help] -file_filter = l10n/<lang>/help.po -source_file = l10n/templates/help.pot +[owncloud.settings] +file_filter = l10n/<lang>/settings.po +host = http://www.transifex.net +source_file = l10n/templates/settings.pot source_lang = en -[owncloud.log] -file_filter = l10n/<lang>/log.po -source_file = l10n/templates/log.pot +[owncloud.files] +file_filter = translations/owncloud.files/<lang>.po +host = http://www.transifex.net +source_file = l10n/templates/files.pot source_lang = en +trans.de = l10n/de/files.po +trans.fr = l10n/fr/files.po -[owncloud.settings] -file_filter = l10n/<lang>/settings.po -source_file = l10n/templates/settings.pot +[owncloud.media] +file_filter = translations/owncloud.media/<lang>.po +host = http://www.transifex.net +source_file = l10n/templates/media.pot source_lang = en +trans.de = l10n/de/media.po +trans.fr = l10n/fr/media.po @@ -4,13 +4,7 @@ ownCloud is written by: Jakob Sack Jan-Christoph Borchardt Michael Gapczynski - François Kubler - Kunal Ghosh - Antonio José Gallo Sánchez Arthur Schiwon - Kamil Domański - Aldo Giambelluca - Dominik Schmidt … With help from many libraries and frameworks including: diff --git a/admin/ajax/changepassword.php b/admin/ajax/changepassword.php deleted file mode 100644 index 98c2a8b37a1..00000000000 --- a/admin/ajax/changepassword.php +++ /dev/null @@ -1,26 +0,0 @@ -<?php - -// Init owncloud -require_once('../../lib/base.php'); - -// We send json data -header( "Content-Type: application/jsonrequest" ); - -// Check if we are a user -if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){ - echo json_encode( array( "status" => "error", "data" => array( "message" => "Authentication error" ))); - exit(); -} - -$username = $_POST["username"]; -$password = $_POST["password"]; - -// Return Success story -if( OC_User::setPassword( $username, $password )){ - echo json_encode( array( "status" => "success", "data" => array( "username" => $username ))); -} -else{ - echo json_encode( array( "status" => "error", "data" => array( "message" => "Unable to change password" ))); -} - -?> diff --git a/admin/appinfo/app.php b/admin/appinfo/app.php deleted file mode 100644 index 80850638f71..00000000000 --- a/admin/appinfo/app.php +++ /dev/null @@ -1,5 +0,0 @@ -<?php - -OC_App::register( array( "order" => 1, "id" => "admin", "name" => "Administration" )); - -?> diff --git a/admin/css/apps.css b/admin/css/apps.css deleted file mode 100644 index 6106ff3f7ec..00000000000 --- a/admin/css/apps.css +++ /dev/null @@ -1,3 +0,0 @@ -li{color:#888} -li.active{color:#000} -span.version{margin-left:3em;color:#ddd} diff --git a/admin/css/users.css b/admin/css/users.css deleted file mode 100644 index 977e06e41c6..00000000000 --- a/admin/css/users.css +++ /dev/null @@ -1,13 +0,0 @@ -form { display:inline; } -td.name, td.password { padding-left:.8em; } -td.password>img, td.remove>img { display:none; cursor:pointer; } -td.password>span { margin-right:1.2em; } -td.password { width:12em; cursor:pointer; } - -td.remove { width:1em; } -tr:hover>td.password>span { margin:0; cursor:pointer; } -tr:hover>td.remove>img, tr:hover>td.password>img { display:inline; cursor:pointer; } -tr:hover>td.remove>img { float:right; } -li.selected { background-color:#ddd; } -#content>table { margin-top:6.5em; } -table { width:100%; } diff --git a/admin/l10n/da.php b/admin/l10n/da.php deleted file mode 100644 index 467c259dc37..00000000000 --- a/admin/l10n/da.php +++ /dev/null @@ -1,19 +0,0 @@ -<?php $TRANSLATIONS = array( -"read more" => "læs mere", -"INSTALL" => "INSTALLER", -"Apps Repository" => "Applikation arkiv", -"Cannot connect to apps repository" => "Kan ikke oprette forbindelse til applikations arkivet", -"Name" => "Navn", -"Modified" => "Ændret", -"Administration" => "Administration", -"System Settings" => "System indstillinger", -"Users" => "Brugere", -"Groups" => "Grupper", -"Password" => "Kodeord", -"remove" => "slet", -"Create group" => "Lav gruppe", -"Force new password:" => "Tving ny adgangskode", -"Set" => "Indstil", -"Do you really want to delete user" => "Vil du virkelig slette denne bruger?", -"Do you really want to delete group" => "Vil du virkelig slette denne gruppe?" -); diff --git a/admin/l10n/de.php b/admin/l10n/de.php deleted file mode 100644 index a1a0ec099e7..00000000000 --- a/admin/l10n/de.php +++ /dev/null @@ -1,20 +0,0 @@ -<?php $TRANSLATIONS = array( -"read more" => "mehr …", -"INSTALL" => "Installieren", -"Apps Repository" => "Anwendungen", -"Cannot connect to apps repository" => "Verbindung fehlgeschlagen", -"Name" => "Name", -"Modified" => "Änderungsdatum", -"Administration" => "Verwaltung", -"System Settings" => "Systemeinstellungen", -"Users" => "Nutzer", -"Groups" => "Gruppen", -"Password" => "Passwort", -"Create" => "Erstellen", -"remove" => "entfernen", -"Create group" => "Gruppe erstellen", -"Force new password:" => "Neues Passwort:", -"Set" => "OK", -"Do you really want to delete user" => "Möchtest du den Nutzer wirklich entfernen?", -"Do you really want to delete group" => "Möchtest du die Gruppe wirklich entfernen?" -); diff --git a/admin/l10n/es.php b/admin/l10n/es.php deleted file mode 100644 index 5902eb2c242..00000000000 --- a/admin/l10n/es.php +++ /dev/null @@ -1,20 +0,0 @@ -<?php $TRANSLATIONS = array( -"read more" => "leer más", -"INSTALL" => "Instalar", -"Apps Repository" => "Repositorio de aplicaciones ", -"Cannot connect to apps repository" => "No se pudo conectar con el repositorio de aplicaciones", -"Name" => "Nombre", -"Modified" => "Modificado", -"Administration" => "Administración", -"System Settings" => "Ajustes del Sistema", -"Users" => "Usuarios", -"Groups" => "Grupos", -"Password" => "Contraseña", -"Create" => "Crear", -"remove" => "Eliminar", -"Create group" => "Crear grupo", -"Force new password:" => "Forzar una nueva contraseña", -"Set" => "Aplicar", -"Do you really want to delete user" => "¿Seguro que quieres eliminar este usuario?", -"Do you really want to delete group" => "¿Seguro que quieres eliminar este grupo?" -); diff --git a/admin/l10n/fr.php b/admin/l10n/fr.php deleted file mode 100644 index e8d41a4be72..00000000000 --- a/admin/l10n/fr.php +++ /dev/null @@ -1,20 +0,0 @@ -<?php $TRANSLATIONS = array( -"read more" => "en lire plus", -"INSTALL" => "INSTALLATION", -"Apps Repository" => "Répertoire d'applications", -"Cannot connect to apps repository" => "Impossible de se connecter au répertoire d'applications", -"Name" => "Nom", -"Modified" => "Modifié le", -"Administration" => "Administration", -"System Settings" => "Préférences Système", -"Users" => "Utilisateurs", -"Groups" => "Groupes", -"Password" => "Mot de passe", -"Create" => "Créer", -"remove" => "retirer", -"Create group" => "Créer un groupe", -"Force new password:" => "Forcer un nouveau mot de passe :", -"Set" => "Appliquer", -"Do you really want to delete user" => "Voulez-vous réellement supprimer cet utilisateur", -"Do you really want to delete group" => "Voulez-vous réellement supprimer ce groupe" -); diff --git a/admin/l10n/nl.php b/admin/l10n/nl.php deleted file mode 100644 index 138c95d2c98..00000000000 --- a/admin/l10n/nl.php +++ /dev/null @@ -1,19 +0,0 @@ -<?php $TRANSLATIONS = array( -"read more" => "Meer informatie", -"INSTALL" => "Installeer", -"Apps Repository" => "Applicatiedatabase", -"Cannot connect to apps repository" => "Kan geen verbinding maken met de applicatiedatabase", -"Name" => "Naam", -"Modified" => "Laatst aangepast", -"Administration" => "Administratie", -"System Settings" => "Systeeminstellingen", -"Users" => "Gebruikers", -"Groups" => "Groepen", -"Password" => "Wachtwoord", -"remove" => "verwijder", -"Create group" => "Groep aanmaken", -"Force new password:" => "Forceer nieuw wachtwoord:", -"Set" => "Ok", -"Do you really want to delete user" => "Wilt u deze gebruiker verwijderen", -"Do you really want to delete group" => "Wilt u deze groep verwijderen" -); diff --git a/admin/l10n/pl.php b/admin/l10n/pl.php deleted file mode 100644 index 169bb37b109..00000000000 --- a/admin/l10n/pl.php +++ /dev/null @@ -1,19 +0,0 @@ -<?php $TRANSLATIONS = array( -"read more" => "czytaj więcej", -"INSTALL" => "INSTALUJ", -"Apps Repository" => "Repozytorium aplikacji", -"Cannot connect to apps repository" => "Nie można połączyć się z repozytorium aplikacji", -"Name" => "Nazwa", -"Modified" => "Zmodyfikowano", -"Administration" => "Administracja", -"System Settings" => "Ustawienia systemowe", -"Users" => "Użytkownicy", -"Groups" => "Grupy", -"Password" => "Hasło", -"remove" => "usuń", -"Create group" => "Utwórz grupę", -"Force new password:" => "Wymuś nowe hasło", -"Set" => "Ustaw", -"Do you really want to delete user" => "Czy naprawdę chcesz usunąć użytkownika", -"Do you really want to delete group" => "Czy naprawdę chcesz usunąć grupę" -); diff --git a/admin/system.php b/admin/system.php deleted file mode 100644 index 42ae8a6c2d1..00000000000 --- a/admin/system.php +++ /dev/null @@ -1,36 +0,0 @@ -<?php - -/** -* ownCloud -* -* @author Frank Karlitschek -* @copyright 2010 Frank Karlitschek karlitschek@kde.org -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE -* License as published by the Free Software Foundation; either -* version 3 of the License, or any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU AFFERO GENERAL PUBLIC LICENSE for more details. -* -* You should have received a copy of the GNU Affero General Public -* License along with this library. If not, see <http://www.gnu.org/licenses/>. -* -*/ - -require_once('../lib/base.php'); -if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){ - header( "Location: ".OC_Helper::linkTo( "", "index.php" )); - exit(); -} - -OC_App::setActiveNavigationEntry( "administration" ); - -$tmpl = new OC_Template( "admin", "system", "user" ); -$tmpl->printPage(); - -?> - diff --git a/admin/templates/system.php b/admin/templates/system.php deleted file mode 100644 index bbe4d2757a3..00000000000 --- a/admin/templates/system.php +++ /dev/null @@ -1,2 +0,0 @@ -<h2><?php echo $l->t( 'System Settings' ); ?></h2> -#TBD diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php index 4fbbd9c638c..7ae6be5d6e3 100644 --- a/apps/contacts/appinfo/app.php +++ b/apps/contacts/appinfo/app.php @@ -14,5 +14,5 @@ OC_App::addNavigationEntry( array( 'id' => 'contacts_index', 'order' => 10, 'href' => OC_Helper::linkTo( 'contacts', 'index.php' ), - 'icon' => OC_Helper::imagePath( 'admin', 'users.svg' ), + 'icon' => OC_Helper::imagePath( 'settings', 'users.svg' ), 'name' => 'Contacts' )); diff --git a/apps/contacts/templates/part.details.php b/apps/contacts/templates/part.details.php index 4277357b759..119c88486ac 100644 --- a/apps/contacts/templates/part.details.php +++ b/apps/contacts/templates/part.details.php @@ -24,6 +24,6 @@ <?php endforeach; ?> <div id="contacts_cardoptions"> - <a id="contacts_deletecard"><img class="svg" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></a> - <a id="contacts_addproperty"><img class="svg" src="<?php echo image_path('', 'actions/download.svg'); ?>" /></a> + <a id="contacts_deletecard"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></a> + <a id="contacts_addproperty"><img class="svg action" src="<?php echo image_path('', 'actions/download.svg'); ?>" /></a> </div> diff --git a/apps/contacts/templates/part.property.php b/apps/contacts/templates/part.property.php index 06587269202..cdb03068128 100644 --- a/apps/contacts/templates/part.property.php +++ b/apps/contacts/templates/part.property.php @@ -3,27 +3,27 @@ <div class="contacts_propertyname"><?php echo $l->t('Name'); ?></div> <div class="contacts_propertyvalue"> <?php echo $_['property']['value']; ?> - <span style="display:none;" data-use="edit"><img class="svg" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span> + <span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span> </div> <?php elseif($_['property']['name'] == 'BDAY'): ?> <div class="contacts_propertyname"><?php echo $l->t('Birthday'); ?></div> <div class="contacts_propertyvalue"> <?php echo $l->l('date',new DateTime($_['property']['value'])); ?> - <span style="display:none;" data-use="delete"><img class="svg" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span> + <span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span> </div> <?php elseif($_['property']['name'] == 'ORG'): ?> <div class="contacts_propertyname"><?php echo $l->t('Organisation'); ?></div> <div class="contacts_propertyvalue"> <?php echo $_['property']['value']; ?> - <span style="display:none;" data-use="edit"><img class="svg" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span> - <span style="display:none;" data-use="delete"><img class="svg" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span> + <span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span> + <span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span> </div> <?php elseif($_['property']['name'] == 'EMAIL'): ?> <div class="contacts_propertyname"><?php echo $l->t('Email'); ?></div> <div class="contacts_propertyvalue"> <?php echo $_['property']['value']; ?> - <span style="display:none;" data-use="edit"><img class="svg" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span> - <span style="display:none;" data-use="delete"><img class="svg" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span> + <span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span> + <span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span> </div> <?php elseif($_['property']['name'] == 'TEL'): ?> <div class="contacts_propertyname"><?php echo $l->t('Telephone'); ?></div> @@ -32,8 +32,8 @@ <?php if(isset($_['property']['parameters']['TYPE'])): ?> (<?php echo $l->t('tel_'.strtolower($_['property']['parameters']['TYPE'])); ?>) <?php endif; ?> - <span style="display:none;" data-use="edit"><img class="svg" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span> - <span style="display:none;" data-use="delete"><img class="svg" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span> + <span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span> + <span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span> </div> <?php elseif($_['property']['name'] == 'ADR'): ?> <div class="contacts_propertyname"> @@ -51,8 +51,8 @@ <?php echo $l->t('Region'); ?> <?php echo $_['property']['value'][4]; ?><br> <?php echo $l->t('Postal Code'); ?> <?php echo $_['property']['value'][5]; ?><br> <?php echo $l->t('Country'); ?> <?php echo $_['property']['value'][6]; ?> - <span style="display:none;" data-use="edit"><img class="svg" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span> - <span style="display:none;" data-use="delete"><img class="svg" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span> + <span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span> + <span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span> </div> <?php endif; ?> </div> diff --git a/apps/media/css/music.css b/apps/media/css/music.css index f9c3b955d6c..f8e41064fd8 100644 --- a/apps/media/css/music.css +++ b/apps/media/css/music.css @@ -1,16 +1,16 @@ -#folderlist li{list-style-type:none;margin-bottom:10px;} -#folderlist button.prettybutton{font-size:1em;width:10ex;} -li button.right.prettybutton{font-size:1em;} -#collection{padding-top:1em;position:relative;width:70ex;float:left;} -#collection li.album,#collection li.song{margin-left:3ex;} +#folderlist li { margin-bottom:1em; } +#folderlist button.prettybutton { font-size:1em; width:10em; } +li button.right.prettybutton { font-size:1em; } +#collection { padding-top:1em; position:relative; width:70em; float:left; } +#collection li.album,#collection li.song { margin-left:3em; } #leftcontent img.remove { display:none; float:right; cursor:pointer; } #leftcontent li:hover img.remove { display:inline; } -#collection li button{float:right;} -#collection li,#playlist li{list-style-type:none;} -.template{display:none} +#collection li button { float:right; } +#collection li,#playlist li { list-style-type:none; } +.template { display:none; } -#collection li{padding-right:10px;} -#searchresults input.play, #searchresults input.add{float:right; height:16px; width:16px;} -#collection tr.collapsed td.album, #collection tr.collapsed td.title{color:#ddd} -a.expander{ float:right; display:block; } -tr.active { background-color:#ccc; } +#collection li { padding-right:10px; } +#searchresults input.play, #searchresults input.add { float:left; height:1em; width:1em; } +#collection tr.collapsed td.album, #collection tr.collapsed td.title { color:#ddd; } +a.expander { float:right; display:block; } +tr.active { background-color:#eee; } diff --git a/apps/media/css/player.css b/apps/media/css/player.css index 42ef219994c..98a76e82f0d 100644 --- a/apps/media/css/player.css +++ b/apps/media/css/player.css @@ -1,25 +1,16 @@ -#controls ul.jp-controls{list-style-type:none;padding:0;} -#controls ul.jp-controls li{display:inline;} -#controls ul.jp-controls a{position:absolute;overflow:hidden;text-indent:-9999px;} -a.jp-play,a.jp-pause{width:3.1em;height:3.1em;z-index:1;top:0;left:3.8em;} -a.jp-play{background:url("../img/jplayer.blue.monday.png") 0 0 no-repeat;} -a.jp-play:hover{background:url("../img/jplayer.blue.monday.png") -41px 0 no-repeat;} -a.jp-pause{background:url("../img/jplayer.blue.monday.png") 0 -42px no-repeat;display:none;} -a.jp-pause:hover{background:url("../img/jplayer.blue.monday.png") -41px -42px no-repeat;} -a.jp-previous{left:20px;top:.5em;background:url("../img/jplayer.blue.monday.png") 0 -112px no-repeat;width:2.3em;height:2.3em;} -a.jp-previous:hover{background:url("../img/jplayer.blue.monday.png") -29px -112px no-repeat;} -a.jp-next{left:88px;top:.5em;background:url("../img/jplayer.blue.monday.png") 0 -141px no-repeat;width:2.3em;height:2.3em;} -a.jp-next:hover{background:url("../img/jplayer.blue.monday.png") -29px -141px no-repeat;} -div.jp-progress{position:absolute;overflow:hidden;background-color:#293b51;top:1em;left:10em;width:15em;height:1.2em;} -div.jp-seek-bar{background:url("../img/jplayer.blue.monday.png") 0 -202px repeat-x;width:0;height:100%;cursor:pointer;} -div.jp-play-bar{background:url("../img/jplayer.blue.monday.png") 0 -218px repeat-x;width:0;height:100%;} -div.jp-seeking-bg{background:url("../img/pbar-ani.gif");} -a.jp-mute,a.jp-unmute{height:1.2em;width:1.5em;top:1em;left:26em;} -a.jp-mute{background:url("../img/jplayer.blue.monday.png") 0 -186px no-repeat;} -a.jp-mute:hover{background:url("../img/jplayer.blue.monday.png") -19px -170px no-repeat;} -a.jp-unmute{background:url("../img/jplayer.blue.monday.png") 0 -170px no-repeat;display:none;} -a.jp-unmute:hover{background:url("../img/jplayer.blue.monday.png") -19px -186px no-repeat;} -div.jp-volume-bar{position:absolute;overflow:hidden;background:url("../img/jplayer.blue.monday.png") 0 -250px repeat-x;width:4em;height:0.4em;cursor:pointer;top:1.3em;left:28em;} -div.jp-volume-bar-value{background:url("../img/jplayer.blue.monday.png") 0 -256px repeat-x;width:0;height:0.4em;} -div.jp-current-time,div.jp-duration{position:absolute;font-size:.64em;font-style:oblique;top:1em;left:16.8em;width:22em;} -div.jp-duration{text-align:right;} +#controls ul.jp-controls { padding:0; } +#controls ul.jp-controls li { display:inline; } +#controls ul.jp-controls li a { position:absolute; padding:.8em 1em; } +a.jp-play, a.jp-pause { left:2.5em; } +a.jp-next { left:5em; } + +div.jp-progress { position:absolute; overflow:hidden; top:.5em; left:8em; width:15em; height:1.2em; padding:0; } +div.jp-seek-bar { background:#eee; width:0; height:100%; cursor:pointer; } +div.jp-play-bar { background:#ccc; width:0; height:100%; } +div.jp-seeking-bg { background:url("../img/pbar-ani.gif"); } +div.jp-current-time,div.jp-duration { position:absolute; font-size:.64em; font-style:oblique; top:1em; left:13.5em; width:22em; } +div.jp-duration { text-align:right; } + +a.jp-mute,a.jp-unmute { left:24em; } +div.jp-volume-bar { position:absolute; overflow:hidden; background:#eee; width:4em; height:0.4em; cursor:pointer; top:1.3em; left:27em; } +div.jp-volume-bar-value { background:#ccc; width:0; height:0.4em; } diff --git a/apps/media/js/collection.js b/apps/media/js/collection.js index 8ef10951b6b..98d21b236e0 100644 --- a/apps/media/js/collection.js +++ b/apps/media/js/collection.js @@ -34,7 +34,7 @@ Collection={ } if(collection.length==0){ $('#scan input.start').val(t('media','Scan Collection')); - $('#plugins a[href="#collection"]').trigger('click'); + $('#scan input.start').click(); } } diff --git a/apps/media/js/player.js b/apps/media/js/player.js index d37196a89f5..0b0502c7780 100644 --- a/apps/media/js/player.js +++ b/apps/media/js/player.js @@ -204,4 +204,7 @@ $(document).ready(function(){ $(window).bind('beforeunload', function (){ PlayList.save(); }); + + $('jp-previous').tipsy({gravity:'n', fade:true, live:true}); + $('jp-next').tipsy({gravity:'n', fade:true, live:true}); }) diff --git a/apps/media/js/playlist.js b/apps/media/js/playlist.js index 778939db01c..cb7f24522a4 100644 --- a/apps/media/js/playlist.js +++ b/apps/media/js/playlist.js @@ -5,7 +5,7 @@ PlayList.render=function(){ var item=PlayList.items[i]; var li=$('<li/>'); li.append(item.name); - var img=$('<img class="remove" src="'+OC.imagePath('core','actions/delete')+'"/>'); + var img=$('<img class="remove svg action" src="'+OC.imagePath('core','actions/delete')+'"/>'); img.click(function(event){ event.stopPropagation(); PlayList.remove($(this).parent().data('index')); diff --git a/apps/media/l10n/de.php b/apps/media/l10n/de.php new file mode 100644 index 00000000000..9f664b78d80 --- /dev/null +++ b/apps/media/l10n/de.php @@ -0,0 +1,9 @@ +<?php $TRANSLATIONS = array( +"Music" => "Musik", +"Songs scanned" => "Lieder gescannt", +"Rescan Collection" => "Sammlung scannen", +"Pause" => "Pause", +"Artist" => "Künstler", +"Album" => "Album", +"Title" => "Titel" +); diff --git a/apps/media/l10n/fr.php b/apps/media/l10n/fr.php new file mode 100644 index 00000000000..619ee9bc835 --- /dev/null +++ b/apps/media/l10n/fr.php @@ -0,0 +1,9 @@ +<?php $TRANSLATIONS = array( +"Music" => "Musique", +"Songs scanned" => "Pistes scannées", +"Rescan Collection" => "Réanalyser la Collection", +"Pause" => "Pause", +"Artist" => "Artiste", +"Album" => "Album", +"Title" => "Titre" +); diff --git a/apps/media/templates/music.php b/apps/media/templates/music.php index a89c5421b4a..3cbb1c50a95 100644 --- a/apps/media/templates/music.php +++ b/apps/media/templates/music.php @@ -1,22 +1,23 @@ <div id="controls"> <ul class="jp-controls"> - <li><a href="#" class="jp-play" tabindex="1">play</a></li> - <li><a href="#" class="jp-pause" tabindex="1">pause</a></li> - <li><a href="#" class="jp-mute" tabindex="1">mute</a></li> - <li><a href="#" class="jp-unmute" tabindex="1">unmute</a></li> - <li><a href="#" class="jp-previous" tabindex="1">previous</a></li> - <li><a href="#" class="jp-next" tabindex="1">next</a></li> + <li><a href="#" class="jp-play action"><img class="svg" src="<?php echo image_path('core', 'actions/play-big.svg'); ?>" /></a></li> + <li><a href="#" class="jp-pause action"><img class="svg" src="<?php echo image_path('core', 'actions/pause-big.svg'); ?>" /></a></li> + <li><a href="#" class="jp-previous action"><img class="svg" src="<?php echo image_path('core', 'actions/play-previous.svg'); ?>" /></a></li> + <li><a href="#" class="jp-next action"><img class="svg" src="<?php echo image_path('core', 'actions/play-next.svg'); ?>" /></a></li> + <li><a href="#" class="jp-mute action"><img class="svg" src="<?php echo image_path('core', 'actions/sound.svg'); ?>" /></a></li> + <li><a href="#" class="jp-unmute action"><img class="svg" src="<?php echo image_path('core', 'actions/sound-off.svg'); ?>" /></a></li> </ul> <div class="jp-progress"> <div class="jp-seek-bar"> <div class="jp-play-bar"></div> </div> </div> + <div class="jp-current-time"></div> + <div class="jp-duration"></div> <div class="jp-volume-bar"> <div class="jp-volume-bar-value"></div> </div> - <div class="jp-current-time"></div> - <div class="jp-duration"></div> + <div class="player" id="jp-player"></div> </div> @@ -24,10 +25,11 @@ <div id="rightcontent"> <div id="scan"> - <p id="scancount" style="display:none"><span class="songCount">0</span> <?php echo $l->t('Songs scanned')?></p> - <div id="scanprogressbar"></div> + <p id="scancount" style="display:none"><span class="songCount">0</span> <?php echo $l->t('Songs scanned')?> <input type="button" class="start" value="<?php echo $l->t('Rescan Collection')?>"></input> - <input type="button" class="stop" style="display:none" value="<?php echo $l->t('Pause')?>"></input> + <input type="button" class="stop" style="display:none" value="<?php echo $l->t('Pause')?>"></input></p> + <div id="scanprogressbar"></div> + </div> <table id="collection"> <thead> diff --git a/apps/user_openid/js/settings.js b/apps/user_openid/js/settings.js index b85ce2d3522..cfecd7b1cb4 100644 --- a/apps/user_openid/js/settings.js +++ b/apps/user_openid/js/settings.js @@ -1,5 +1,5 @@ $(document).ready(function(){ - $('#openidform input').blur(function(event){ + $('#openidform #identity').blur(function(event){ event.preventDefault(); var post = $( "#openidform" ).serialize(); $.post( 'ajax/openid.php', post, function(data){ @@ -9,4 +9,12 @@ $(document).ready(function(){ } }); }); + + // reset value when edited, workaround because of .select() not working with disabled inputs + $('#openid').focus(function(event){ + openidValue = $('#openid').val(); + }); + $('#openid').blur(function(event){ + $('#openid').val(openidValue); + }); }); diff --git a/apps/user_openid/templates/settings.php b/apps/user_openid/templates/settings.php index fff1eff09e0..51c80e566b6 100644 --- a/apps/user_openid/templates/settings.php +++ b/apps/user_openid/templates/settings.php @@ -1,6 +1,8 @@ <form id="openidform"> - <fieldset> - <legend><?php echo $l->t( 'OpenID' );?></legend> - <input type="text" name='identity' id='identity' value="<?php echo $_['identity']; ?>" placeholder="OpenID for <?php echo OC_User::getUser();?>" /> + <fieldset class="personalblock"> + <label for="openid"><strong>OpenID</strong></label> + <input type="text" id="openid" value="<?php echo ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'].OC::$WEBROOT.'/?'; echo OC_User::getUser(); ?>" title="you can authenticate to other sites with this address" /> + <label for="identity">Authorized</label> + <input type="text" name="identity" id="identity" value="<?php echo $_['identity']; ?>" placeholder="OpenID provider" title="Wordpress, Identi.ca, Launchpad, …" /> </fieldset> -</form>
\ No newline at end of file +</form> diff --git a/core/ajax/validateuser.php b/core/ajax/validateuser.php new file mode 100644 index 00000000000..967a5184a2c --- /dev/null +++ b/core/ajax/validateuser.php @@ -0,0 +1,57 @@ +<?php + +/** +* ownCloud +* +* @author Hans Bakker +* @copyright 2011 Hans Bakker hansmbakker+kde@gmail.com +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE +* License as published by the Free Software Foundation; either +* version 3 of the License, or any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU AFFERO GENERAL PUBLIC LICENSE for more details. +* +* You should have received a copy of the GNU Affero General Public +* License along with this library. If not, see <http://www.gnu.org/licenses/>. +* +*/ + +header("Content-Type: application/jsonrequest"); + +$RUNTIME_NOAPPS = TRUE; //no apps, yet + +require_once('../../lib/base.php'); + +$not_installed = !OC_Config::getValue('installed', false); + +// First step : check if the server is correctly configured for ownCloud : +$errors = OC_Util::checkServer(); +if(count($errors) > 0) { + echo json_encode(array("user_valid" => "false", "comment" => $errors)); +} + +// Setup required : +elseif($not_installed) { + echo json_encode(array("user_valid" => "false", "comment" => "not_installed")); + +} + +// Someone wants to check a user: +elseif(isset($_GET["user"]) and isset($_GET["password"])) { + if(OC_User::checkPassword($_GET["user"], $_GET["password"])) + echo json_encode(array("user_valid" => "true", "comment" => "")); + else + echo json_encode(array("user_valid" => "false", "comment" => "")); +} + +// For all others cases: +else { + echo json_encode(array("user_valid" => "false", "comment" => "unknown")); +} + +?> diff --git a/core/css/jquery-tipsy.css b/core/css/jquery-tipsy.css index 5075f41c9f6..957385a269f 100644 --- a/core/css/jquery-tipsy.css +++ b/core/css/jquery-tipsy.css @@ -1,7 +1,25 @@ -.tipsy { padding: 5px; font-size: 10px; opacity: 0.8; filter: alpha(opacity=80); background-repeat: no-repeat; background-image: url(../img/jquery-tipsy.gif); } - .tipsy-inner { padding: 5px 8px 4px 8px; background-color: black; color: white; max-width: 200px; text-align: center; } - .tipsy-inner { -moz-border-radius:3px; -webkit-border-radius:3px; } - .tipsy-north { background-position: top center; } - .tipsy-south { background-position: bottom center; } - .tipsy-east { background-position: right center; } - .tipsy-west { background-position: left center; } +.tipsy { font-size:10px; position:absolute; padding:5px; z-index:100000; } +.tipsy-inner { background-color:#000; color:#FFF; max-width:200px; padding:5px 8px 4px 8px; text-align:center; } + +/* Rounded corners */ +.tipsy-inner { border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px; } + +/* Uncomment for shadow */ +/*.tipsy-inner { box-shadow:0 0 5px #000000; -webkit-box-shadow:0 0 5px #000000; -moz-box-shadow:0 0 5px #000000; }*/ + +.tipsy-arrow { position:absolute; width:0; height:0; border:5px solid transparent; } + +/* Rules to colour arrows */ +.tipsy-arrow-n { border-bottom-color:#000; } +.tipsy-arrow-s { border-top-color:#000; } +.tipsy-arrow-e { border-left-color:#000; } +.tipsy-arrow-w { border-right-color:#000; } + +.tipsy-n .tipsy-arrow, .tipsy-nw .tipsy-arrow, .tipsy-ne .tipsy-arrow { top:0; border-top:none; } +.tipsy-s .tipsy-arrow, .tipsy-sw .tipsy-arrow, .tipsy-se .tipsy-arrow { bottom:0; border-bottom:none; } +.tipsy-n .tipsy-arrow, .tipsy-s .tipsy-arrow { left:50%; margin-left:-5px; } +.tipsy-nw .tipsy-arrow, .tipsy-sw .tipsy-arrow { left:10px; } +.tipsy-ne .tipsy-arrow, .tipsy-se .tipsy-arrow { right:10px; } +.tipsy-e .tipsy-arrow, .tipsy-w .tipsy-arrow { top:50%; margin-top:-5px; } +.tipsy-e .tipsy-arrow { right:0; border-right:none; } +.tipsy-w .tipsy-arrow { left:0; border-left:none; } diff --git a/core/css/multiselect.css b/core/css/multiselect.css index d78dede95c0..22e5098d3bf 100644 --- a/core/css/multiselect.css +++ b/core/css/multiselect.css @@ -1,6 +1,6 @@ -ul.multiselectoptions { z-index:49; position:absolute; background-color:#fff; padding-top:.5em; border-bottom-left-radius:.5em; border-bottom-right-radius:.5em; border:1px solid #ddd; border-top:none; } +ul.multiselectoptions { z-index:49; position:absolute; background-color:#fff; padding-top:.5em; border:1px solid #ddd; border-top:none; -moz-border-radius-bottomleft:.5em; -webkit-border-bottom-left-radius:.5em; border-bottom-left-radius:.5em; -moz-border-radius-bottomright:.5em; -webkit-border-bottom-right-radius:.5em; border-bottom-right-radius:.5em; -moz-box-shadow:0 1px 1px #ddd; -webkit-box-shadow:0 1px 1px #ddd; box-shadow:0 1px 1px #ddd; } div.multiselect { padding-right:.6em; display:inline; position:relative; display:inline-block } div.multiselect.active { background-color:#fff; border-bottom:none; border-bottom-left-radius:0; border-bottom-right-radius:0; z-index:50; position:relative } -div.multiselect>span:first-child { margin-right:2em; } +div.multiselect>span:first-child { margin-right:2em; float:left; } div.multiselect>span:last-child { float:right; position:relative } ul.multiselectoptions input.new{ margin:0; padding-bottom:0.2em; padding-top:0.2em; border-top-left-radius:0; border-top-right-radius:0; } diff --git a/core/css/styles.css b/core/css/styles.css index ff12ab1e07c..d1a7515bb81 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -2,16 +2,16 @@ This file is licensed under the Affero General Public License version 3 or later. See the COPYING-README file. */ -html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section { margin:0; padding:0; border:0; outline:0; font-weight:inherit; font-style:inherit; font-size:100%; font-family:inherit; vertical-align:baseline; cursor:default; } +html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section { margin:0; padding:0; border:0; outline:0; font-weight:inherit; font-size:100%; font-family:inherit; vertical-align:baseline; cursor:default; } article, aside, dialog, figure, footer, header, hgroup, nav, section { display:block; } body { line-height:1.5; } table { border-collapse:separate; border-spacing:0; white-space:nowrap; } caption, th, td { text-align:left; font-weight:normal; } table, td, th { vertical-align:middle; } a { border:0; color:#000; text-decoration:none;} -a, a *, input, input *, select, .button span, li { cursor:pointer; } +a, a *, input, input *, select, .button span, li, label { cursor:pointer; } ul { list-style:none; } -body { background:#fefefe; font:normal 80%/1.6em "Lucida Grande", Arial, Verdana, sans-serif; color:#000; margin-bottom:2em; } +body { background:#fefefe; font:normal .8em/1.6em "Lucida Grande", Arial, Verdana, sans-serif; color:#000; } /* HEADERS */ @@ -28,16 +28,15 @@ background: linear-gradient(top, #35537a 0%,#1d2d42 100%); /* W3C */ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d42',GradientType=0 ); /* IE6-9 */ } #owncloud { float:left; } -h1 { margin:1em 3em 1em 0; border-bottom:1px solid #666; text-transform:uppercase; font-weight:normal; font-style:italic; color:#666; } /* INPUTS */ input[type="text"], input[type="password"] { cursor:text; } -input, select, .button { font-size:1em; width:10em; margin:.3em; 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; } +input, select, .button, #quota, div.jp-progress { font-size:1em; width:10em; margin:.3em; 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; } input[type="text"], input[type="password"] { background:#f8f8f8; color:#555; cursor:text; } input[type="text"]:hover, input[type="text"]:focus, input[type="password"]:hover, input[type="password"]:focus { background:#fff; color:#333; } -input[type="submit"], input[type="button"], .button { width:auto; padding:.4em; border:1px solid #ddd; font-weight:bold; cursor:pointer; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; } +input[type="submit"], input[type="button"], .button, #quota, div.jp-progress { width:auto; padding:.4em; border:1px solid #ddd; font-weight:bold; cursor:pointer; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; } input[type="submit"]:hover, input[type="submit"]:focus, input[type="button"]:hover, input[type="button"]:focus, .button:hover { background:#fff; color:#333; } input[type="checkbox"] { width:auto; } @@ -49,18 +48,16 @@ radius:1em; border-radius:1em; } input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; } input[type="submit"].highlight{ background:#ffc100; border:1px solid #db0; text-shadow:#ffeedd 0 1px 0; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; } -form label { cursor:pointer; } -#body-settings fieldset { padding:1em; width:40em; margin:1em; -border:1px solid #ddd; font-weight:bold; background:#f2f2f2; color:#555; text-shadow:#fff 0 1px 0; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em;} -legend { padding:.2em; font-size:1.2em; } -.template{display:none;} /* CONTENT ------------------------------------------------------------------ */ #controls { width:100%; top:3.5em; height:2.8em; margin:0; background:#f7f7f7; border-bottom:1px solid #eee; position:fixed; z-index:50; -moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000; } #content { margin:3.5em 0 0 12.5em; padding-bottom:10em; } #leftcontent { position:absolute; top:6.4em; width:20em; background:#f8f8f8; height:100%; border-right:1px solid #ddd; } +#leftcontent li { padding:.3em .8em; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; -webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms; } +#leftcontent li:hover, #leftcontent li:active { background:#eee; } #rightcontent { position:absolute; top:6.4em; left:33em; } + /* LOG IN & INSTALLATION ------------------------------------------------------------ */ #body-login { background:#ddd; } #body-login p.info { width:16em; margin:2em auto; padding:1em; background:#eee; -moz-box-shadow:0 1px 0 #bbb inset; -webkit-box-shadow:0 1px 0 #bbb inset; box-shadow:0 1px 0 #bbb inset; -moz-border-radius:1em; -webkit-border-radius:1em; border-radius:1em; } @@ -84,7 +81,7 @@ legend { padding:.2em; font-size:1.2em; } /* NAVIGATION ------------------------------------------------------------- */ #navigation { position:fixed; top:3.5em; float:left; width:12.5em; padding:0; z-index:75; height:100%; background:#eee; border-right: 1px #ccc solid; -moz-box-shadow: -3px 0 7px #000; -webkit-box-shadow: -3px 0 7px #000; box-shadow: -3px 0 7px #000; } -#navigation a { display:block; padding:.6em .5em .4em 2.5em; background:#eee 1em center no-repeat; border-bottom:1px solid #ddd; border-top:1px solid #fff; text-decoration:none; font-size:1.2em; color:#666; text-shadow:#f8f8f8 0 1px 0; } +#navigation a { display:block; padding:.6em .5em .4em 2.5em; background:#eee 1em center no-repeat; border-bottom:1px solid #ddd; border-top:1px solid #fff; text-decoration:none; font-size:1.2em; color:#666; text-shadow:#f8f8f8 0 1px 0; -webkit-transition:background 300ms; -moz-transition:background 300ms; -o-transition:background 300ms; transition:background 300ms; } #navigation a.active, #navigation a:hover, #navigation a:focus { background-color:#dbdbdb; border-top:1px solid #d4d4d4; border-bottom:1px solid #ccc; color:#333; } #navigation a.active { background-color:#ddd; } #navigation #settings { position:absolute; bottom:3.5em; width:100%; } @@ -92,15 +89,22 @@ legend { padding:.2em; font-size:1.2em; } #expand+span { position:relative; bottom:.4em; left:.2em; font-size:1.2em; color:#666; text-shadow:#f8f8f8 0 1px 0; } #logout { position:absolute; right:0; top:0; padding:1.2em 2em .55em 1.2em; } -/* USER SETTINGS ------------------------------------------------------------ */ -#quota_indicator { margin:0 4em 1em 0; padding:0; border:1px solid #ccc; border-radius:10px; -webkit-border-radius:10px; -moz-border-radius:10px; } -#quota_indicator div { background:#76a9ea; border-radius:10px; -webkit-border-radius:10px; -moz-border-radius:10px; } -li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ffe .8em .8em no-repeat; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; } -.hidden{ display:none; } -#notification{ z-index:101; cursor:pointer; background-color:#fc4; border:0; padding:0 .7em .3em; display:block; position:fixed; left:50%; top:0; --moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; --moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; } +/* VARIOUS REUSABLE SELECTORS */ +.hidden { display:none; } + +#notification { z-index:101; cursor:pointer; background-color:#fc4; border:0; padding:0 .7em .3em; display:block; position:fixed; left:50%; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; } + +.action, .selectedActions a, #logout { opacity:.3; -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; } +.action:hover, .selectedActions a:hover, #logout:hover { opacity:1; } -.file_action, .selectedActions a, #logout { opacity:.5; } -.file_action:hover, .selectedActions a:hover, #logout:hover { opacity:1; } +table tr { -webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms; } +tbody tr:hover, tr:active { background-color:#f8f8f8; } + +#body-settings .personalblock { padding:.5em 1em; margin:1em; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em;} +#body-settings div.personalblock:first-child { position:relative; margin-top:4.5em; padding:0; } + +#quota div, div.jp-play-bar, div.jp-seek-bar { padding:.6em 1em; background:#e6e6e6; font-weight:normal; white-space:nowrap; } +div.jp-play-bar, div.jp-seek-bar { padding:0; } + +li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ffe .8em .8em no-repeat; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; } diff --git a/core/js/jquery-tipsy.js b/core/js/jquery-tipsy.js index 58d834771ff..9567ed3bacc 100644 --- a/core/js/jquery-tipsy.js +++ b/core/js/jquery-tipsy.js @@ -1,100 +1,202 @@ -// tipsy - Facebook-style tooltip plugin for jQuery -// (c) 2008-2009 Jason Frame (jason@onehackoranother.com) -// Released under The MIT License. +// tipsy, facebook style tooltips for jquery +// version 1.0.0a +// (c) 2008-2010 jason frame [jason@onehackoranother.com] +// released under the MIT license (function($) { - $.fn.tipsy = function(options) { - - options = $.extend({}, $.fn.tipsy.defaults, options); - - return this.each(function() { - - var opts = $.fn.tipsy.elementOptions(this, options); - - $(this).hover(function() { - - $.data(this, 'cancel.tipsy', true); - - var tip = $.data(this, 'active.tipsy'); - if (!tip) { - tip = $('<div class="tipsy"><div class="tipsy-inner"/></div>'); - tip.css({position: 'absolute', zIndex: 100000}); - $.data(this, 'active.tipsy', tip); - } - - if ($(this).attr('title') || typeof($(this).attr('original-title')) != 'string') { - $(this).attr('original-title', $(this).attr('title') || '').removeAttr('title'); - } - - var title; - if (typeof opts.title == 'string') { - title = $(this).attr(opts.title == 'title' ? 'original-title' : opts.title); - } else if (typeof opts.title == 'function') { - title = opts.title.call(this); - } - - tip.find('.tipsy-inner')[opts.html ? 'html' : 'text'](title || opts.fallback); - - var pos = $.extend({}, $(this).offset(), {width: this.offsetWidth, height: this.offsetHeight}); - tip.get(0).className = 'tipsy'; // reset classname in case of dynamic gravity - tip.remove().css({top: 0, left: 0, visibility: 'hidden', display: 'block'}).appendTo(document.body); - var actualWidth = tip[0].offsetWidth, actualHeight = tip[0].offsetHeight; - var gravity = (typeof opts.gravity == 'function') ? opts.gravity.call(this) : opts.gravity; - + + function maybeCall(thing, ctx) { + return (typeof thing == 'function') ? (thing.call(ctx)) : thing; + }; + + function Tipsy(element, options) { + this.$element = $(element); + this.options = options; + this.enabled = true; + this.fixTitle(); + }; + + Tipsy.prototype = { + show: function() { + var title = this.getTitle(); + if (title && this.enabled) { + var $tip = this.tip(); + + $tip.find('.tipsy-inner')[this.options.html ? 'html' : 'text'](title); + $tip[0].className = 'tipsy'; // reset classname in case of dynamic gravity + $tip.remove().css({top: 0, left: 0, visibility: 'hidden', display: 'block'}).prependTo(document.body); + + var pos = $.extend({}, this.$element.offset(), { + width: this.$element[0].offsetWidth, + height: this.$element[0].offsetHeight + }); + + var actualWidth = $tip[0].offsetWidth, + actualHeight = $tip[0].offsetHeight, + gravity = maybeCall(this.options.gravity, this.$element[0]); + + var tp; switch (gravity.charAt(0)) { case 'n': - tip.css({top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2}).addClass('tipsy-north'); + tp = {top: pos.top + pos.height + this.options.offset, left: pos.left + pos.width / 2 - actualWidth / 2}; break; case 's': - tip.css({top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2}).addClass('tipsy-south'); + tp = {top: pos.top - actualHeight - this.options.offset, left: pos.left + pos.width / 2 - actualWidth / 2}; break; case 'e': - tip.css({top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth}).addClass('tipsy-east'); + tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth - this.options.offset}; break; case 'w': - tip.css({top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width}).addClass('tipsy-west'); + tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width + this.options.offset}; break; } - - if (opts.fade) { - tip.css({opacity: 0, display: 'block', visibility: 'visible'}).animate({opacity: 0.8}); - } else { - tip.css({visibility: 'visible'}); - } - - }, function() { - $.data(this, 'cancel.tipsy', false); - var self = this; - setTimeout(function() { - if ($.data(this, 'cancel.tipsy')) return; - var tip = $.data(self, 'active.tipsy'); - if (opts.fade) { - tip.stop().fadeOut(function() { $(this).remove(); }); + + if (gravity.length == 2) { + if (gravity.charAt(1) == 'w') { + tp.left = pos.left + pos.width / 2 - 15; } else { - tip.remove(); + tp.left = pos.left + pos.width / 2 - actualWidth + 15; } - }, 100); - - }); - - }); + } + + $tip.css(tp).addClass('tipsy-' + gravity); + $tip.find('.tipsy-arrow')[0].className = 'tipsy-arrow tipsy-arrow-' + gravity.charAt(0); + if (this.options.className) { + $tip.addClass(maybeCall(this.options.className, this.$element[0])); + } + + if (this.options.fade) { + $tip.stop().css({opacity: 0, display: 'block', visibility: 'visible'}).animate({opacity: this.options.opacity}); + } else { + $tip.css({visibility: 'visible', opacity: this.options.opacity}); + } + } + }, + + hide: function() { + if (this.options.fade) { + this.tip().stop().fadeOut(function() { $(this).remove(); }); + } else { + this.tip().remove(); + } + }, + + fixTitle: function() { + var $e = this.$element; + if ($e.attr('title') || typeof($e.attr('original-title')) != 'string') { + $e.attr('original-title', $e.attr('title') || '').removeAttr('title'); + } + }, + + getTitle: function() { + var title, $e = this.$element, o = this.options; + this.fixTitle(); + var title, o = this.options; + if (typeof o.title == 'string') { + title = $e.attr(o.title == 'title' ? 'original-title' : o.title); + } else if (typeof o.title == 'function') { + title = o.title.call($e[0]); + } + title = ('' + title).replace(/(^\s*|\s*$)/, ""); + return title || o.fallback; + }, + tip: function() { + if (!this.$tip) { + this.$tip = $('<div class="tipsy"></div>').html('<div class="tipsy-arrow"></div><div class="tipsy-inner"></div>'); + } + return this.$tip; + }, + + validate: function() { + if (!this.$element[0].parentNode) { + this.hide(); + this.$element = null; + this.options = null; + } + }, + + enable: function() { this.enabled = true; }, + disable: function() { this.enabled = false; }, + toggleEnabled: function() { this.enabled = !this.enabled; } }; - // Overwrite this method to provide options on a per-element basis. - // For example, you could store the gravity in a 'tipsy-gravity' attribute: - // return $.extend({}, options, {gravity: $(ele).attr('tipsy-gravity') || 'n' }); - // (remember - do not modify 'options' in place!) - $.fn.tipsy.elementOptions = function(ele, options) { - return $.metadata ? $.extend({}, options, $(ele).metadata()) : options; + $.fn.tipsy = function(options) { + + if (options === true) { + return this.data('tipsy'); + } else if (typeof options == 'string') { + var tipsy = this.data('tipsy'); + if (tipsy) tipsy[options](); + return this; + } + + options = $.extend({}, $.fn.tipsy.defaults, options); + + function get(ele) { + var tipsy = $.data(ele, 'tipsy'); + if (!tipsy) { + tipsy = new Tipsy(ele, $.fn.tipsy.elementOptions(ele, options)); + $.data(ele, 'tipsy', tipsy); + } + return tipsy; + } + + function enter() { + var tipsy = get(this); + tipsy.hoverState = 'in'; + if (options.delayIn == 0) { + tipsy.show(); + } else { + tipsy.fixTitle(); + setTimeout(function() { if (tipsy.hoverState == 'in') tipsy.show(); }, options.delayIn); + } + }; + + function leave() { + var tipsy = get(this); + tipsy.hoverState = 'out'; + if (options.delayOut == 0) { + tipsy.hide(); + } else { + setTimeout(function() { if (tipsy.hoverState == 'out') tipsy.hide(); }, options.delayOut); + } + }; + + if (!options.live) this.each(function() { get(this); }); + + if (options.trigger != 'manual') { + var binder = options.live ? 'live' : 'bind', + eventIn = options.trigger == 'hover' ? 'mouseenter' : 'focus', + eventOut = options.trigger == 'hover' ? 'mouseleave' : 'blur'; + this[binder](eventIn, enter)[binder](eventOut, leave); + } + + return this; + }; $.fn.tipsy.defaults = { + className: null, + delayIn: 0, + delayOut: 0, fade: false, fallback: '', gravity: 'n', html: false, - title: 'title' + live: false, + offset: 0, + opacity: 0.8, + title: 'title', + trigger: 'hover' + }; + + // Overwrite this method to provide options on a per-element basis. + // For example, you could store the gravity in a 'tipsy-gravity' attribute: + // return $.extend({}, options, {gravity: $(ele).attr('tipsy-gravity') || 'n' }); + // (remember - do not modify 'options' in place!) + $.fn.tipsy.elementOptions = function(ele, options) { + return $.metadata ? $.extend({}, options, $(ele).metadata()) : options; }; $.fn.tipsy.autoNS = function() { @@ -105,4 +207,35 @@ return $(this).offset().left > ($(document).scrollLeft() + $(window).width() / 2) ? 'e' : 'w'; }; + /** + * yields a closure of the supplied parameters, producing a function that takes + * no arguments and is suitable for use as an autogravity function like so: + * + * @param margin (int) - distance from the viewable region edge that an + * element should be before setting its tooltip's gravity to be away + * from that edge. + * @param prefer (string, e.g. 'n', 'sw', 'w') - the direction to prefer + * if there are no viewable region edges effecting the tooltip's + * gravity. It will try to vary from this minimally, for example, + * if 'sw' is preferred and an element is near the right viewable + * region edge, but not the top edge, it will set the gravity for + * that element's tooltip to be 'se', preserving the southern + * component. + */ + $.fn.tipsy.autoBounds = function(margin, prefer) { + return function() { + var dir = {ns: prefer[0], ew: (prefer.length > 1 ? prefer[1] : false)}, + boundTop = $(document).scrollTop() + margin, + boundLeft = $(document).scrollLeft() + margin, + $this = $(this); + + if ($this.offset().top < boundTop) dir.ns = 'n'; + if ($this.offset().left < boundLeft) dir.ew = 'w'; + if ($(window).width() + $(document).scrollLeft() - $this.offset().left < margin) dir.ew = 'e'; + if ($(window).height() + $(document).scrollTop() - $this.offset().top < margin) dir.ns = 's'; + + return dir.ns + (dir.ew ? dir.ew : ''); + } + }; + })(jQuery); diff --git a/core/js/js.js b/core/js/js.js index 677cd5fbb7f..2f495321b86 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -298,10 +298,23 @@ $(document).ready(function(){ $('#settings #expanddiv').slideUp(); } }); - - $('.file_action').tipsy({gravity:'s', live:true}); - $('.selectedActions a').tipsy({gravity:'n', live:true}); - $('.selectedActions a.delete').tipsy({gravity: 'ne', live:true}); + + // all the tipsy stuff needs to be here (in reverse order) to work + $('.jp-controls .jp-previous').tipsy({gravity:'nw', fade:true, live:true}); + $('.jp-controls .jp-next').tipsy({gravity:'n', fade:true, live:true}); + $('.remove .action').tipsy({gravity:'se', fade:true, live:true}); + $('.date .action').tipsy({gravity:'se', fade:true, live:true}); + $('.action').tipsy({gravity:'s', fade:true, live:true}); + $('.selectedActions a.delete').tipsy({gravity: 'ne', fade:true, live:true}); + $('.selectedActions a').tipsy({gravity:'n', fade:true, live:true}); + $('.file_upload_button_wrapper').tipsy({gravity:'e', fade:true}); + $('td.filesize').tipsy({gravity:'s', fade:true, live:true}); + $('td .modified').tipsy({gravity:'s', fade:true, live:true}); + + $('input').tipsy({gravity:'w', fade:true}); + $('input[type=text]').focus(function(){ + this.select(); + }); }); if (!Array.prototype.map){ diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php index bd9886fcd90..a23561e9992 100644 --- a/core/l10n/bg_BG.php +++ b/core/l10n/bg_BG.php @@ -1,17 +1,14 @@ <?php $TRANSLATIONS = array( -"Error 404, Cloud not found" => "Грешка 404, обклакът не намерен", +"Login failed!" => "Входа пропадна!", +"Database name" => "Име на базата", "Advanced" => "Разширено", -"Set where to store the data." => "Изберете къде да записва данните", -"Data directory:" => "Директория за данни:", -"SQLite" => "SQLite", -"Database name:" => "Име на базата:", -"Host:" => "хост:", -"Table prefix:" => "Префикс за таблиците:", +"Host" => "хост", +"Table prefix" => "Префикс за таблиците", +"Data folder" => "Директория за данни", "Finish setup" => "Завършване на настройките", -"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs on your own server.</p>" => "<a href=\"http://owncloud.org/\">ownCloud</a> е персонален облак който работи от Ваш собствен сървър.</p>", -"Login failed!" => "Входа пропадна!", -"You are logged out." => "Вие излязохте.", +"Cloud not found" => "обклакът не намерен", +"is a personal cloud which runs on your own server" => "е персонален облак който работи от Ваш собствен сървър", "prev" => "пред.", "next" => "следващо", -"Search" => "Търсене" +"You are logged out." => "Вие излязохте." ); diff --git a/core/l10n/da.php b/core/l10n/da.php index 20d769f3856..b10f6e19d1f 100644 --- a/core/l10n/da.php +++ b/core/l10n/da.php @@ -1,17 +1,8 @@ <?php $TRANSLATIONS = array( -"Error 404, Cloud not found" => "Fejl 404, Skyen kan ikke findes", +"Login failed!" => "Login mislykkedes", "Advanced" => "Avanceret", -"Set where to store the data." => "Indstil data mappe.", -"Data directory:" => "Data mappe:", -"SQLite" => "SQLite", -"Database name:" => "Database navn:", -"Host:" => "Host:", -"Table prefix:" => "Tabel prefix:", "Finish setup" => "Afslut installation", -"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs on your own server.</p>" => "<a href=\"http://owncloud.org/\">ownCloud</a> er din personly sky der køre på din egen server.</p>", -"Login failed!" => "Login mislykkedes", -"You are logged out." => "Du er nu logget ud", "prev" => "forrige", "next" => "næste", -"Search" => "Søg" +"You are logged out." => "Du er nu logget ud" ); diff --git a/core/l10n/de.php b/core/l10n/de.php index 9b5225dd0fa..e6bc00513ea 100644 --- a/core/l10n/de.php +++ b/core/l10n/de.php @@ -1,28 +1,24 @@ <?php $TRANSLATIONS = array( -"Error 404, Cloud not found" => "Cloud konnte nicht gefunden werden.", -"<strong>ownCloud</strong> is your personal web storage." => "<strong>ownCloud</strong> ist dein persönlicher Online-Speicher.", -"Finish the setup by following the steps below." => "Die Installation ist fast abgeschlossen.", -"Create an <strong>admin account</strong>." => "<strong>Verwalter-Konto</strong> erstellen", +"Login failed!" => "Anmeldung fehlgeschlagen!", +"remember" => "merken", +"Create an <strong>admin account</strong>" => "<strong>Admin-Konto</strong> anlegen", "Username" => "Nutzername", "Password" => "Passwort", +"Configure the database" => "Datenbank einrichten", +"will be used" => "wird genutzt", +"Database user" => "Datenbanknutzer", +"Database password" => "Datenbankpasswort", +"Database name" => "Datenbankname", "Advanced" => "Erweitert", -"Set where to store the data." => "Speicherort der Daten", -"Data directory:" => "Datenverzeichnis:", -"Configure the database." => "Datenbank einrichten", -"SQLite will be used for the database. You have nothing to do." => "SQLite wird als Datenbank genutzt.", -"SQLite" => "SQLite", -"MySQL will be used for the database." => "MySQL wird als Datenbank genutzt.", -"MySQL username:" => "MySQL-Nutzername:", -"MySQL password:" => "MySQL-Passwort:", -"Database name:" => "Datenbankname:", -"Host:" => "Host:", -"Table prefix:" => "Tabellenpräfix:", +"Host" => "Host", +"Table prefix" => "Tabellenpräfix", +"Data folder" => "Datenverzeichnis", "Finish setup" => "Installation abschließen", -"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs on your own server.</p>" => "<a href=\"http://owncloud.org/\">ownCloud</a> ist ein privater Online-Speicher für deinen eigenen Server.</p>", -"Login failed!" => "Anmeldung fehlgeschlagen!", -"Remember login" => "Anmeldung merken", -"You are logged out." => "Erfolgreich abgemeldet.", +"Cloud not found" => "Cloud nicht verfügbar", +"is a personal cloud which runs on your own server" => "ist ein persönlicher Online-Speicher für deinen eigenen Server", "prev" => "Zurück", "next" => "Weiter", -"Search" => "Suchen" +"You are logged out." => "Erfolgreich abgemeldet.", +"Log out" => "Abmelden", +"Settings" => "Einstellungen" ); diff --git a/core/l10n/es.php b/core/l10n/es.php index 564bd795635..c602bc58e41 100644 --- a/core/l10n/es.php +++ b/core/l10n/es.php @@ -1,28 +1,10 @@ <?php $TRANSLATIONS = array( -"Error 404, Cloud not found" => "Error 404, La pagina no se pudo encontrar", -"<strong>ownCloud</strong> is your personal web storage." => "<strong>ownCloud</strong> es tu web de almacenamiento personal.", -"Finish the setup by following the steps below." => "Completa la instalación mediante los siguientes pasos.", -"Create an <strong>admin account</strong>." => "Crear una <strong>cuenta de administrador.</strong>", +"Login failed!" => "¡No se pudo iniciar sesión!", "Username" => "Nombre de usuario", "Password" => "Contraseña", "Advanced" => "Avanzado", -"Set where to store the data." => "Selecciona donde quieres almacenar los datos.", -"Data directory:" => "Directorio de almacenamiento:", -"Configure the database." => "Configurar la base de datos.", -"SQLite will be used for the database. You have nothing to do." => "Se utilizará SQLite para la base de datos. No necesitas configurar nada más.", -"SQLite" => "SQLite", -"MySQL will be used for the database." => "Se utilizará MySQL para la base de datos.", -"MySQL username:" => "Nombre de usuario de MySQL:", -"MySQL password:" => "Contraseña de MySQL:", -"Database name:" => "Nombre de la base de datos:", -"Host:" => "Host:", -"Table prefix:" => "Prefijo de la tabla:", "Finish setup" => "Completar la instalación", -"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs on your own server.</p>" => "<a href=\"http://owncloud.org/\">ownCloud</a> es tu nube personal que corre en tu propio servidor.</p>", -"Login failed!" => "¡No se pudo iniciar sesión!", -"Remember login" => "Recordarme", -"You are logged out." => "Has cerrado sesión.", "prev" => "anterior", "next" => "siguiente", -"Search" => "Buscar" +"You are logged out." => "Has cerrado sesión." ); diff --git a/core/l10n/fr.php b/core/l10n/fr.php index 996d37dcc82..087cad0fa1d 100644 --- a/core/l10n/fr.php +++ b/core/l10n/fr.php @@ -1,28 +1,24 @@ <?php $TRANSLATIONS = array( -"Error 404, Cloud not found" => "Erreur 404, la page demandée n'existe pas", -"<strong>ownCloud</strong> is your personal web storage." => "<strong>ownCloud</strong> est votre espace de stockage web personnel.", -"Finish the setup by following the steps below." => "Terminez l'installation en suivant les étapes ci-dessous.", -"Create an <strong>admin account</strong>." => "Veuillez créer un <strong>compte administrateur.</strong>", +"Login failed!" => "Échec de la connexion !", +"remember" => "se souvenir de moi", +"Create an <strong>admin account</strong>" => "Créer un <strong>compte administrateur</strong>", "Username" => "Nom d'utilisateur", "Password" => "Mot de passe", +"Configure the database" => "Configurer la base de données", +"will be used" => "sera utilisé", +"Database user" => "Utilisateur de la base de données", +"Database password" => "Mot de passe de la base de données", +"Database name" => "Nom de la base de données", "Advanced" => "Avancé", -"Set where to store the data." => "Sélectionnez où sauvegarder les données", -"Data directory:" => "Répertoire de données", -"Configure the database." => "Configurez la base de données.", -"SQLite will be used for the database. You have nothing to do." => "SQLite sera utilisé comme moteur pour la base de données. Vous n'avez rien de plus à faire.", -"SQLite" => "SQLite", -"MySQL will be used for the database." => "MySQL sera utilisé comme moteur pour la base de données.", -"MySQL username:" => "Nom d'utilisateur MySQL :", -"MySQL password:" => "Mot de passe MySQL :", -"Database name:" => "Nom de la base de données :", -"Host:" => "Hôte :", -"Table prefix:" => "Préfixe de table :", +"Host" => "Hôte", +"Table prefix" => "Préfixe des tables", +"Data folder" => "Répertoire des données", "Finish setup" => "Terminer l'installation", -"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs on your own server.</p>" => "<a href=\"http://owncloud.org/\">ownCloud</a> est votre solution cloud personnelle propulsée par votre propre serveur.</p>", -"Login failed!" => "Échec de la connexion !", -"Remember login" => "Se souvenir de moi", -"You are logged out." => "Vous êtes désormais déconnecté.", +"Cloud not found" => "Introuvable", +"is a personal cloud which runs on your own server" => "est un service de cloud personnel propulsé par votre propre serveur", "prev" => "précédent", "next" => "suivant", -"Search" => "Rechercher" +"You are logged out." => "Vous êtes désormais déconnecté.", +"Log out" => "Se déconnecter", +"Settings" => "Paramètres" ); diff --git a/core/l10n/nl.php b/core/l10n/nl.php index 033adc0e432..281de52ce4a 100644 --- a/core/l10n/nl.php +++ b/core/l10n/nl.php @@ -1,17 +1,8 @@ <?php $TRANSLATIONS = array( -"Error 404, Cloud not found" => "Fout 404, Cloud niet gevonden.", +"Login failed!" => "Aanmelden mislukt.", "Advanced" => "Geavanceerd", -"Set where to store the data." => "Bepaal de opslaglocatie.", -"Data directory:" => "Gegevensmap:", -"SQLite" => "SQLite", -"Database name:" => "Databasenaam:", -"Host:" => "Host:", -"Table prefix:" => "Voorvoegsel voor tabelnamen:", "Finish setup" => "Installatie afronden", -"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs on your own server.</p>" => "<a href=\"http://owncloud.org/\">ownCloud</a> is een persoonlijke cloud die op uw eigen server draait.</p>", -"Login failed!" => "Aanmelden mislukt.", -"You are logged out." => "U bent afgemeld.", "prev" => "vorige", "next" => "volgende", -"Search" => "Zoeken" +"You are logged out." => "U bent afgemeld." ); diff --git a/core/l10n/pl.php b/core/l10n/pl.php index 3e4993d4827..79ba6162dff 100644 --- a/core/l10n/pl.php +++ b/core/l10n/pl.php @@ -1,17 +1,8 @@ <?php $TRANSLATIONS = array( -"Error 404, Cloud not found" => "Błąd 404, Chmura nie znaleziona", +"Login failed!" => "Nie udało się zalogować!", "Advanced" => "Zaawansowane", -"Set where to store the data." => "Ustaw, gdzie przechowywać dane.", -"Data directory:" => "Katalog danych:", -"SQLite" => "SQLite", -"Database name:" => "Nazwa bazy:", -"Host:" => "Host:", -"Table prefix:" => "Przedrostek tabeli:", "Finish setup" => "Zakończ instalację", -"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs on your own server.</p>" => "<a href=\"http://owncloud.org/\">ownCloud</a> jest osobistą chmurą działającą na Twoim własnym serwerze.</p>", -"Login failed!" => "Nie udało się zalogować!", -"You are logged out." => "Jesteś wylogowany.", "prev" => "wstecz", "next" => "dalej", -"Search" => "Szukaj" +"You are logged out." => "Jesteś wylogowany." ); diff --git a/core/templates/installation.php b/core/templates/installation.php index 4371c4b17b1..ebd726b4fb9 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -29,18 +29,18 @@ <?php if($_['hasSQLite']): ?> <input type='hidden' id='hasSQLite' value='true' /> <?php if(!$hasOtherDB): ?> - <p><?php echo $l->t( 'SQLite will be used.' ); ?></p> + <p>SQLite <?php echo $l->t( 'will be used' ); ?>.</p> <input type="hidden" id="dbtype" name="dbtype" value="sqlite" /> <?php else: ?> <input type="radio" name="dbtype" value='sqlite' id="sqlite" <?php OC_Helper::init_radio('dbtype', 'sqlite', 'sqlite'); ?>/> - <label class="sqlite" for="sqlite"><?php echo $l->t( 'SQLite' ); ?></label> + <label class="sqlite" for="sqlite">SQLite</label> <?php endif; ?> <?php endif; ?> <?php if($_['hasMySQL']): ?> <input type='hidden' id='hasMySQL' value='true'/> <?php if(!$_['hasSQLite'] and !$_['hasPostgreSQL']): ?> - <p><?php echo $l->t( 'MySQL will be used.' ); ?></p> + <p>MySQL <?php echo $l->t( 'will be used' ); ?>.</p> <input type="hidden" id="dbtype" name="dbtype" value="mysql" /> <?php else: ?> <input type="radio" name="dbtype" value='mysql' id="mysql" <?php OC_Helper::init_radio('dbtype','pgsql', 'mysql', 'sqlite'); ?>/> @@ -50,7 +50,7 @@ <?php if($_['hasPostgreSQL']): ?> <?php if(!$_['hasSQLite'] and !$_['hasMySQL']): ?> - <p><?php echo $l->t( 'PostgreSQL will be used.' ); ?></p> + <p>PostgreSQL <?php echo $l->t( 'will be used' ); ?>.</p> <input type="hidden" id="dbtype" name="dbtype" value="pgsql" /> <?php else: ?> <label class="pgsql" for="pgsql">PostgreSQL</label> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 21388509f35..42c2539af13 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -35,6 +35,6 @@ </div></header> <?php echo $_['content']; ?> </div> - <footer><p class="info"><?php echo $l->t( '<a href="http://owncloud.org/">ownCloud</a> is a personal cloud which runs on your own server.</p>' ); ?></p></footer> + <footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> <?php echo $l->t( 'is a personal cloud which runs on your own server' ); ?>.</p></footer> </body> </html> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 81c0e73ea46..2e70fa29389 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -31,22 +31,15 @@ <header><div id="header"> <a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg" src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a> <form class="searchbox" action="#" method="post"> - <input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])){echo $_POST['query'];};?>" class="prettybutton" autocomplete="off" /> + <input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])){echo $_POST['query'];};?>" autocomplete="off" /> </form> - <a id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true" title="<?php echo $l->t('Log out');?>"><img class="svg" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a> + <a id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true"><img class="svg" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a> </div></header> <nav><div id="navigation"> <ul id="apps" class="svg"> <?php foreach($_['navigation'] as $entry): ?> <li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>><?php echo $entry['name']; ?></a> - <?php if( sizeof( $entry["subnavigation"] )): ?> - <ul> - <?php foreach($entry["subnavigation"] as $subentry):?> - <li class="subentry"><a style="background-image:url(<?php echo $subentry['icon']; ?>)" href="<?php echo $subentry['href']; ?>" title="" class="subentry<?php if( $subentry['active'] ): ?> active<?php endif; ?>"><?php echo $subentry['name'] ?></a></li> - <?php endforeach; ?> - </ul> - <?php endif; ?> </li> <?php endforeach; ?> </ul> @@ -57,11 +50,6 @@ <div id="expanddiv"> <?php foreach($_['settingsnavigation'] as $entry):?> <li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>><?php echo $entry['name'] ?></a></li> - <?php if( sizeof( $entry["subnavigation"] )): ?> - <?php foreach($entry["subnavigation"] as $subentry):?> - <li><a href="<?php echo $subentry['href']; ?>" title="" <?php if( $subentry['active'] ): ?>class="active"<?php endif; ?>><?php echo $subentry['name'] ?></a></li> - <?php endforeach; ?> - <?php endif; ?> <?php endforeach; ?> </div> </ul> diff --git a/files/css/files.css b/files/css/files.css index 9fcc24a80af..093d317e683 100644 --- a/files/css/files.css +++ b/files/css/files.css @@ -3,17 +3,17 @@ See the COPYING-README file. */ /* FILE MENU */ -.actions { padding:.6em; float:right; margin-right:13em; } -.actions input { margin:0; padding:.3em; } +.actions { padding:.3em; float:left; } +.actions input { margin:0; } #file_menu { right:0; position:absolute; top:0; } #file_menu a { display:block; float:left; background-image:none; text-decoration:none; } .file_upload_form, #file_newfolder_form { display:inline; float: left;} #fileSelector, #file_upload_submit, #file_newfolder_submit { display:none; } -.file_upload_wrapper, #file_newfolder_name { background-repeat:no-repeat; background-position:.5em .3em; padding-left:2em; } -.file_upload_wrapper { font-weight:bold; display:-moz-inline-box; /* fallback for older firefox versions*/ display:inline-block; padding-left:0; overflow:hidden; position:relative; margin-right:1.5em;} +.file_upload_wrapper, #file_newfolder_name { background-repeat:no-repeat; background-position:.5em .5em; padding-left:2em; } +.file_upload_wrapper { font-weight:bold; display:-moz-inline-box; /* fallback for older firefox versions*/ display:inline-block; padding-left:0; overflow:hidden; position:relative; margin:.1em 1em;} .file_upload_wrapper .file_upload_button_wrapper { position:absolute; top:0; left:0; width:100%; height:100%; cursor:pointer; z-index:1000; } -#file_newfolder_name { background-image:url('../../core/img/places/folder.svg'); font-weight:bold; width:8em; } +#file_newfolder_name { background-image:url('../../core/img/places/folder.svg'); font-weight:normal; width:6em; } .file_upload_start, .file_upload_filename { font-size:1em; } #file_newfolder_submit, #file_upload_submit { width:3em; } .file_upload_target { display:none; } @@ -26,7 +26,6 @@ /* FILE TABLE */ span#emptyfolder { position:absolute; margin:10em 0 0 10em; font-size:1.5em; font-weight:bold; color:#888; text-shadow:#fff 0 1px 0; } table { position:relative; top:37px; width:100%; } -table tr { -webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms; } tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#f8f8f8; height:1em; } tbody tr.selected { background-color:#eee; } tbody a { color:#000; } @@ -54,13 +53,14 @@ table td.filename .nametext { width:60%; } table td.filename form { float:left; font-size:.85em; } table thead.fixed tr{ position:fixed; top:6.3em; z-index:49; -moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000; } table thead.fixed { height:2em; } -#fileList tr td.filename>input[type=checkbox]:first-child { opacity:0; float:left; margin:.7em 0 0 1em; /* bigger clickable area doesn’t work in FF width:2.8em; height:2.4em;*/ -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; } -#fileList tr td.filename>input[type="checkbox"]:checked:first-child, #fileList tr:hover td.filename>input[type="checkbox"]:first-child { opacity:1; } +#fileList tr td.filename>input[type=checkbox]:first-child { opacity:0; float:left; margin:.7em 0 0 1em; /* bigger clickable area doesn’t work in FF width:2.8em; height:2.4em;*/ -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; } +#fileList tr:hover td.filename>input[type="checkbox"]:first-child { opacity:.5; } +#fileList tr td.filename>input[type="checkbox"]:checked:first-child { opacity:1; } #fileList tr td.filename { -webkit-transition:background-image 500ms; -moz-transition:background-image 500ms; -o-transition:background-image 500ms; transition:background-image 500ms; } #fileList tr.selected td.filename, #fileList tr:hover td.filename { background-image:url('') !important; } #select_all { float:left; margin:.2em; margin-left:.6em; } #uploadsize-message,#delete-confirm { display:none; } -.selectedActions a, a.file_action { float:right; display:inline; margin:0 .5em; padding:.3em .3em 0 .3em !important; } +.selectedActions a, a.action { float:right; display:inline; margin:0 .5em; padding:.3em .3em 0 .3em !important; } .selectedActions { display:none; } /* add breadcrumb divider to the File item in navigation panel */ diff --git a/files/js/fileactions.js b/files/js/fileactions.js index 2bc79abe723..a0a04ff1662 100644 --- a/files/js/fileactions.js +++ b/files/js/fileactions.js @@ -53,7 +53,7 @@ FileActions={ }, display:function(parent){ FileActions.currentFile=parent; - $('.file_action').remove(); + $('.action').remove(); var actions=FileActions.get(FileActions.getCurrentMimeType(),FileActions.getCurrentType()); var file=FileActions.getCurrentFile(); if($('tr[data-file="'+file+'"]').data('renaming')){ @@ -66,7 +66,7 @@ FileActions={ if(img.call){ img=img(file); } - var html='<a href="#" title="'+name+'" class="file_action"/>'; + var html='<a href="#" title="'+name+'" class="action" />'; var element=$(html); if(img){ element.append($('<img src="'+img+'"/>')); @@ -85,7 +85,7 @@ FileActions={ } if(actions['Delete']){ var img=FileActions.icons['Delete']; - var html='<a href="#" title="Delete" class="file_action"/>'; + var html='<a href="#" title="Delete" class="action" />'; var element=$(html); if(img){ element.append($('<img src="'+img+'"/>')); @@ -101,12 +101,12 @@ FileActions={ }); parent.parent().children().last().append(element); } - $('.file_action').hide(); - $('.file_action').fadeIn(200); + $('.action').hide(); + $('.action').fadeIn(200); return false; }, hide:function(){ - $('.file_action').fadeOut(200,function(){ + $('.action').fadeOut(200,function(){ $(this).remove(); }); }, diff --git a/files/js/files.js b/files/js/files.js index 8fdbd418462..f5a61a69a15 100644 --- a/files/js/files.js +++ b/files/js/files.js @@ -17,10 +17,6 @@ $(document).ready(function() { $(this).parent().children('.file_upload_start').trigger('click'); return false; }); - - $('#file_upload_button_wrapper').tipsy({gravity:'e'}); - $('td.filesize').tipsy({gravity:'se', live:true}); - $('td .modified').tipsy({gravity:'s', live:true}); // Sets the file-action buttons behaviour : $('tr').live('mouseenter',function(event) { diff --git a/files/l10n/de.php b/files/l10n/de.php new file mode 100644 index 00000000000..ade5a049503 --- /dev/null +++ b/files/l10n/de.php @@ -0,0 +1,14 @@ +<?php $TRANSLATIONS = array( +"Files" => "Dateien", +"Maximum upload size" => "Maximale Größe", +"Nothing in here. Upload something!" => "Alles leer. Lad’ was hoch!", +"Upload" => "Hochladen", +"New Folder" => "Neuer Ordner", +"Name" => "Name", +"Download" => "Herunterladen", +"Size" => "Größe", +"Modified" => "Bearbeitet", +"Delete" => "Löschen", +"Upload too large" => "Upload zu groß", +"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server." +); diff --git a/files/l10n/fr.php b/files/l10n/fr.php new file mode 100644 index 00000000000..ccaf9a3867d --- /dev/null +++ b/files/l10n/fr.php @@ -0,0 +1,14 @@ +<?php $TRANSLATIONS = array( +"Files" => "Fichiers", +"Maximum upload size" => "Taille max. d'envoi", +"Nothing in here. Upload something!" => "Il n'y a rien ici ! Envoyez donc quelque chose :)", +"Upload" => "Envoyer", +"New Folder" => "Nouveau dossier", +"Name" => "Nom", +"Download" => "Téléchargement", +"Size" => "Taille", +"Modified" => "Modifié", +"Delete" => "Supprimer", +"Upload too large" => "Fichier trop volumineux", +"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur." +); diff --git a/files/templates/admin.php b/files/templates/admin.php index e0cf2608301..0122865ee72 100644 --- a/files/templates/admin.php +++ b/files/templates/admin.php @@ -7,14 +7,4 @@ <?php else:?> No settings currently available. <?php endif;?> -<!-- <input type="checkbox" name="publicEnable" id="publicEnable" /><label for="publicEnable"> <?php echo $l->t( 'Allow public folders' ); ?></label><br> - - <div style="padding-left: 20px"> - <input type="radio" name="sharingaim" id="separated" /><label for="separated"> <?php echo $l->t( 'separated from webdav storage' ); ?></label><br> - <input type="radio" name="sharingaim" id="userdecide" /><label for="userdecide"> <?php echo $l->t( 'let the user decide' ); ?></label><br> - <input type="radio" name="sharingaim" id="inwebdav" /><label for="inwebdav"> <?php echo $l->t( 'folder "/public" in webdav storage' ); ?></label> - </div> - - <input type="checkbox" id="downloadShared" /><label for="downloadShared"> <?php echo $l->t( 'Allow downloading shared files' ); ?></label><br> - <input type="checkbox" id="uploadShared" /><label for="uploadShared"> <?php echo $l->t( 'Allow uploading in shared directory' ); ?></label><br>--> </form> diff --git a/help/appinfo/app.php b/help/appinfo/app.php deleted file mode 100644 index 372e28c97bd..00000000000 --- a/help/appinfo/app.php +++ /dev/null @@ -1,5 +0,0 @@ -<?php - -OC_App::register( array( "order" => 1, "id" => "help", "name" => "Help" )); - -?> diff --git a/help/css/help.css b/help/css/help.css deleted file mode 100644 index 2722c676a66..00000000000 --- a/help/css/help.css +++ /dev/null @@ -1,10 +0,0 @@ -/* APPS TABLE */ -table td.date { width:5em; padding:.5em 1em; text-align:right; } -.preview { padding:3px; text-align:left; } -table td.date { width:11em; color:#555555; } -table td.selection, table th.selection, table td.fileaction { width:2em; text-align:center; } -table td.name a { padding:6px; text-decoration:none; color:#555555; } -.type { text-decoration:none; color:#888888; font-size:.8em; } -.description { text-decoration:none; color:#666666; font-size:.9em; } - -table#help tr td { white-space:normal; } diff --git a/help/l10n/bg_BG.php b/help/l10n/bg_BG.php deleted file mode 100644 index 44f260693b3..00000000000 --- a/help/l10n/bg_BG.php +++ /dev/null @@ -1,4 +0,0 @@ -<?php $TRANSLATIONS = array( -"Questions and Answers" => "Въпроси и отговори", -"ASK A QUESTION" => "ЗАДАЙТЕ ВЪПРОС" -); diff --git a/help/l10n/da.php b/help/l10n/da.php deleted file mode 100644 index 2b8120c0c38..00000000000 --- a/help/l10n/da.php +++ /dev/null @@ -1,4 +0,0 @@ -<?php $TRANSLATIONS = array( -"Questions and Answers" => "Spørgsmål og Svar", -"ASK A QUESTION" => "STIL ET SPØRGSMÅL" -); diff --git a/help/l10n/de.php b/help/l10n/de.php deleted file mode 100644 index 07c5d1bb771..00000000000 --- a/help/l10n/de.php +++ /dev/null @@ -1,4 +0,0 @@ -<?php $TRANSLATIONS = array( -"Questions and Answers" => "Fragen & Antworten", -"ASK A QUESTION" => "Stell eine Frage" -); diff --git a/help/l10n/es.php b/help/l10n/es.php deleted file mode 100644 index e42c9db85de..00000000000 --- a/help/l10n/es.php +++ /dev/null @@ -1,4 +0,0 @@ -<?php $TRANSLATIONS = array( -"Questions and Answers" => "Preguntas y Respuestas", -"ASK A QUESTION" => "Haz una pregunta" -); diff --git a/help/l10n/fr.php b/help/l10n/fr.php deleted file mode 100644 index 2b9bf96684d..00000000000 --- a/help/l10n/fr.php +++ /dev/null @@ -1,4 +0,0 @@ -<?php $TRANSLATIONS = array( -"Questions and Answers" => "Questions / Réponses", -"ASK A QUESTION" => "Poser une question" -); diff --git a/help/l10n/nl.php b/help/l10n/nl.php deleted file mode 100644 index 11a28894c72..00000000000 --- a/help/l10n/nl.php +++ /dev/null @@ -1,4 +0,0 @@ -<?php $TRANSLATIONS = array( -"Questions and Answers" => "Vraag en Antwoord", -"ASK A QUESTION" => "Stel een vraag" -); diff --git a/help/l10n/pl.php b/help/l10n/pl.php deleted file mode 100644 index 7d37913d037..00000000000 --- a/help/l10n/pl.php +++ /dev/null @@ -1,4 +0,0 @@ -<?php $TRANSLATIONS = array( -"Questions and Answers" => "Pytania i odpowiedzi", -"ASK A QUESTION" => "ZADAJ PYTANIE" -); diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po index 63deb14b5c5..3d7bd63e6d3 100644 --- a/l10n/bg_BG/core.po +++ b/l10n/bg_BG/core.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Stefan Ilivanov <ilivanov@gmail.com>, 2011. +# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-28 00:33+0000\n" -"Last-Translator: ep98 <ilivanov@gmail.com>\n" +"POT-Creation-Date: 2011-08-13 04:33+0200\n" +"PO-Revision-Date: 2011-08-13 03:02+0000\n" +"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/team/bg_BG/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,112 +18,93 @@ msgstr "" "Language: bg_BG\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../templates/404.php:15 -msgid "Error 404, Cloud not found" -msgstr "Грешка 404, обклакът не намерен" - -#: ../templates/installation.php:6 -msgid "<strong>ownCloud</strong> is your personal web storage." -msgstr "" +#: templates/login.php:4 +msgid "Login failed!" +msgstr "Входа пропадна!" -#: ../templates/installation.php:7 -msgid "Finish the setup by following the steps below." +#: templates/login.php:9 templates/login.php:13 +msgid "remember" msgstr "" -#: ../templates/installation.php:26 -msgid "Create an <strong>admin account</strong>." +#: templates/installation.php:20 +msgid "Create an <strong>admin account</strong>" msgstr "" -#: ../templates/installation.php:27 +#: templates/installation.php:21 msgid "Username" msgstr "" -#: ../templates/installation.php:28 +#: templates/installation.php:22 msgid "Password" msgstr "" -#: ../templates/installation.php:31 -msgid "Advanced" -msgstr "Разширено" - -#: ../templates/installation.php:34 -msgid "Set where to store the data." -msgstr "Изберете къде да записва данните" - -#: ../templates/installation.php:35 -msgid "Data directory:" -msgstr "Директория за данни:" - -#: ../templates/installation.php:39 -msgid "Configure the database." +#: templates/installation.php:27 +msgid "Configure the database" msgstr "" -#: ../templates/installation.php:43 -msgid "SQLite will be used for the database. You have nothing to do." +#: templates/installation.php:32 templates/installation.php:43 +#: templates/installation.php:53 +msgid "will be used" msgstr "" -#: ../templates/installation.php:46 -msgid "SQLite" -msgstr "SQLite" - -#: ../templates/installation.php:53 -msgid "MySQL will be used for the database." +#: templates/installation.php:64 +msgid "Database user" msgstr "" -#: ../templates/installation.php:59 -msgid "MySQL username:" +#: templates/installation.php:65 +msgid "Database password" msgstr "" -#: ../templates/installation.php:60 -msgid "MySQL password:" -msgstr "" +#: templates/installation.php:66 +msgid "Database name" +msgstr "Име на базата" -#: ../templates/installation.php:61 -msgid "Database name:" -msgstr "Име на базата:" +#: templates/installation.php:74 +msgid "Advanced" +msgstr "Разширено" + +#: templates/installation.php:77 +msgid "Host" +msgstr "хост" -#: ../templates/installation.php:62 -msgid "Host:" -msgstr "хост:" +#: templates/installation.php:78 +msgid "Table prefix" +msgstr "Префикс за таблиците" -#: ../templates/installation.php:63 -msgid "Table prefix:" -msgstr "Префикс за таблиците:" +#: templates/installation.php:80 +msgid "Data folder" +msgstr "Директория за данни" -#: ../templates/installation.php:69 +#: templates/installation.php:83 msgid "Finish setup" msgstr "Завършване на настройките" -#: ../templates/layout.guest.php:33 -msgid "" -"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs" -" on your own server.</p>" -msgstr "" -"<a href=\"http://owncloud.org/\">ownCloud</a> е персонален облак който " -"работи от Ваш собствен сървър.</p>" - -#: ../templates/login.php:6 -msgid "Login failed!" -msgstr "Входа пропадна!" +#: templates/404.php:12 +msgid "Cloud not found" +msgstr "обклакът не намерен" -#: ../templates/login.php:11 ../templates/login.php:15 -msgid "Remember login" -msgstr "" - -#: ../templates/logout.php:1 -msgid "You are logged out." -msgstr "Вие излязохте." +#: templates/layout.guest.php:38 +msgid "is a personal cloud which runs on your own server" +msgstr "е персонален облак който работи от Ваш собствен сървър" -#: ../templates/part.pagenavi.php:6 +#: templates/part.pagenavi.php:6 msgid "prev" msgstr "пред." -#: ../templates/part.pagenavi.php:26 +#: templates/part.pagenavi.php:26 msgid "next" msgstr "следващо" -#: ../templates/part.searchbox.php:3 -msgid "Search" -msgstr "Търсене" +#: templates/logout.php:1 +msgid "You are logged out." +msgstr "Вие излязохте." + +#: templates/layout.user.php:36 +msgid "Log out" +msgstr "" + +#: templates/layout.user.php:56 +msgid "Settings" +msgstr "" diff --git a/l10n/bg_BG/help.po b/l10n/bg_BG/help.po deleted file mode 100644 index b204195b8be..00000000000 --- a/l10n/bg_BG/help.po +++ /dev/null @@ -1,28 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Stefan Ilivanov <ilivanov@gmail.com>, 2011. -msgid "" -msgstr "" -"Project-Id-Version: ownCloud\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-25 21:21+0000\n" -"Last-Translator: ep98 <ilivanov@gmail.com>\n" -"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/team/bg_BG/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: bg_BG\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" - -#: ../templates/index.php:2 -msgid "Questions and Answers" -msgstr "Въпроси и отговори" - -#: ../templates/index.php:24 -msgid "ASK A QUESTION" -msgstr "ЗАДАЙТЕ ВЪПРОС" - - diff --git a/l10n/bg_BG/log.po b/l10n/bg_BG/log.po deleted file mode 100644 index ff886397449..00000000000 --- a/l10n/bg_BG/log.po +++ /dev/null @@ -1,68 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Stefan Ilivanov <ilivanov@gmail.com>, 2011. -msgid "" -msgstr "" -"Project-Id-Version: ownCloud\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-25 21:23+0000\n" -"Last-Translator: ep98 <ilivanov@gmail.com>\n" -"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/team/bg_BG/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: bg_BG\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" - -#: ../templates/index.php:4 -msgid "Filter:" -msgstr "Филтър:" - -#: ../templates/index.php:7 -msgid "Logins" -msgstr "Влизания:" - -#: ../templates/index.php:8 -msgid "Logouts" -msgstr "Изходи:" - -#: ../templates/index.php:9 -msgid "Downloads" -msgstr "Тегления" - -#: ../templates/index.php:10 -msgid "Uploads" -msgstr "Качвания" - -#: ../templates/index.php:11 -msgid "Creations" -msgstr "Създавания:" - -#: ../templates/index.php:12 -msgid "Deletions" -msgstr "Изтривания:" - -#: ../templates/index.php:15 -msgid "Show:" -msgstr "Показва:" - -#: ../templates/index.php:16 -msgid "entries per page." -msgstr "записа на страница." - -#: ../templates/index.php:26 -msgid "What" -msgstr "Какво" - -#: ../templates/index.php:27 -msgid "When" -msgstr "Кога" - -#: ../templates/index.php:45 -msgid "Clear log entries before" -msgstr "Изчисти записите от журналите" - - diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po index e6ad1aaf6ee..f1d431bc8f3 100644 --- a/l10n/bg_BG/settings.po +++ b/l10n/bg_BG/settings.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-25 21:25+0000\n" -"Last-Translator: ep98 <ilivanov@gmail.com>\n" +"POT-Creation-Date: 2011-08-13 04:33+0200\n" +"PO-Revision-Date: 2011-08-13 02:19+0000\n" +"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/team/bg_BG/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,72 +17,96 @@ msgstr "" "Language: bg_BG\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../templates/index.php:3 +#: ajax/openid.php:13 ajax/setlanguage.php:13 +msgid "Authentication error" +msgstr "Проблем с индентификацията" + +#: ajax/openid.php:21 +msgid "OpenID Changed" +msgstr "" + +#: ajax/openid.php:23 ajax/setlanguage.php:23 +msgid "Invalid request" +msgstr "Невалидна заявка" + +#: ajax/setlanguage.php:21 +msgid "Language changed" +msgstr "Езика е сменен" + +#: templates/help.php:21 +msgid "Ask a question" +msgstr "" + +#: templates/apps.php:12 +msgid "Select an App" +msgstr "" + +#: templates/apps.php:14 +msgid "-licensed" +msgstr "" + +#: templates/apps.php:14 +msgid "by" +msgstr "" + +#: templates/personal.php:3 msgid "Account information" msgstr "Информация за профила" -#: ../templates/index.php:5 +#: templates/personal.php:5 msgid "You're currently using" msgstr "Вие ползвате" -#: ../templates/index.php:5 +#: templates/personal.php:5 msgid "of your" msgstr "на Вашето" -#: ../templates/index.php:5 +#: templates/personal.php:5 msgid "space" msgstr "място" -#: ../templates/index.php:11 +#: templates/personal.php:11 templates/personal.php:17 msgid "Change Password" msgstr "Промяна на парола" -#: ../templates/index.php:12 +#: templates/personal.php:12 msgid "Your password got changed" msgstr "Вашата парола е сменена" -#: ../templates/index.php:15 -msgid "Old password:" -msgstr "Стара парола" +#: templates/personal.php:14 +msgid "Old password" +msgstr "" -#: ../templates/index.php:19 +#: templates/personal.php:15 msgid "New password" msgstr "Нова парола" -#: ../templates/index.php:24 -msgid "Show new password" -msgstr "Покажи новата парола" +#: templates/personal.php:16 +msgid "show" +msgstr "" -#: ../templates/index.php:34 +#: templates/personal.php:23 msgid "Language" msgstr "Език" -#: ../ajax/changepassword.php:13 ../ajax/setlanguage.php:13 -msgid "Authentication error" -msgstr "Проблем с индентификацията" - -#: ../ajax/changepassword.php:19 -msgid "You have to enter the old and the new password!" -msgstr "Трябва да въведете новата и старата парола!" - -#: ../ajax/changepassword.php:25 -msgid "Your old password is wrong!" -msgstr "Вашата стара парола е грешна!" +#: templates/users.php:11 +msgid "Name" +msgstr "" -#: ../ajax/changepassword.php:31 -msgid "Password changed" -msgstr "Паролата е сменена" +#: templates/users.php:12 +msgid "Password" +msgstr "" -#: ../ajax/changepassword.php:34 -msgid "Unable to change password" -msgstr "Невъзможна смяна на паролата" +#: templates/users.php:13 templates/users.php:28 +msgid "Groups" +msgstr "" -#: ../ajax/setlanguage.php:21 -msgid "Language changed" -msgstr "Езика е сменен" +#: templates/users.php:18 +msgid "Create" +msgstr "" -#: ../ajax/setlanguage.php:23 -msgid "Invalid request" -msgstr "Невалидна заявка" +#: templates/users.php:36 +msgid "Remove" +msgstr "" diff --git a/l10n/da/admin.po b/l10n/da/admin.po deleted file mode 100644 index 82c29165438..00000000000 --- a/l10n/da/admin.po +++ /dev/null @@ -1,93 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011. -msgid "" -msgstr "" -"Project-Id-Version: ownCloud\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-28 00:09+0000\n" -"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n" -"Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: da\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" - -#: ../templates/app.php:22 -msgid "read more" -msgstr "læs mere" - -#: ../templates/app.php:24 -msgid "INSTALL" -msgstr "INSTALLER" - -#: ../templates/app_noconn.php:6 ../templates/apps.php:6 -msgid "Apps Repository" -msgstr "Applikation arkiv" - -#: ../templates/app_noconn.php:7 -msgid "Cannot connect to apps repository" -msgstr "Kan ikke oprette forbindelse til applikations arkivet" - -#: ../templates/apps.php:13 ../templates/users.php:6 ../templates/users.php:15 -#: ../templates/users.php:51 -msgid "Name" -msgstr "Navn" - -#: ../templates/apps.php:14 -msgid "Modified" -msgstr "Ændret" - -#: ../templates/system.php:6 -msgid "Administration" -msgstr "Administration" - -#: ../templates/system.php:7 -msgid "System Settings" -msgstr "System indstillinger" - -#: ../templates/users.php:2 -msgid "Users" -msgstr "Brugere" - -#: ../templates/users.php:7 ../templates/users.php:47 -msgid "Groups" -msgstr "Grupper" - -#: ../templates/users.php:16 -msgid "Password" -msgstr "Kodeord" - -#: ../templates/users.php:25 -msgid "Create" -msgstr "" - -#: ../templates/users.php:37 ../templates/users.php:69 -msgid "remove" -msgstr "slet" - -#: ../templates/users.php:59 -msgid "Create group" -msgstr "Lav gruppe" - -#: ../templates/users.php:95 -msgid "Force new password:" -msgstr "Tving ny adgangskode" - -#: ../templates/users.php:97 -msgid "Set" -msgstr "Indstil" - -#: ../templates/users.php:103 -msgid "Do you really want to delete user" -msgstr "Vil du virkelig slette denne bruger?" - -#: ../templates/users.php:110 -msgid "Do you really want to delete group" -msgstr "Vil du virkelig slette denne gruppe?" - - diff --git a/l10n/da/core.po b/l10n/da/core.po index 0b37d9ac8ce..28767ff39d8 100644 --- a/l10n/da/core.po +++ b/l10n/da/core.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-28 00:33+0000\n" +"POT-Creation-Date: 2011-08-13 04:33+0200\n" +"PO-Revision-Date: 2011-08-13 02:33+0000\n" "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n" "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n" "MIME-Version: 1.0\n" @@ -16,112 +16,93 @@ msgstr "" "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../templates/404.php:15 -msgid "Error 404, Cloud not found" -msgstr "Fejl 404, Skyen kan ikke findes" - -#: ../templates/installation.php:6 -msgid "<strong>ownCloud</strong> is your personal web storage." -msgstr "" +#: templates/login.php:4 +msgid "Login failed!" +msgstr "Login mislykkedes" -#: ../templates/installation.php:7 -msgid "Finish the setup by following the steps below." +#: templates/login.php:9 templates/login.php:13 +msgid "remember" msgstr "" -#: ../templates/installation.php:26 -msgid "Create an <strong>admin account</strong>." +#: templates/installation.php:20 +msgid "Create an <strong>admin account</strong>" msgstr "" -#: ../templates/installation.php:27 +#: templates/installation.php:21 msgid "Username" msgstr "" -#: ../templates/installation.php:28 +#: templates/installation.php:22 msgid "Password" msgstr "" -#: ../templates/installation.php:31 -msgid "Advanced" -msgstr "Avanceret" +#: templates/installation.php:27 +msgid "Configure the database" +msgstr "" -#: ../templates/installation.php:34 -msgid "Set where to store the data." -msgstr "Indstil data mappe." +#: templates/installation.php:32 templates/installation.php:43 +#: templates/installation.php:53 +msgid "will be used" +msgstr "" -#: ../templates/installation.php:35 -msgid "Data directory:" -msgstr "Data mappe:" +#: templates/installation.php:64 +msgid "Database user" +msgstr "" -#: ../templates/installation.php:39 -msgid "Configure the database." +#: templates/installation.php:65 +msgid "Database password" msgstr "" -#: ../templates/installation.php:43 -msgid "SQLite will be used for the database. You have nothing to do." +#: templates/installation.php:66 +msgid "Database name" msgstr "" -#: ../templates/installation.php:46 -msgid "SQLite" -msgstr "SQLite" +#: templates/installation.php:74 +msgid "Advanced" +msgstr "Avanceret" -#: ../templates/installation.php:53 -msgid "MySQL will be used for the database." +#: templates/installation.php:77 +msgid "Host" msgstr "" -#: ../templates/installation.php:59 -msgid "MySQL username:" +#: templates/installation.php:78 +msgid "Table prefix" msgstr "" -#: ../templates/installation.php:60 -msgid "MySQL password:" +#: templates/installation.php:80 +msgid "Data folder" msgstr "" -#: ../templates/installation.php:61 -msgid "Database name:" -msgstr "Database navn:" - -#: ../templates/installation.php:62 -msgid "Host:" -msgstr "Host:" - -#: ../templates/installation.php:63 -msgid "Table prefix:" -msgstr "Tabel prefix:" - -#: ../templates/installation.php:69 +#: templates/installation.php:83 msgid "Finish setup" msgstr "Afslut installation" -#: ../templates/layout.guest.php:33 -msgid "" -"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs" -" on your own server.</p>" +#: templates/404.php:12 +msgid "Cloud not found" msgstr "" -"<a href=\"http://owncloud.org/\">ownCloud</a> er din personly sky der køre " -"på din egen server.</p>" - -#: ../templates/login.php:6 -msgid "Login failed!" -msgstr "Login mislykkedes" -#: ../templates/login.php:11 ../templates/login.php:15 -msgid "Remember login" +#: templates/layout.guest.php:38 +msgid "is a personal cloud which runs on your own server" msgstr "" -#: ../templates/logout.php:1 -msgid "You are logged out." -msgstr "Du er nu logget ud" - -#: ../templates/part.pagenavi.php:6 +#: templates/part.pagenavi.php:6 msgid "prev" msgstr "forrige" -#: ../templates/part.pagenavi.php:26 +#: templates/part.pagenavi.php:26 msgid "next" msgstr "næste" -#: ../templates/part.searchbox.php:3 -msgid "Search" -msgstr "Søg" +#: templates/logout.php:1 +msgid "You are logged out." +msgstr "Du er nu logget ud" + +#: templates/layout.user.php:36 +msgid "Log out" +msgstr "" + +#: templates/layout.user.php:56 +msgid "Settings" +msgstr "" diff --git a/l10n/da/help.po b/l10n/da/help.po deleted file mode 100644 index e3300adc4d4..00000000000 --- a/l10n/da/help.po +++ /dev/null @@ -1,27 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -msgid "" -msgstr "" -"Project-Id-Version: ownCloud\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-25 16:17+0000\n" -"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n" -"Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: da\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" - -#: ../templates/index.php:2 -msgid "Questions and Answers" -msgstr "Spørgsmål og Svar" - -#: ../templates/index.php:24 -msgid "ASK A QUESTION" -msgstr "STIL ET SPØRGSMÅL" - - diff --git a/l10n/da/log.po b/l10n/da/log.po deleted file mode 100644 index b52c2ad512c..00000000000 --- a/l10n/da/log.po +++ /dev/null @@ -1,67 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -msgid "" -msgstr "" -"Project-Id-Version: ownCloud\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-25 16:17+0000\n" -"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n" -"Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: da\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" - -#: ../templates/index.php:4 -msgid "Filter:" -msgstr "Filter:" - -#: ../templates/index.php:7 -msgid "Logins" -msgstr "Logins" - -#: ../templates/index.php:8 -msgid "Logouts" -msgstr "Logouts" - -#: ../templates/index.php:9 -msgid "Downloads" -msgstr "Downloads" - -#: ../templates/index.php:10 -msgid "Uploads" -msgstr "Uploads" - -#: ../templates/index.php:11 -msgid "Creations" -msgstr "Oprettelser" - -#: ../templates/index.php:12 -msgid "Deletions" -msgstr "Sletninger" - -#: ../templates/index.php:15 -msgid "Show:" -msgstr "Vis:" - -#: ../templates/index.php:16 -msgid "entries per page." -msgstr "poster pr side." - -#: ../templates/index.php:26 -msgid "What" -msgstr "Hvilket" - -#: ../templates/index.php:27 -msgid "When" -msgstr "Hvornår" - -#: ../templates/index.php:45 -msgid "Clear log entries before" -msgstr "Slet log poster før" - - diff --git a/l10n/da/settings.po b/l10n/da/settings.po index 17e84dbfcd0..ec00a325a4c 100644 --- a/l10n/da/settings.po +++ b/l10n/da/settings.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-25 16:17+0000\n" +"POT-Creation-Date: 2011-08-13 04:33+0200\n" +"PO-Revision-Date: 2011-08-13 02:19+0000\n" "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n" "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n" "MIME-Version: 1.0\n" @@ -16,72 +16,96 @@ msgstr "" "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../templates/index.php:3 +#: ajax/openid.php:13 ajax/setlanguage.php:13 +msgid "Authentication error" +msgstr "Godkendelsesfejl" + +#: ajax/openid.php:21 +msgid "OpenID Changed" +msgstr "" + +#: ajax/openid.php:23 ajax/setlanguage.php:23 +msgid "Invalid request" +msgstr "Invalid forespørgsel" + +#: ajax/setlanguage.php:21 +msgid "Language changed" +msgstr "Sprog ændret" + +#: templates/help.php:21 +msgid "Ask a question" +msgstr "" + +#: templates/apps.php:12 +msgid "Select an App" +msgstr "" + +#: templates/apps.php:14 +msgid "-licensed" +msgstr "" + +#: templates/apps.php:14 +msgid "by" +msgstr "" + +#: templates/personal.php:3 msgid "Account information" msgstr "Konto information" -#: ../templates/index.php:5 +#: templates/personal.php:5 msgid "You're currently using" msgstr "Du udnytter i øjeblikket" -#: ../templates/index.php:5 +#: templates/personal.php:5 msgid "of your" msgstr "af din" -#: ../templates/index.php:5 +#: templates/personal.php:5 msgid "space" msgstr "plads" -#: ../templates/index.php:11 +#: templates/personal.php:11 templates/personal.php:17 msgid "Change Password" msgstr "Ændre adgangskode" -#: ../templates/index.php:12 +#: templates/personal.php:12 msgid "Your password got changed" msgstr "Din adgangskode er ændret" -#: ../templates/index.php:15 -msgid "Old password:" -msgstr "Gamle adgangskode" +#: templates/personal.php:14 +msgid "Old password" +msgstr "" -#: ../templates/index.php:19 +#: templates/personal.php:15 msgid "New password" msgstr "Nye adgangskode" -#: ../templates/index.php:24 -msgid "Show new password" -msgstr "Vis den nye adgangskode" +#: templates/personal.php:16 +msgid "show" +msgstr "" -#: ../templates/index.php:34 +#: templates/personal.php:23 msgid "Language" msgstr "Sprog" -#: ../ajax/changepassword.php:13 ../ajax/setlanguage.php:13 -msgid "Authentication error" -msgstr "Godkendelsesfejl" - -#: ../ajax/changepassword.php:19 -msgid "You have to enter the old and the new password!" -msgstr "Du skal indtaste din gamle og nye adganskode" - -#: ../ajax/changepassword.php:25 -msgid "Your old password is wrong!" -msgstr "Din gamle adgangskode er forkert!" +#: templates/users.php:11 +msgid "Name" +msgstr "" -#: ../ajax/changepassword.php:31 -msgid "Password changed" -msgstr "Adgangskoden er ændret" +#: templates/users.php:12 +msgid "Password" +msgstr "" -#: ../ajax/changepassword.php:34 -msgid "Unable to change password" -msgstr "Kan ikke ændre din adgangskode" +#: templates/users.php:13 templates/users.php:28 +msgid "Groups" +msgstr "" -#: ../ajax/setlanguage.php:21 -msgid "Language changed" -msgstr "Sprog ændret" +#: templates/users.php:18 +msgid "Create" +msgstr "" -#: ../ajax/setlanguage.php:23 -msgid "Invalid request" -msgstr "Invalid forespørgsel" +#: templates/users.php:36 +msgid "Remove" +msgstr "" diff --git a/l10n/de/admin.po b/l10n/de/admin.po deleted file mode 100644 index 4495f3994e1..00000000000 --- a/l10n/de/admin.po +++ /dev/null @@ -1,93 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011. -msgid "" -msgstr "" -"Project-Id-Version: ownCloud\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-28 00:09+0000\n" -"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n" -"Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: de\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" - -#: ../templates/app.php:22 -msgid "read more" -msgstr "mehr …" - -#: ../templates/app.php:24 -msgid "INSTALL" -msgstr "Installieren" - -#: ../templates/app_noconn.php:6 ../templates/apps.php:6 -msgid "Apps Repository" -msgstr "Anwendungen" - -#: ../templates/app_noconn.php:7 -msgid "Cannot connect to apps repository" -msgstr "Verbindung fehlgeschlagen" - -#: ../templates/apps.php:13 ../templates/users.php:6 ../templates/users.php:15 -#: ../templates/users.php:51 -msgid "Name" -msgstr "Name" - -#: ../templates/apps.php:14 -msgid "Modified" -msgstr "Änderungsdatum" - -#: ../templates/system.php:6 -msgid "Administration" -msgstr "Verwaltung" - -#: ../templates/system.php:7 -msgid "System Settings" -msgstr "Systemeinstellungen" - -#: ../templates/users.php:2 -msgid "Users" -msgstr "Nutzer" - -#: ../templates/users.php:7 ../templates/users.php:47 -msgid "Groups" -msgstr "Gruppen" - -#: ../templates/users.php:16 -msgid "Password" -msgstr "Passwort" - -#: ../templates/users.php:25 -msgid "Create" -msgstr "Erstellen" - -#: ../templates/users.php:37 ../templates/users.php:69 -msgid "remove" -msgstr "entfernen" - -#: ../templates/users.php:59 -msgid "Create group" -msgstr "Gruppe erstellen" - -#: ../templates/users.php:95 -msgid "Force new password:" -msgstr "Neues Passwort:" - -#: ../templates/users.php:97 -msgid "Set" -msgstr "OK" - -#: ../templates/users.php:103 -msgid "Do you really want to delete user" -msgstr "Möchtest du den Nutzer wirklich entfernen?" - -#: ../templates/users.php:110 -msgid "Do you really want to delete group" -msgstr "Möchtest du die Gruppe wirklich entfernen?" - - diff --git a/l10n/de/core.po b/l10n/de/core.po index 20aa6c30ecc..3561e8e4251 100644 --- a/l10n/de/core.po +++ b/l10n/de/core.po @@ -2,13 +2,14 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # +# <georg.stefan.germany@googlemail.com>, 2011. # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-28 12:04+0000\n" +"POT-Creation-Date: 2011-08-13 04:33+0200\n" +"PO-Revision-Date: 2011-08-13 02:35+0000\n" "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n" "Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n" "MIME-Version: 1.0\n" @@ -17,112 +18,93 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../templates/404.php:15 -msgid "Error 404, Cloud not found" -msgstr "Cloud konnte nicht gefunden werden." - -#: ../templates/installation.php:6 -msgid "<strong>ownCloud</strong> is your personal web storage." -msgstr "<strong>ownCloud</strong> ist dein persönlicher Online-Speicher." +#: templates/login.php:4 +msgid "Login failed!" +msgstr "Anmeldung fehlgeschlagen!" -#: ../templates/installation.php:7 -msgid "Finish the setup by following the steps below." -msgstr "Die Installation ist fast abgeschlossen." +#: templates/login.php:9 templates/login.php:13 +msgid "remember" +msgstr "merken" -#: ../templates/installation.php:26 -msgid "Create an <strong>admin account</strong>." -msgstr "<strong>Verwalter-Konto</strong> erstellen" +#: templates/installation.php:20 +msgid "Create an <strong>admin account</strong>" +msgstr "<strong>Admin-Konto</strong> anlegen" -#: ../templates/installation.php:27 +#: templates/installation.php:21 msgid "Username" msgstr "Nutzername" -#: ../templates/installation.php:28 +#: templates/installation.php:22 msgid "Password" msgstr "Passwort" -#: ../templates/installation.php:31 -msgid "Advanced" -msgstr "Erweitert" - -#: ../templates/installation.php:34 -msgid "Set where to store the data." -msgstr "Speicherort der Daten" - -#: ../templates/installation.php:35 -msgid "Data directory:" -msgstr "Datenverzeichnis:" - -#: ../templates/installation.php:39 -msgid "Configure the database." +#: templates/installation.php:27 +msgid "Configure the database" msgstr "Datenbank einrichten" -#: ../templates/installation.php:43 -msgid "SQLite will be used for the database. You have nothing to do." -msgstr "SQLite wird als Datenbank genutzt." +#: templates/installation.php:32 templates/installation.php:43 +#: templates/installation.php:53 +msgid "will be used" +msgstr "wird genutzt" -#: ../templates/installation.php:46 -msgid "SQLite" -msgstr "SQLite" +#: templates/installation.php:64 +msgid "Database user" +msgstr "Datenbanknutzer" -#: ../templates/installation.php:53 -msgid "MySQL will be used for the database." -msgstr "MySQL wird als Datenbank genutzt." +#: templates/installation.php:65 +msgid "Database password" +msgstr "Datenbankpasswort" -#: ../templates/installation.php:59 -msgid "MySQL username:" -msgstr "MySQL-Nutzername:" +#: templates/installation.php:66 +msgid "Database name" +msgstr "Datenbankname" -#: ../templates/installation.php:60 -msgid "MySQL password:" -msgstr "MySQL-Passwort:" +#: templates/installation.php:74 +msgid "Advanced" +msgstr "Erweitert" -#: ../templates/installation.php:61 -msgid "Database name:" -msgstr "Datenbankname:" +#: templates/installation.php:77 +msgid "Host" +msgstr "Host" -#: ../templates/installation.php:62 -msgid "Host:" -msgstr "Host:" +#: templates/installation.php:78 +msgid "Table prefix" +msgstr "Tabellenpräfix" -#: ../templates/installation.php:63 -msgid "Table prefix:" -msgstr "Tabellenpräfix:" +#: templates/installation.php:80 +msgid "Data folder" +msgstr "Datenverzeichnis" -#: ../templates/installation.php:69 +#: templates/installation.php:83 msgid "Finish setup" msgstr "Installation abschließen" -#: ../templates/layout.guest.php:33 -msgid "" -"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs" -" on your own server.</p>" -msgstr "" -"<a href=\"http://owncloud.org/\">ownCloud</a> ist ein privater Online-" -"Speicher für deinen eigenen Server.</p>" - -#: ../templates/login.php:6 -msgid "Login failed!" -msgstr "Anmeldung fehlgeschlagen!" +#: templates/404.php:12 +msgid "Cloud not found" +msgstr "Cloud nicht verfügbar" -#: ../templates/login.php:11 ../templates/login.php:15 -msgid "Remember login" -msgstr "Anmeldung merken" +#: templates/layout.guest.php:38 +msgid "is a personal cloud which runs on your own server" +msgstr "ist ein persönlicher Online-Speicher für deinen eigenen Server" -#: ../templates/logout.php:1 -msgid "You are logged out." -msgstr "Erfolgreich abgemeldet." - -#: ../templates/part.pagenavi.php:6 +#: templates/part.pagenavi.php:6 msgid "prev" msgstr "Zurück" -#: ../templates/part.pagenavi.php:26 +#: templates/part.pagenavi.php:26 msgid "next" msgstr "Weiter" -#: ../templates/part.searchbox.php:3 -msgid "Search" -msgstr "Suchen" +#: templates/logout.php:1 +msgid "You are logged out." +msgstr "Erfolgreich abgemeldet." + +#: templates/layout.user.php:36 +msgid "Log out" +msgstr "Abmelden" + +#: templates/layout.user.php:56 +msgid "Settings" +msgstr "Einstellungen" diff --git a/l10n/de/files.po b/l10n/de/files.po new file mode 100644 index 00000000000..870b38d767a --- /dev/null +++ b/l10n/de/files.po @@ -0,0 +1,71 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011. +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" +"POT-Creation-Date: 2011-08-13 05:10+0200\n" +"PO-Revision-Date: 2011-08-13 02:38+0000\n" +"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n" +"Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" + +#: appinfo/app.php:7 +msgid "Files" +msgstr "Dateien" + +#: templates/admin.php:5 +msgid "Maximum upload size" +msgstr "Maximale Größe" + +#: templates/part.list.php:1 +msgid "Nothing in here. Upload something!" +msgstr "Alles leer. Lad’ was hoch!" + +#: templates/index.php:9 +msgid "Upload" +msgstr "Hochladen" + +#: templates/index.php:16 +msgid "New Folder" +msgstr "Neuer Ordner" + +#: templates/index.php:29 +msgid "Name" +msgstr "Name" + +#: templates/index.php:31 +msgid "Download" +msgstr "Herunterladen" + +#: templates/index.php:35 +msgid "Size" +msgstr "Größe" + +#: templates/index.php:36 +msgid "Modified" +msgstr "Bearbeitet" + +#: templates/index.php:36 +msgid "Delete" +msgstr "Löschen" + +#: templates/index.php:44 +msgid "Upload too large" +msgstr "Upload zu groß" + +#: templates/index.php:46 +msgid "" +"The files you are trying to upload exceed the maximum size for file uploads " +"on this server." +msgstr "" +"Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server." + + diff --git a/l10n/de/log.po b/l10n/de/log.po deleted file mode 100644 index c249e412a7b..00000000000 --- a/l10n/de/log.po +++ /dev/null @@ -1,68 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Jakob Sack <mail@jakobsack.de>, 2011. -msgid "" -msgstr "" -"Project-Id-Version: ownCloud\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-25 16:15+0000\n" -"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n" -"Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: de\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" - -#: ../templates/index.php:4 -msgid "Filter:" -msgstr "Filter:" - -#: ../templates/index.php:7 -msgid "Logins" -msgstr "Anmeldungen" - -#: ../templates/index.php:8 -msgid "Logouts" -msgstr "Abmeldungen" - -#: ../templates/index.php:9 -msgid "Downloads" -msgstr "Downloads" - -#: ../templates/index.php:10 -msgid "Uploads" -msgstr "Uploads" - -#: ../templates/index.php:11 -msgid "Creations" -msgstr "Erstellungen" - -#: ../templates/index.php:12 -msgid "Deletions" -msgstr "Löschungen" - -#: ../templates/index.php:15 -msgid "Show:" -msgstr "Zeige" - -#: ../templates/index.php:16 -msgid "entries per page." -msgstr "Einträge pro Seite" - -#: ../templates/index.php:26 -msgid "What" -msgstr "Was" - -#: ../templates/index.php:27 -msgid "When" -msgstr "Wann" - -#: ../templates/index.php:45 -msgid "Clear log entries before" -msgstr "Lösche Einträge vor dem" - - diff --git a/l10n/de/help.po b/l10n/de/media.po index 2b9f1eaa91e..923ec398870 100644 --- a/l10n/de/help.po +++ b/l10n/de/media.po @@ -2,12 +2,13 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # +# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-25 16:15+0000\n" +"POT-Creation-Date: 2011-08-13 05:10+0200\n" +"PO-Revision-Date: 2011-08-13 02:35+0000\n" "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n" "Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n" "MIME-Version: 1.0\n" @@ -16,12 +17,32 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../templates/index.php:2 -msgid "Questions and Answers" -msgstr "Fragen & Antworten" +#: appinfo/app.php:31 +msgid "Music" +msgstr "Musik" -#: ../templates/index.php:24 -msgid "ASK A QUESTION" -msgstr "Stell eine Frage" +#: templates/music.php:27 +msgid "Songs scanned" +msgstr "Lieder gescannt" + +#: templates/music.php:29 +msgid "Rescan Collection" +msgstr "Sammlung scannen" + +#: templates/music.php:30 +msgid "Pause" +msgstr "Pause" + +#: templates/music.php:34 +msgid "Artist" +msgstr "Künstler" + +#: templates/music.php:35 +msgid "Album" +msgstr "Album" + +#: templates/music.php:36 +msgid "Title" +msgstr "Titel" diff --git a/l10n/de/settings.po b/l10n/de/settings.po index e1ecc38c991..874363d52f7 100644 --- a/l10n/de/settings.po +++ b/l10n/de/settings.po @@ -2,12 +2,13 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # +# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-25 16:15+0000\n" +"POT-Creation-Date: 2011-08-13 04:33+0200\n" +"PO-Revision-Date: 2011-08-13 02:37+0000\n" "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n" "Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n" "MIME-Version: 1.0\n" @@ -16,72 +17,96 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../templates/index.php:3 +#: ajax/openid.php:13 ajax/setlanguage.php:13 +msgid "Authentication error" +msgstr "Berechtigungsfehler" + +#: ajax/openid.php:21 +msgid "OpenID Changed" +msgstr "OpenID geändert" + +#: ajax/openid.php:23 ajax/setlanguage.php:23 +msgid "Invalid request" +msgstr "Ungültige Anfrage" + +#: ajax/setlanguage.php:21 +msgid "Language changed" +msgstr "Sprache geändert" + +#: templates/help.php:21 +msgid "Ask a question" +msgstr "Stell eine Frage" + +#: templates/apps.php:12 +msgid "Select an App" +msgstr "Wähle eine Anwendung aus" + +#: templates/apps.php:14 +msgid "-licensed" +msgstr "-lizenziert" + +#: templates/apps.php:14 +msgid "by" +msgstr "von" + +#: templates/personal.php:3 msgid "Account information" msgstr "Konto-Information" -#: ../templates/index.php:5 +#: templates/personal.php:5 msgid "You're currently using" msgstr "Du benutzt gerade" -#: ../templates/index.php:5 +#: templates/personal.php:5 msgid "of your" msgstr "von deinem" -#: ../templates/index.php:5 +#: templates/personal.php:5 msgid "space" msgstr "Speicherplatz" -#: ../templates/index.php:11 +#: templates/personal.php:11 templates/personal.php:17 msgid "Change Password" msgstr "Passwort ändern" -#: ../templates/index.php:12 +#: templates/personal.php:12 msgid "Your password got changed" -msgstr "Dein Passwort wurde geändert." +msgstr "Dein Passwort wurde geändert" -#: ../templates/index.php:15 -msgid "Old password:" -msgstr "Aktuelles Passwort:" +#: templates/personal.php:14 +msgid "Old password" +msgstr "Altes Passwort" -#: ../templates/index.php:19 +#: templates/personal.php:15 msgid "New password" -msgstr "Neues Passwort:" +msgstr "Neues Passwort" -#: ../templates/index.php:24 -msgid "Show new password" -msgstr "Neues Passwort anzeigen" +#: templates/personal.php:16 +msgid "show" +msgstr "zeigen" -#: ../templates/index.php:34 +#: templates/personal.php:23 msgid "Language" msgstr "Sprache" -#: ../ajax/changepassword.php:13 ../ajax/setlanguage.php:13 -msgid "Authentication error" -msgstr "Berechtigungsfehler" - -#: ../ajax/changepassword.php:19 -msgid "You have to enter the old and the new password!" -msgstr "Du musst das aktuelle und ein neues Passwort angeben!" +#: templates/users.php:11 +msgid "Name" +msgstr "Name" -#: ../ajax/changepassword.php:25 -msgid "Your old password is wrong!" -msgstr "Du hast dein aktuelles Passwort falsch eingegeben!" +#: templates/users.php:12 +msgid "Password" +msgstr "Passwort" -#: ../ajax/changepassword.php:31 -msgid "Password changed" -msgstr "Passwort geändert" +#: templates/users.php:13 templates/users.php:28 +msgid "Groups" +msgstr "Gruppen" -#: ../ajax/changepassword.php:34 -msgid "Unable to change password" -msgstr "Passwort konnte nicht geändert werden" +#: templates/users.php:18 +msgid "Create" +msgstr "Anlegen" -#: ../ajax/setlanguage.php:21 -msgid "Language changed" -msgstr "Sprache geändert" - -#: ../ajax/setlanguage.php:23 -msgid "Invalid request" -msgstr "Ungültige Anfrage" +#: templates/users.php:36 +msgid "Remove" +msgstr "Entfernen" diff --git a/l10n/es/admin.po b/l10n/es/admin.po deleted file mode 100644 index af814907b97..00000000000 --- a/l10n/es/admin.po +++ /dev/null @@ -1,93 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# <rom1dep@gmail.com>, 2011. -msgid "" -msgstr "" -"Project-Id-Version: ownCloud\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-30 21:03+0000\n" -"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: es\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" - -#: ../templates/app.php:22 -msgid "read more" -msgstr "leer más" - -#: ../templates/app.php:24 -msgid "INSTALL" -msgstr "Instalar" - -#: ../templates/app_noconn.php:6 ../templates/apps.php:6 -msgid "Apps Repository" -msgstr "Repositorio de aplicaciones " - -#: ../templates/app_noconn.php:7 -msgid "Cannot connect to apps repository" -msgstr "No se pudo conectar con el repositorio de aplicaciones" - -#: ../templates/apps.php:13 ../templates/users.php:6 ../templates/users.php:15 -#: ../templates/users.php:51 -msgid "Name" -msgstr "Nombre" - -#: ../templates/apps.php:14 -msgid "Modified" -msgstr "Modificado" - -#: ../templates/system.php:6 -msgid "Administration" -msgstr "Administración" - -#: ../templates/system.php:7 -msgid "System Settings" -msgstr "Ajustes del Sistema" - -#: ../templates/users.php:2 -msgid "Users" -msgstr "Usuarios" - -#: ../templates/users.php:7 ../templates/users.php:47 -msgid "Groups" -msgstr "Grupos" - -#: ../templates/users.php:16 -msgid "Password" -msgstr "Contraseña" - -#: ../templates/users.php:25 -msgid "Create" -msgstr "Crear" - -#: ../templates/users.php:37 ../templates/users.php:69 -msgid "remove" -msgstr "Eliminar" - -#: ../templates/users.php:59 -msgid "Create group" -msgstr "Crear grupo" - -#: ../templates/users.php:95 -msgid "Force new password:" -msgstr "Forzar una nueva contraseña" - -#: ../templates/users.php:97 -msgid "Set" -msgstr "Aplicar" - -#: ../templates/users.php:103 -msgid "Do you really want to delete user" -msgstr "¿Seguro que quieres eliminar este usuario?" - -#: ../templates/users.php:110 -msgid "Do you really want to delete group" -msgstr "¿Seguro que quieres eliminar este grupo?" - - diff --git a/l10n/es/core.po b/l10n/es/core.po index b8a5ace312f..25f2b5b01a3 100644 --- a/l10n/es/core.po +++ b/l10n/es/core.po @@ -7,123 +7,103 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-30 21:03+0000\n" +"POT-Creation-Date: 2011-08-13 04:33+0200\n" +"PO-Revision-Date: 2011-08-13 02:33+0000\n" "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/team/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../templates/404.php:15 -msgid "Error 404, Cloud not found" -msgstr "Error 404, La pagina no se pudo encontrar" - -#: ../templates/installation.php:6 -msgid "<strong>ownCloud</strong> is your personal web storage." -msgstr "<strong>ownCloud</strong> es tu web de almacenamiento personal." +#: templates/login.php:4 +msgid "Login failed!" +msgstr "¡No se pudo iniciar sesión!" -#: ../templates/installation.php:7 -msgid "Finish the setup by following the steps below." -msgstr "Completa la instalación mediante los siguientes pasos." +#: templates/login.php:9 templates/login.php:13 +msgid "remember" +msgstr "" -#: ../templates/installation.php:26 -msgid "Create an <strong>admin account</strong>." -msgstr "Crear una <strong>cuenta de administrador.</strong>" +#: templates/installation.php:20 +msgid "Create an <strong>admin account</strong>" +msgstr "" -#: ../templates/installation.php:27 +#: templates/installation.php:21 msgid "Username" msgstr "Nombre de usuario" -#: ../templates/installation.php:28 +#: templates/installation.php:22 msgid "Password" msgstr "Contraseña" -#: ../templates/installation.php:31 -msgid "Advanced" -msgstr "Avanzado" - -#: ../templates/installation.php:34 -msgid "Set where to store the data." -msgstr "Selecciona donde quieres almacenar los datos." - -#: ../templates/installation.php:35 -msgid "Data directory:" -msgstr "Directorio de almacenamiento:" - -#: ../templates/installation.php:39 -msgid "Configure the database." -msgstr "Configurar la base de datos." +#: templates/installation.php:27 +msgid "Configure the database" +msgstr "" -#: ../templates/installation.php:43 -msgid "SQLite will be used for the database. You have nothing to do." +#: templates/installation.php:32 templates/installation.php:43 +#: templates/installation.php:53 +msgid "will be used" msgstr "" -"Se utilizará SQLite para la base de datos. No necesitas configurar nada más." -#: ../templates/installation.php:46 -msgid "SQLite" -msgstr "SQLite" +#: templates/installation.php:64 +msgid "Database user" +msgstr "" -#: ../templates/installation.php:53 -msgid "MySQL will be used for the database." -msgstr "Se utilizará MySQL para la base de datos." +#: templates/installation.php:65 +msgid "Database password" +msgstr "" -#: ../templates/installation.php:59 -msgid "MySQL username:" -msgstr "Nombre de usuario de MySQL:" +#: templates/installation.php:66 +msgid "Database name" +msgstr "" -#: ../templates/installation.php:60 -msgid "MySQL password:" -msgstr "Contraseña de MySQL:" +#: templates/installation.php:74 +msgid "Advanced" +msgstr "Avanzado" -#: ../templates/installation.php:61 -msgid "Database name:" -msgstr "Nombre de la base de datos:" +#: templates/installation.php:77 +msgid "Host" +msgstr "" -#: ../templates/installation.php:62 -msgid "Host:" -msgstr "Host:" +#: templates/installation.php:78 +msgid "Table prefix" +msgstr "" -#: ../templates/installation.php:63 -msgid "Table prefix:" -msgstr "Prefijo de la tabla:" +#: templates/installation.php:80 +msgid "Data folder" +msgstr "" -#: ../templates/installation.php:69 +#: templates/installation.php:83 msgid "Finish setup" msgstr "Completar la instalación" -#: ../templates/layout.guest.php:33 -msgid "" -"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs" -" on your own server.</p>" +#: templates/404.php:12 +msgid "Cloud not found" msgstr "" -"<a href=\"http://owncloud.org/\">ownCloud</a> es tu nube personal que corre " -"en tu propio servidor.</p>" - -#: ../templates/login.php:6 -msgid "Login failed!" -msgstr "¡No se pudo iniciar sesión!" -#: ../templates/login.php:11 ../templates/login.php:15 -msgid "Remember login" -msgstr "Recordarme" - -#: ../templates/logout.php:1 -msgid "You are logged out." -msgstr "Has cerrado sesión." +#: templates/layout.guest.php:38 +msgid "is a personal cloud which runs on your own server" +msgstr "" -#: ../templates/part.pagenavi.php:6 +#: templates/part.pagenavi.php:6 msgid "prev" msgstr "anterior" -#: ../templates/part.pagenavi.php:26 +#: templates/part.pagenavi.php:26 msgid "next" msgstr "siguiente" -#: ../templates/part.searchbox.php:3 -msgid "Search" -msgstr "Buscar" +#: templates/logout.php:1 +msgid "You are logged out." +msgstr "Has cerrado sesión." + +#: templates/layout.user.php:36 +msgid "Log out" +msgstr "" + +#: templates/layout.user.php:56 +msgid "Settings" +msgstr "" diff --git a/l10n/es/help.po b/l10n/es/help.po deleted file mode 100644 index 96eda9c3974..00000000000 --- a/l10n/es/help.po +++ /dev/null @@ -1,28 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# <rom1dep@gmail.com>, 2011. -msgid "" -msgstr "" -"Project-Id-Version: ownCloud\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-30 21:03+0000\n" -"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: es\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" - -#: ../templates/index.php:2 -msgid "Questions and Answers" -msgstr "Preguntas y Respuestas" - -#: ../templates/index.php:24 -msgid "ASK A QUESTION" -msgstr "Haz una pregunta" - - diff --git a/l10n/es/log.po b/l10n/es/log.po deleted file mode 100644 index ca17c9328f9..00000000000 --- a/l10n/es/log.po +++ /dev/null @@ -1,68 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# <rom1dep@gmail.com>, 2011. -msgid "" -msgstr "" -"Project-Id-Version: ownCloud\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-30 21:03+0000\n" -"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: es\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" - -#: ../templates/index.php:4 -msgid "Filter:" -msgstr "Filtro:" - -#: ../templates/index.php:7 -msgid "Logins" -msgstr "Inicios de sesión" - -#: ../templates/index.php:8 -msgid "Logouts" -msgstr "Cierres de sesión" - -#: ../templates/index.php:9 -msgid "Downloads" -msgstr "Descargas" - -#: ../templates/index.php:10 -msgid "Uploads" -msgstr "Subidas" - -#: ../templates/index.php:11 -msgid "Creations" -msgstr "Creaciones" - -#: ../templates/index.php:12 -msgid "Deletions" -msgstr "Eliminaciones" - -#: ../templates/index.php:15 -msgid "Show:" -msgstr "Mostrar" - -#: ../templates/index.php:16 -msgid "entries per page." -msgstr "Entradas por página." - -#: ../templates/index.php:26 -msgid "What" -msgstr "Qué" - -#: ../templates/index.php:27 -msgid "When" -msgstr "Cuándo" - -#: ../templates/index.php:45 -msgid "Clear log entries before" -msgstr "Eliminar los registros anteriores a" - - diff --git a/l10n/es/settings.po b/l10n/es/settings.po index d4c9878a745..da601175c59 100644 --- a/l10n/es/settings.po +++ b/l10n/es/settings.po @@ -7,82 +7,106 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-30 21:03+0000\n" +"POT-Creation-Date: 2011-08-13 04:33+0200\n" +"PO-Revision-Date: 2011-08-13 02:19+0000\n" "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/team/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../templates/index.php:3 +#: ajax/openid.php:13 ajax/setlanguage.php:13 +msgid "Authentication error" +msgstr "Error de autentificación" + +#: ajax/openid.php:21 +msgid "OpenID Changed" +msgstr "" + +#: ajax/openid.php:23 ajax/setlanguage.php:23 +msgid "Invalid request" +msgstr "Solicitud no válida" + +#: ajax/setlanguage.php:21 +msgid "Language changed" +msgstr "Idioma cambiado" + +#: templates/help.php:21 +msgid "Ask a question" +msgstr "" + +#: templates/apps.php:12 +msgid "Select an App" +msgstr "" + +#: templates/apps.php:14 +msgid "-licensed" +msgstr "" + +#: templates/apps.php:14 +msgid "by" +msgstr "" + +#: templates/personal.php:3 msgid "Account information" msgstr "Información de la cuenta" -#: ../templates/index.php:5 +#: templates/personal.php:5 msgid "You're currently using" msgstr "Estás utilizando" -#: ../templates/index.php:5 +#: templates/personal.php:5 msgid "of your" msgstr "de tus" -#: ../templates/index.php:5 +#: templates/personal.php:5 msgid "space" msgstr "de espacio total" -#: ../templates/index.php:11 +#: templates/personal.php:11 templates/personal.php:17 msgid "Change Password" msgstr "Cambiar contraseña" -#: ../templates/index.php:12 +#: templates/personal.php:12 msgid "Your password got changed" msgstr "Tu contraseña ha sido cambiada" -#: ../templates/index.php:15 -msgid "Old password:" -msgstr "Antigua contraseña:" +#: templates/personal.php:14 +msgid "Old password" +msgstr "" -#: ../templates/index.php:19 +#: templates/personal.php:15 msgid "New password" msgstr "Nueva contraseña:" -#: ../templates/index.php:24 -msgid "Show new password" -msgstr "Mostrar nueva contraseña" +#: templates/personal.php:16 +msgid "show" +msgstr "" -#: ../templates/index.php:34 +#: templates/personal.php:23 msgid "Language" msgstr "Idioma" -#: ../ajax/changepassword.php:13 ../ajax/setlanguage.php:13 -msgid "Authentication error" -msgstr "Error de autentificación" - -#: ../ajax/changepassword.php:19 -msgid "You have to enter the old and the new password!" -msgstr "¡Tienes que introducir la contraseña antigua y la contraseña nueva!" - -#: ../ajax/changepassword.php:25 -msgid "Your old password is wrong!" -msgstr "¡Tu contraseña antigua es incorrecta!" +#: templates/users.php:11 +msgid "Name" +msgstr "" -#: ../ajax/changepassword.php:31 -msgid "Password changed" -msgstr "Contraseña cambiada" +#: templates/users.php:12 +msgid "Password" +msgstr "" -#: ../ajax/changepassword.php:34 -msgid "Unable to change password" -msgstr "No se puede cambiar la contraseña" +#: templates/users.php:13 templates/users.php:28 +msgid "Groups" +msgstr "" -#: ../ajax/setlanguage.php:21 -msgid "Language changed" -msgstr "Idioma cambiado" +#: templates/users.php:18 +msgid "Create" +msgstr "" -#: ../ajax/setlanguage.php:23 -msgid "Invalid request" -msgstr "Solicitud no válida" +#: templates/users.php:36 +msgid "Remove" +msgstr "" diff --git a/l10n/fr/admin.po b/l10n/fr/admin.po deleted file mode 100644 index b1dad1da675..00000000000 --- a/l10n/fr/admin.po +++ /dev/null @@ -1,93 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# <rom1dep@gmail.com>, 2011. -msgid "" -msgstr "" -"Project-Id-Version: ownCloud\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-30 07:29+0000\n" -"Last-Translator: rom1dep <rom1dep@gmail.com>\n" -"Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" - -#: ../templates/app.php:22 -msgid "read more" -msgstr "en lire plus" - -#: ../templates/app.php:24 -msgid "INSTALL" -msgstr "INSTALLATION" - -#: ../templates/app_noconn.php:6 ../templates/apps.php:6 -msgid "Apps Repository" -msgstr "Répertoire d'applications" - -#: ../templates/app_noconn.php:7 -msgid "Cannot connect to apps repository" -msgstr "Impossible de se connecter au répertoire d'applications" - -#: ../templates/apps.php:13 ../templates/users.php:6 ../templates/users.php:15 -#: ../templates/users.php:51 -msgid "Name" -msgstr "Nom" - -#: ../templates/apps.php:14 -msgid "Modified" -msgstr "Modifié le" - -#: ../templates/system.php:6 -msgid "Administration" -msgstr "Administration" - -#: ../templates/system.php:7 -msgid "System Settings" -msgstr "Préférences Système" - -#: ../templates/users.php:2 -msgid "Users" -msgstr "Utilisateurs" - -#: ../templates/users.php:7 ../templates/users.php:47 -msgid "Groups" -msgstr "Groupes" - -#: ../templates/users.php:16 -msgid "Password" -msgstr "Mot de passe" - -#: ../templates/users.php:25 -msgid "Create" -msgstr "Créer" - -#: ../templates/users.php:37 ../templates/users.php:69 -msgid "remove" -msgstr "retirer" - -#: ../templates/users.php:59 -msgid "Create group" -msgstr "Créer un groupe" - -#: ../templates/users.php:95 -msgid "Force new password:" -msgstr "Forcer un nouveau mot de passe :" - -#: ../templates/users.php:97 -msgid "Set" -msgstr "Appliquer" - -#: ../templates/users.php:103 -msgid "Do you really want to delete user" -msgstr "Voulez-vous réellement supprimer cet utilisateur" - -#: ../templates/users.php:110 -msgid "Do you really want to delete group" -msgstr "Voulez-vous réellement supprimer ce groupe" - - diff --git a/l10n/fr/core.po b/l10n/fr/core.po index a9e8831d2ef..9d63c0cae7c 100644 --- a/l10n/fr/core.po +++ b/l10n/fr/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-30 20:10+0000\n" +"POT-Creation-Date: 2011-08-13 05:10+0200\n" +"PO-Revision-Date: 2011-08-13 09:09+0000\n" "Last-Translator: rom1dep <rom1dep@gmail.com>\n" "Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n" "MIME-Version: 1.0\n" @@ -17,114 +17,93 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" -#: ../templates/404.php:15 -msgid "Error 404, Cloud not found" -msgstr "Erreur 404, la page demandée n'existe pas" - -#: ../templates/installation.php:6 -msgid "<strong>ownCloud</strong> is your personal web storage." -msgstr "<strong>ownCloud</strong> est votre espace de stockage web personnel." +#: templates/login.php:4 +msgid "Login failed!" +msgstr "Échec de la connexion !" -#: ../templates/installation.php:7 -msgid "Finish the setup by following the steps below." -msgstr "Terminez l'installation en suivant les étapes ci-dessous." +#: templates/login.php:9 templates/login.php:13 +msgid "remember" +msgstr "se souvenir de moi" -#: ../templates/installation.php:26 -msgid "Create an <strong>admin account</strong>." -msgstr "Veuillez créer un <strong>compte administrateur.</strong>" +#: templates/installation.php:20 +msgid "Create an <strong>admin account</strong>" +msgstr "Créer un <strong>compte administrateur</strong>" -#: ../templates/installation.php:27 +#: templates/installation.php:21 msgid "Username" msgstr "Nom d'utilisateur" -#: ../templates/installation.php:28 +#: templates/installation.php:22 msgid "Password" msgstr "Mot de passe" -#: ../templates/installation.php:31 -msgid "Advanced" -msgstr "Avancé" - -#: ../templates/installation.php:34 -msgid "Set where to store the data." -msgstr "Sélectionnez où sauvegarder les données" +#: templates/installation.php:27 +msgid "Configure the database" +msgstr "Configurer la base de données" -#: ../templates/installation.php:35 -msgid "Data directory:" -msgstr "Répertoire de données" +#: templates/installation.php:32 templates/installation.php:43 +#: templates/installation.php:53 +msgid "will be used" +msgstr "sera utilisé" -#: ../templates/installation.php:39 -msgid "Configure the database." -msgstr "Configurez la base de données." +#: templates/installation.php:64 +msgid "Database user" +msgstr "Utilisateur de la base de données" -#: ../templates/installation.php:43 -msgid "SQLite will be used for the database. You have nothing to do." -msgstr "" -"SQLite sera utilisé comme moteur pour la base de données. Vous n'avez rien " -"de plus à faire." - -#: ../templates/installation.php:46 -msgid "SQLite" -msgstr "SQLite" - -#: ../templates/installation.php:53 -msgid "MySQL will be used for the database." -msgstr "MySQL sera utilisé comme moteur pour la base de données." +#: templates/installation.php:65 +msgid "Database password" +msgstr "Mot de passe de la base de données" -#: ../templates/installation.php:59 -msgid "MySQL username:" -msgstr "Nom d'utilisateur MySQL :" +#: templates/installation.php:66 +msgid "Database name" +msgstr "Nom de la base de données" -#: ../templates/installation.php:60 -msgid "MySQL password:" -msgstr "Mot de passe MySQL :" +#: templates/installation.php:74 +msgid "Advanced" +msgstr "Avancé" -#: ../templates/installation.php:61 -msgid "Database name:" -msgstr "Nom de la base de données :" +#: templates/installation.php:77 +msgid "Host" +msgstr "Hôte" -#: ../templates/installation.php:62 -msgid "Host:" -msgstr "Hôte :" +#: templates/installation.php:78 +msgid "Table prefix" +msgstr "Préfixe des tables" -#: ../templates/installation.php:63 -msgid "Table prefix:" -msgstr "Préfixe de table :" +#: templates/installation.php:80 +msgid "Data folder" +msgstr "Répertoire des données" -#: ../templates/installation.php:69 +#: templates/installation.php:83 msgid "Finish setup" msgstr "Terminer l'installation" -#: ../templates/layout.guest.php:33 -msgid "" -"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs" -" on your own server.</p>" -msgstr "" -"<a href=\"http://owncloud.org/\">ownCloud</a> est votre solution cloud " -"personnelle propulsée par votre propre serveur.</p>" - -#: ../templates/login.php:6 -msgid "Login failed!" -msgstr "Échec de la connexion !" +#: templates/404.php:12 +msgid "Cloud not found" +msgstr "Introuvable" -#: ../templates/login.php:11 ../templates/login.php:15 -msgid "Remember login" -msgstr "Se souvenir de moi" +#: templates/layout.guest.php:38 +msgid "is a personal cloud which runs on your own server" +msgstr "est un service de cloud personnel propulsé par votre propre serveur" -#: ../templates/logout.php:1 -msgid "You are logged out." -msgstr "Vous êtes désormais déconnecté." - -#: ../templates/part.pagenavi.php:6 +#: templates/part.pagenavi.php:6 msgid "prev" msgstr "précédent" -#: ../templates/part.pagenavi.php:26 +#: templates/part.pagenavi.php:26 msgid "next" msgstr "suivant" -#: ../templates/part.searchbox.php:3 -msgid "Search" -msgstr "Rechercher" +#: templates/logout.php:1 +msgid "You are logged out." +msgstr "Vous êtes désormais déconnecté." + +#: templates/layout.user.php:36 +msgid "Log out" +msgstr "Se déconnecter" + +#: templates/layout.user.php:56 +msgid "Settings" +msgstr "Paramètres" diff --git a/l10n/fr/files.po b/l10n/fr/files.po new file mode 100644 index 00000000000..c75745d8bd0 --- /dev/null +++ b/l10n/fr/files.po @@ -0,0 +1,72 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# <rom1dep@gmail.com>, 2011. +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" +"POT-Creation-Date: 2011-08-13 05:10+0200\n" +"PO-Revision-Date: 2011-08-13 09:14+0000\n" +"Last-Translator: rom1dep <rom1dep@gmail.com>\n" +"Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: fr\n" +"Plural-Forms: nplurals=2; plural=(n > 1)\n" + +#: appinfo/app.php:7 +msgid "Files" +msgstr "Fichiers" + +#: templates/admin.php:5 +msgid "Maximum upload size" +msgstr "Taille max. d'envoi" + +#: templates/part.list.php:1 +msgid "Nothing in here. Upload something!" +msgstr "Il n'y a rien ici ! Envoyez donc quelque chose :)" + +#: templates/index.php:9 +msgid "Upload" +msgstr "Envoyer" + +#: templates/index.php:16 +msgid "New Folder" +msgstr "Nouveau dossier" + +#: templates/index.php:29 +msgid "Name" +msgstr "Nom" + +#: templates/index.php:31 +msgid "Download" +msgstr "Téléchargement" + +#: templates/index.php:35 +msgid "Size" +msgstr "Taille" + +#: templates/index.php:36 +msgid "Modified" +msgstr "Modifié" + +#: templates/index.php:36 +msgid "Delete" +msgstr "Supprimer" + +#: templates/index.php:44 +msgid "Upload too large" +msgstr "Fichier trop volumineux" + +#: templates/index.php:46 +msgid "" +"The files you are trying to upload exceed the maximum size for file uploads " +"on this server." +msgstr "" +"Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise" +" par ce serveur." + + diff --git a/l10n/fr/log.po b/l10n/fr/log.po deleted file mode 100644 index 4e59e55d392..00000000000 --- a/l10n/fr/log.po +++ /dev/null @@ -1,68 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# <rom1dep@gmail.com>, 2011. -msgid "" -msgstr "" -"Project-Id-Version: ownCloud\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-30 07:16+0000\n" -"Last-Translator: rom1dep <rom1dep@gmail.com>\n" -"Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" - -#: ../templates/index.php:4 -msgid "Filter:" -msgstr "Filtre :" - -#: ../templates/index.php:7 -msgid "Logins" -msgstr "Connexions" - -#: ../templates/index.php:8 -msgid "Logouts" -msgstr "Déconnexions" - -#: ../templates/index.php:9 -msgid "Downloads" -msgstr "Téléchargements" - -#: ../templates/index.php:10 -msgid "Uploads" -msgstr "Téléversements" - -#: ../templates/index.php:11 -msgid "Creations" -msgstr "Créations" - -#: ../templates/index.php:12 -msgid "Deletions" -msgstr "Suppressions" - -#: ../templates/index.php:15 -msgid "Show:" -msgstr "Afficher :" - -#: ../templates/index.php:16 -msgid "entries per page." -msgstr "entrées par page." - -#: ../templates/index.php:26 -msgid "What" -msgstr "Quoi" - -#: ../templates/index.php:27 -msgid "When" -msgstr "Quand" - -#: ../templates/index.php:45 -msgid "Clear log entries before" -msgstr "Effacer les entrées du journal au préalable" - - diff --git a/l10n/fr/help.po b/l10n/fr/media.po index d8c869024b9..c1b5de8345f 100644 --- a/l10n/fr/help.po +++ b/l10n/fr/media.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-30 07:17+0000\n" +"POT-Creation-Date: 2011-08-13 05:10+0200\n" +"PO-Revision-Date: 2011-08-13 09:06+0000\n" "Last-Translator: rom1dep <rom1dep@gmail.com>\n" "Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n" "MIME-Version: 1.0\n" @@ -17,12 +17,32 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" -#: ../templates/index.php:2 -msgid "Questions and Answers" -msgstr "Questions / Réponses" +#: appinfo/app.php:31 +msgid "Music" +msgstr "Musique" -#: ../templates/index.php:24 -msgid "ASK A QUESTION" -msgstr "Poser une question" +#: templates/music.php:27 +msgid "Songs scanned" +msgstr "Pistes scannées" + +#: templates/music.php:29 +msgid "Rescan Collection" +msgstr "Réanalyser la Collection" + +#: templates/music.php:30 +msgid "Pause" +msgstr "Pause" + +#: templates/music.php:34 +msgid "Artist" +msgstr "Artiste" + +#: templates/music.php:35 +msgid "Album" +msgstr "Album" + +#: templates/music.php:36 +msgid "Title" +msgstr "Titre" diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po index 3a8855b981e..12bec8e1411 100644 --- a/l10n/fr/settings.po +++ b/l10n/fr/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-30 07:10+0000\n" +"POT-Creation-Date: 2011-08-13 05:10+0200\n" +"PO-Revision-Date: 2011-08-13 09:12+0000\n" "Last-Translator: rom1dep <rom1dep@gmail.com>\n" "Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n" "MIME-Version: 1.0\n" @@ -17,72 +17,96 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" -#: ../templates/index.php:3 +#: ajax/openid.php:13 ajax/setlanguage.php:13 +msgid "Authentication error" +msgstr "Erreur d'authentification" + +#: ajax/openid.php:21 +msgid "OpenID Changed" +msgstr "Identifiant OpenID changé avec succès" + +#: ajax/openid.php:23 ajax/setlanguage.php:23 +msgid "Invalid request" +msgstr "Requète invalide" + +#: ajax/setlanguage.php:21 +msgid "Language changed" +msgstr "Langue changée avec succès" + +#: templates/help.php:21 +msgid "Ask a question" +msgstr "Poser une question" + +#: templates/apps.php:12 +msgid "Select an App" +msgstr "Sélectionner une Application" + +#: templates/apps.php:14 +msgid "-licensed" +msgstr "sous licence" + +#: templates/apps.php:14 +msgid "by" +msgstr "par" + +#: templates/personal.php:3 msgid "Account information" msgstr "Informations sur le compte" -#: ../templates/index.php:5 +#: templates/personal.php:5 msgid "You're currently using" msgstr "Vous utilisez actuellement" -#: ../templates/index.php:5 +#: templates/personal.php:5 msgid "of your" -msgstr "de votre" +msgstr "de votre espace de stockage de" -#: ../templates/index.php:5 +#: templates/personal.php:5 msgid "space" -msgstr "espace de stockage" +msgstr " " -#: ../templates/index.php:11 +#: templates/personal.php:11 templates/personal.php:17 msgid "Change Password" msgstr "Changer votre mot de passe" -#: ../templates/index.php:12 +#: templates/personal.php:12 msgid "Your password got changed" msgstr "Votre mot de passe a été changé" -#: ../templates/index.php:15 -msgid "Old password:" -msgstr "Ancien mot de passe :" +#: templates/personal.php:14 +msgid "Old password" +msgstr "Ancien mot de passe" -#: ../templates/index.php:19 +#: templates/personal.php:15 msgid "New password" msgstr "Nouveau mot de passe :" -#: ../templates/index.php:24 -msgid "Show new password" -msgstr "Afficher votre nouveau mot de passe" +#: templates/personal.php:16 +msgid "show" +msgstr "Afficher" -#: ../templates/index.php:34 +#: templates/personal.php:23 msgid "Language" msgstr "Langue" -#: ../ajax/changepassword.php:13 ../ajax/setlanguage.php:13 -msgid "Authentication error" -msgstr "Erreur d'authentification" - -#: ../ajax/changepassword.php:19 -msgid "You have to enter the old and the new password!" -msgstr "Vous devez saisir l'ancien et le nouveau mot de passe !" +#: templates/users.php:11 +msgid "Name" +msgstr "Nom" -#: ../ajax/changepassword.php:25 -msgid "Your old password is wrong!" -msgstr "Votre ancien mot de passe est erroné !" +#: templates/users.php:12 +msgid "Password" +msgstr "Mot de passe" -#: ../ajax/changepassword.php:31 -msgid "Password changed" -msgstr "Mot de passe changé avec succès" +#: templates/users.php:13 templates/users.php:28 +msgid "Groups" +msgstr "Groupes" -#: ../ajax/changepassword.php:34 -msgid "Unable to change password" -msgstr "Impossible de changer le mot de passe" +#: templates/users.php:18 +msgid "Create" +msgstr "Créer" -#: ../ajax/setlanguage.php:21 -msgid "Language changed" -msgstr "Langue changée avec succès" - -#: ../ajax/setlanguage.php:23 -msgid "Invalid request" -msgstr "Requète invalide" +#: templates/users.php:36 +msgid "Remove" +msgstr "Supprimer" diff --git a/l10n/l10n.pl b/l10n/l10n.pl index 736a7bc0435..fb1b522c255 100644 --- a/l10n/l10n.pl +++ b/l10n/l10n.pl @@ -74,9 +74,6 @@ die( "Program must be executed in a l10n-folder called 'l10n'" ) unless $wheream my @dirs = crawlPrograms( $place, 1 ); # Languages -rmtree( 'templates' ); -mkdir( 'templates' ) unless -d 'templates'; - my @languages = (); opendir( DIR, '.' ); my @files = readdir( DIR ); @@ -86,6 +83,8 @@ foreach my $i ( @files ){ } if( $task eq 'read' ){ + rmtree( 'templates' ); + mkdir( 'templates' ) unless -d 'templates'; print "Mode: reading\n"; foreach my $dir ( @dirs ){ my @temp = split( /\//, $dir ); diff --git a/l10n/nl/admin.po b/l10n/nl/admin.po deleted file mode 100644 index 6c59b0b864e..00000000000 --- a/l10n/nl/admin.po +++ /dev/null @@ -1,94 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Robin Appelman <icewind1991@gmail.com>, 2011. -# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011. -msgid "" -msgstr "" -"Project-Id-Version: ownCloud\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-28 00:09+0000\n" -"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: nl\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" - -#: ../templates/app.php:22 -msgid "read more" -msgstr "Meer informatie" - -#: ../templates/app.php:24 -msgid "INSTALL" -msgstr "Installeer" - -#: ../templates/app_noconn.php:6 ../templates/apps.php:6 -msgid "Apps Repository" -msgstr "Applicatiedatabase" - -#: ../templates/app_noconn.php:7 -msgid "Cannot connect to apps repository" -msgstr "Kan geen verbinding maken met de applicatiedatabase" - -#: ../templates/apps.php:13 ../templates/users.php:6 ../templates/users.php:15 -#: ../templates/users.php:51 -msgid "Name" -msgstr "Naam" - -#: ../templates/apps.php:14 -msgid "Modified" -msgstr "Laatst aangepast" - -#: ../templates/system.php:6 -msgid "Administration" -msgstr "Administratie" - -#: ../templates/system.php:7 -msgid "System Settings" -msgstr "Systeeminstellingen" - -#: ../templates/users.php:2 -msgid "Users" -msgstr "Gebruikers" - -#: ../templates/users.php:7 ../templates/users.php:47 -msgid "Groups" -msgstr "Groepen" - -#: ../templates/users.php:16 -msgid "Password" -msgstr "Wachtwoord" - -#: ../templates/users.php:25 -msgid "Create" -msgstr "" - -#: ../templates/users.php:37 ../templates/users.php:69 -msgid "remove" -msgstr "verwijder" - -#: ../templates/users.php:59 -msgid "Create group" -msgstr "Groep aanmaken" - -#: ../templates/users.php:95 -msgid "Force new password:" -msgstr "Forceer nieuw wachtwoord:" - -#: ../templates/users.php:97 -msgid "Set" -msgstr "Ok" - -#: ../templates/users.php:103 -msgid "Do you really want to delete user" -msgstr "Wilt u deze gebruiker verwijderen" - -#: ../templates/users.php:110 -msgid "Do you really want to delete group" -msgstr "Wilt u deze groep verwijderen" - - diff --git a/l10n/nl/core.po b/l10n/nl/core.po index dc797db0089..981f5cb9236 100644 --- a/l10n/nl/core.po +++ b/l10n/nl/core.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-28 00:33+0000\n" +"POT-Creation-Date: 2011-08-13 04:33+0200\n" +"PO-Revision-Date: 2011-08-13 02:33+0000\n" "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -16,112 +16,93 @@ msgstr "" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../templates/404.php:15 -msgid "Error 404, Cloud not found" -msgstr "Fout 404, Cloud niet gevonden." - -#: ../templates/installation.php:6 -msgid "<strong>ownCloud</strong> is your personal web storage." -msgstr "" +#: templates/login.php:4 +msgid "Login failed!" +msgstr "Aanmelden mislukt." -#: ../templates/installation.php:7 -msgid "Finish the setup by following the steps below." +#: templates/login.php:9 templates/login.php:13 +msgid "remember" msgstr "" -#: ../templates/installation.php:26 -msgid "Create an <strong>admin account</strong>." +#: templates/installation.php:20 +msgid "Create an <strong>admin account</strong>" msgstr "" -#: ../templates/installation.php:27 +#: templates/installation.php:21 msgid "Username" msgstr "" -#: ../templates/installation.php:28 +#: templates/installation.php:22 msgid "Password" msgstr "" -#: ../templates/installation.php:31 -msgid "Advanced" -msgstr "Geavanceerd" +#: templates/installation.php:27 +msgid "Configure the database" +msgstr "" -#: ../templates/installation.php:34 -msgid "Set where to store the data." -msgstr "Bepaal de opslaglocatie." +#: templates/installation.php:32 templates/installation.php:43 +#: templates/installation.php:53 +msgid "will be used" +msgstr "" -#: ../templates/installation.php:35 -msgid "Data directory:" -msgstr "Gegevensmap:" +#: templates/installation.php:64 +msgid "Database user" +msgstr "" -#: ../templates/installation.php:39 -msgid "Configure the database." +#: templates/installation.php:65 +msgid "Database password" msgstr "" -#: ../templates/installation.php:43 -msgid "SQLite will be used for the database. You have nothing to do." +#: templates/installation.php:66 +msgid "Database name" msgstr "" -#: ../templates/installation.php:46 -msgid "SQLite" -msgstr "SQLite" +#: templates/installation.php:74 +msgid "Advanced" +msgstr "Geavanceerd" -#: ../templates/installation.php:53 -msgid "MySQL will be used for the database." +#: templates/installation.php:77 +msgid "Host" msgstr "" -#: ../templates/installation.php:59 -msgid "MySQL username:" +#: templates/installation.php:78 +msgid "Table prefix" msgstr "" -#: ../templates/installation.php:60 -msgid "MySQL password:" +#: templates/installation.php:80 +msgid "Data folder" msgstr "" -#: ../templates/installation.php:61 -msgid "Database name:" -msgstr "Databasenaam:" - -#: ../templates/installation.php:62 -msgid "Host:" -msgstr "Host:" - -#: ../templates/installation.php:63 -msgid "Table prefix:" -msgstr "Voorvoegsel voor tabelnamen:" - -#: ../templates/installation.php:69 +#: templates/installation.php:83 msgid "Finish setup" msgstr "Installatie afronden" -#: ../templates/layout.guest.php:33 -msgid "" -"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs" -" on your own server.</p>" +#: templates/404.php:12 +msgid "Cloud not found" msgstr "" -"<a href=\"http://owncloud.org/\">ownCloud</a> is een persoonlijke cloud die " -"op uw eigen server draait.</p>" - -#: ../templates/login.php:6 -msgid "Login failed!" -msgstr "Aanmelden mislukt." -#: ../templates/login.php:11 ../templates/login.php:15 -msgid "Remember login" +#: templates/layout.guest.php:38 +msgid "is a personal cloud which runs on your own server" msgstr "" -#: ../templates/logout.php:1 -msgid "You are logged out." -msgstr "U bent afgemeld." - -#: ../templates/part.pagenavi.php:6 +#: templates/part.pagenavi.php:6 msgid "prev" msgstr "vorige" -#: ../templates/part.pagenavi.php:26 +#: templates/part.pagenavi.php:26 msgid "next" msgstr "volgende" -#: ../templates/part.searchbox.php:3 -msgid "Search" -msgstr "Zoeken" +#: templates/logout.php:1 +msgid "You are logged out." +msgstr "U bent afgemeld." + +#: templates/layout.user.php:36 +msgid "Log out" +msgstr "" + +#: templates/layout.user.php:56 +msgid "Settings" +msgstr "" diff --git a/l10n/nl/help.po b/l10n/nl/help.po deleted file mode 100644 index 7d8108c804d..00000000000 --- a/l10n/nl/help.po +++ /dev/null @@ -1,28 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Robin Appelman <icewind1991@gmail.com>, 2011. -msgid "" -msgstr "" -"Project-Id-Version: ownCloud\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-25 16:18+0000\n" -"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: nl\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" - -#: ../templates/index.php:2 -msgid "Questions and Answers" -msgstr "Vraag en Antwoord" - -#: ../templates/index.php:24 -msgid "ASK A QUESTION" -msgstr "Stel een vraag" - - diff --git a/l10n/nl/log.po b/l10n/nl/log.po deleted file mode 100644 index 8d5f86c5b37..00000000000 --- a/l10n/nl/log.po +++ /dev/null @@ -1,68 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Robin Appelman <icewind1991@gmail.com>, 2011. -msgid "" -msgstr "" -"Project-Id-Version: ownCloud\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-25 16:18+0000\n" -"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: nl\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" - -#: ../templates/index.php:4 -msgid "Filter:" -msgstr "Filter:" - -#: ../templates/index.php:7 -msgid "Logins" -msgstr "Aanmeldingen" - -#: ../templates/index.php:8 -msgid "Logouts" -msgstr "Afmeldingen" - -#: ../templates/index.php:9 -msgid "Downloads" -msgstr "Downloads" - -#: ../templates/index.php:10 -msgid "Uploads" -msgstr "Uploads" - -#: ../templates/index.php:11 -msgid "Creations" -msgstr "Creaties" - -#: ../templates/index.php:12 -msgid "Deletions" -msgstr "Verwijderingen" - -#: ../templates/index.php:15 -msgid "Show:" -msgstr "Laat" - -#: ../templates/index.php:16 -msgid "entries per page." -msgstr "resulaten per pagina zien" - -#: ../templates/index.php:26 -msgid "What" -msgstr "Wat" - -#: ../templates/index.php:27 -msgid "When" -msgstr "Wanneer" - -#: ../templates/index.php:45 -msgid "Clear log entries before" -msgstr "Verwijder logboekitem ouder dan" - - diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po index 9a185102a2a..16e978bf09d 100644 --- a/l10n/nl/settings.po +++ b/l10n/nl/settings.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-25 16:18+0000\n" +"POT-Creation-Date: 2011-08-13 04:33+0200\n" +"PO-Revision-Date: 2011-08-13 02:19+0000\n" "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -16,72 +16,96 @@ msgstr "" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../templates/index.php:3 +#: ajax/openid.php:13 ajax/setlanguage.php:13 +msgid "Authentication error" +msgstr "Authenticatiefout." + +#: ajax/openid.php:21 +msgid "OpenID Changed" +msgstr "" + +#: ajax/openid.php:23 ajax/setlanguage.php:23 +msgid "Invalid request" +msgstr "Ongeldig verzoek" + +#: ajax/setlanguage.php:21 +msgid "Language changed" +msgstr "Taal aangepast" + +#: templates/help.php:21 +msgid "Ask a question" +msgstr "" + +#: templates/apps.php:12 +msgid "Select an App" +msgstr "" + +#: templates/apps.php:14 +msgid "-licensed" +msgstr "" + +#: templates/apps.php:14 +msgid "by" +msgstr "" + +#: templates/personal.php:3 msgid "Account information" msgstr "Gebruikersgegevens" -#: ../templates/index.php:5 +#: templates/personal.php:5 msgid "You're currently using" msgstr "U gebruikt momenteel" -#: ../templates/index.php:5 +#: templates/personal.php:5 msgid "of your" msgstr "van de" -#: ../templates/index.php:5 +#: templates/personal.php:5 msgid "space" msgstr "beschikbare ruimte." -#: ../templates/index.php:11 +#: templates/personal.php:11 templates/personal.php:17 msgid "Change Password" msgstr "Wachtwoord aanpassen" -#: ../templates/index.php:12 +#: templates/personal.php:12 msgid "Your password got changed" msgstr "Uw wachtwoord is aangepast" -#: ../templates/index.php:15 -msgid "Old password:" -msgstr "Oud wachtwoord:" +#: templates/personal.php:14 +msgid "Old password" +msgstr "" -#: ../templates/index.php:19 +#: templates/personal.php:15 msgid "New password" msgstr "Nieuw wachtwoord" -#: ../templates/index.php:24 -msgid "Show new password" -msgstr "Toon nieuw wachtwoord" +#: templates/personal.php:16 +msgid "show" +msgstr "" -#: ../templates/index.php:34 +#: templates/personal.php:23 msgid "Language" msgstr "Taal" -#: ../ajax/changepassword.php:13 ../ajax/setlanguage.php:13 -msgid "Authentication error" -msgstr "Authenticatiefout." - -#: ../ajax/changepassword.php:19 -msgid "You have to enter the old and the new password!" -msgstr "U moet het oude en nieuwe wachtwoord invullen." - -#: ../ajax/changepassword.php:25 -msgid "Your old password is wrong!" -msgstr "Het oude wachtwoord is verkeerd." +#: templates/users.php:11 +msgid "Name" +msgstr "" -#: ../ajax/changepassword.php:31 -msgid "Password changed" -msgstr "Wachtwoord aangepast" +#: templates/users.php:12 +msgid "Password" +msgstr "" -#: ../ajax/changepassword.php:34 -msgid "Unable to change password" -msgstr "Wachtwoord aanpassen is niet mogelijk" +#: templates/users.php:13 templates/users.php:28 +msgid "Groups" +msgstr "" -#: ../ajax/setlanguage.php:21 -msgid "Language changed" -msgstr "Taal aangepast" +#: templates/users.php:18 +msgid "Create" +msgstr "" -#: ../ajax/setlanguage.php:23 -msgid "Invalid request" -msgstr "Ongeldig verzoek" +#: templates/users.php:36 +msgid "Remove" +msgstr "" diff --git a/l10n/pl/admin.po b/l10n/pl/admin.po deleted file mode 100644 index 8efe13a268b..00000000000 --- a/l10n/pl/admin.po +++ /dev/null @@ -1,93 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Kamil Domański <kdomanski@kdemail.net>, 2011. -msgid "" -msgstr "" -"Project-Id-Version: ownCloud\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-28 00:09+0000\n" -"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: pl\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" - -#: ../templates/app.php:22 -msgid "read more" -msgstr "czytaj więcej" - -#: ../templates/app.php:24 -msgid "INSTALL" -msgstr "INSTALUJ" - -#: ../templates/app_noconn.php:6 ../templates/apps.php:6 -msgid "Apps Repository" -msgstr "Repozytorium aplikacji" - -#: ../templates/app_noconn.php:7 -msgid "Cannot connect to apps repository" -msgstr "Nie można połączyć się z repozytorium aplikacji" - -#: ../templates/apps.php:13 ../templates/users.php:6 ../templates/users.php:15 -#: ../templates/users.php:51 -msgid "Name" -msgstr "Nazwa" - -#: ../templates/apps.php:14 -msgid "Modified" -msgstr "Zmodyfikowano" - -#: ../templates/system.php:6 -msgid "Administration" -msgstr "Administracja" - -#: ../templates/system.php:7 -msgid "System Settings" -msgstr "Ustawienia systemowe" - -#: ../templates/users.php:2 -msgid "Users" -msgstr "Użytkownicy" - -#: ../templates/users.php:7 ../templates/users.php:47 -msgid "Groups" -msgstr "Grupy" - -#: ../templates/users.php:16 -msgid "Password" -msgstr "Hasło" - -#: ../templates/users.php:25 -msgid "Create" -msgstr "" - -#: ../templates/users.php:37 ../templates/users.php:69 -msgid "remove" -msgstr "usuń" - -#: ../templates/users.php:59 -msgid "Create group" -msgstr "Utwórz grupę" - -#: ../templates/users.php:95 -msgid "Force new password:" -msgstr "Wymuś nowe hasło" - -#: ../templates/users.php:97 -msgid "Set" -msgstr "Ustaw" - -#: ../templates/users.php:103 -msgid "Do you really want to delete user" -msgstr "Czy naprawdę chcesz usunąć użytkownika" - -#: ../templates/users.php:110 -msgid "Do you really want to delete group" -msgstr "Czy naprawdę chcesz usunąć grupę" - - diff --git a/l10n/pl/core.po b/l10n/pl/core.po index 073bb8cd31d..fbc3cacface 100644 --- a/l10n/pl/core.po +++ b/l10n/pl/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-28 00:33+0000\n" +"POT-Creation-Date: 2011-08-13 04:33+0200\n" +"PO-Revision-Date: 2011-08-13 02:33+0000\n" "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -17,112 +17,93 @@ msgstr "" "Language: pl\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" -#: ../templates/404.php:15 -msgid "Error 404, Cloud not found" -msgstr "Błąd 404, Chmura nie znaleziona" - -#: ../templates/installation.php:6 -msgid "<strong>ownCloud</strong> is your personal web storage." -msgstr "" +#: templates/login.php:4 +msgid "Login failed!" +msgstr "Nie udało się zalogować!" -#: ../templates/installation.php:7 -msgid "Finish the setup by following the steps below." +#: templates/login.php:9 templates/login.php:13 +msgid "remember" msgstr "" -#: ../templates/installation.php:26 -msgid "Create an <strong>admin account</strong>." +#: templates/installation.php:20 +msgid "Create an <strong>admin account</strong>" msgstr "" -#: ../templates/installation.php:27 +#: templates/installation.php:21 msgid "Username" msgstr "" -#: ../templates/installation.php:28 +#: templates/installation.php:22 msgid "Password" msgstr "" -#: ../templates/installation.php:31 -msgid "Advanced" -msgstr "Zaawansowane" +#: templates/installation.php:27 +msgid "Configure the database" +msgstr "" -#: ../templates/installation.php:34 -msgid "Set where to store the data." -msgstr "Ustaw, gdzie przechowywać dane." +#: templates/installation.php:32 templates/installation.php:43 +#: templates/installation.php:53 +msgid "will be used" +msgstr "" -#: ../templates/installation.php:35 -msgid "Data directory:" -msgstr "Katalog danych:" +#: templates/installation.php:64 +msgid "Database user" +msgstr "" -#: ../templates/installation.php:39 -msgid "Configure the database." +#: templates/installation.php:65 +msgid "Database password" msgstr "" -#: ../templates/installation.php:43 -msgid "SQLite will be used for the database. You have nothing to do." +#: templates/installation.php:66 +msgid "Database name" msgstr "" -#: ../templates/installation.php:46 -msgid "SQLite" -msgstr "SQLite" +#: templates/installation.php:74 +msgid "Advanced" +msgstr "Zaawansowane" -#: ../templates/installation.php:53 -msgid "MySQL will be used for the database." +#: templates/installation.php:77 +msgid "Host" msgstr "" -#: ../templates/installation.php:59 -msgid "MySQL username:" +#: templates/installation.php:78 +msgid "Table prefix" msgstr "" -#: ../templates/installation.php:60 -msgid "MySQL password:" +#: templates/installation.php:80 +msgid "Data folder" msgstr "" -#: ../templates/installation.php:61 -msgid "Database name:" -msgstr "Nazwa bazy:" - -#: ../templates/installation.php:62 -msgid "Host:" -msgstr "Host:" - -#: ../templates/installation.php:63 -msgid "Table prefix:" -msgstr "Przedrostek tabeli:" - -#: ../templates/installation.php:69 +#: templates/installation.php:83 msgid "Finish setup" msgstr "Zakończ instalację" -#: ../templates/layout.guest.php:33 -msgid "" -"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs" -" on your own server.</p>" +#: templates/404.php:12 +msgid "Cloud not found" msgstr "" -"<a href=\"http://owncloud.org/\">ownCloud</a> jest osobistą chmurą " -"działającą na Twoim własnym serwerze.</p>" - -#: ../templates/login.php:6 -msgid "Login failed!" -msgstr "Nie udało się zalogować!" -#: ../templates/login.php:11 ../templates/login.php:15 -msgid "Remember login" +#: templates/layout.guest.php:38 +msgid "is a personal cloud which runs on your own server" msgstr "" -#: ../templates/logout.php:1 -msgid "You are logged out." -msgstr "Jesteś wylogowany." - -#: ../templates/part.pagenavi.php:6 +#: templates/part.pagenavi.php:6 msgid "prev" msgstr "wstecz" -#: ../templates/part.pagenavi.php:26 +#: templates/part.pagenavi.php:26 msgid "next" msgstr "dalej" -#: ../templates/part.searchbox.php:3 -msgid "Search" -msgstr "Szukaj" +#: templates/logout.php:1 +msgid "You are logged out." +msgstr "Jesteś wylogowany." + +#: templates/layout.user.php:36 +msgid "Log out" +msgstr "" + +#: templates/layout.user.php:56 +msgid "Settings" +msgstr "" diff --git a/l10n/pl/help.po b/l10n/pl/help.po deleted file mode 100644 index a4390c8bdad..00000000000 --- a/l10n/pl/help.po +++ /dev/null @@ -1,28 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Kamil Domański <kdomanski@kdemail.net>, 2011. -msgid "" -msgstr "" -"Project-Id-Version: ownCloud\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-25 16:16+0000\n" -"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: pl\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" - -#: ../templates/index.php:2 -msgid "Questions and Answers" -msgstr "Pytania i odpowiedzi" - -#: ../templates/index.php:24 -msgid "ASK A QUESTION" -msgstr "ZADAJ PYTANIE" - - diff --git a/l10n/pl/log.po b/l10n/pl/log.po deleted file mode 100644 index 5afe1b6f4c3..00000000000 --- a/l10n/pl/log.po +++ /dev/null @@ -1,68 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Kamil Domański <kdomanski@kdemail.net>, 2011. -msgid "" -msgstr "" -"Project-Id-Version: ownCloud\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-25 16:16+0000\n" -"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: pl\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" - -#: ../templates/index.php:4 -msgid "Filter:" -msgstr "Filtr:" - -#: ../templates/index.php:7 -msgid "Logins" -msgstr "Zalogowania" - -#: ../templates/index.php:8 -msgid "Logouts" -msgstr "Wylogowani" - -#: ../templates/index.php:9 -msgid "Downloads" -msgstr "Pobrania" - -#: ../templates/index.php:10 -msgid "Uploads" -msgstr "Wgrania" - -#: ../templates/index.php:11 -msgid "Creations" -msgstr "Utworzenia" - -#: ../templates/index.php:12 -msgid "Deletions" -msgstr "Usunięcia" - -#: ../templates/index.php:15 -msgid "Show:" -msgstr "Pokaż:" - -#: ../templates/index.php:16 -msgid "entries per page." -msgstr "wpisów na stronę." - -#: ../templates/index.php:26 -msgid "What" -msgstr "Co" - -#: ../templates/index.php:27 -msgid "When" -msgstr "Kiedy" - -#: ../templates/index.php:45 -msgid "Clear log entries before" -msgstr "Wyczyść spisy dziennika sprzed" - - diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po index 99ae9c3ff08..728db747edd 100644 --- a/l10n/pl/settings.po +++ b/l10n/pl/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n" -"POT-Creation-Date: 2011-07-27 12:03+0200\n" -"PO-Revision-Date: 2011-07-25 16:16+0000\n" +"POT-Creation-Date: 2011-08-13 04:33+0200\n" +"PO-Revision-Date: 2011-08-13 02:19+0000\n" "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -17,72 +17,96 @@ msgstr "" "Language: pl\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" -#: ../templates/index.php:3 +#: ajax/openid.php:13 ajax/setlanguage.php:13 +msgid "Authentication error" +msgstr "Błąd uwierzytelniania" + +#: ajax/openid.php:21 +msgid "OpenID Changed" +msgstr "" + +#: ajax/openid.php:23 ajax/setlanguage.php:23 +msgid "Invalid request" +msgstr "Nieprawidłowe żądanie" + +#: ajax/setlanguage.php:21 +msgid "Language changed" +msgstr "Język zmieniony" + +#: templates/help.php:21 +msgid "Ask a question" +msgstr "" + +#: templates/apps.php:12 +msgid "Select an App" +msgstr "" + +#: templates/apps.php:14 +msgid "-licensed" +msgstr "" + +#: templates/apps.php:14 +msgid "by" +msgstr "" + +#: templates/personal.php:3 msgid "Account information" msgstr "Dane konta" -#: ../templates/index.php:5 +#: templates/personal.php:5 msgid "You're currently using" msgstr "Obecnie używasz" -#: ../templates/index.php:5 +#: templates/personal.php:5 msgid "of your" msgstr "ze swoich" -#: ../templates/index.php:5 +#: templates/personal.php:5 msgid "space" msgstr "przestrzeni" -#: ../templates/index.php:11 +#: templates/personal.php:11 templates/personal.php:17 msgid "Change Password" msgstr "Zmień hasło" -#: ../templates/index.php:12 +#: templates/personal.php:12 msgid "Your password got changed" msgstr "Twoje hasło zostało zmienione" -#: ../templates/index.php:15 -msgid "Old password:" -msgstr "Stare hasło" +#: templates/personal.php:14 +msgid "Old password" +msgstr "" -#: ../templates/index.php:19 +#: templates/personal.php:15 msgid "New password" msgstr "Nowe hasło" -#: ../templates/index.php:24 -msgid "Show new password" -msgstr "Pokaż nowe hasło" +#: templates/personal.php:16 +msgid "show" +msgstr "" -#: ../templates/index.php:34 +#: templates/personal.php:23 msgid "Language" msgstr "Język" -#: ../ajax/changepassword.php:13 ../ajax/setlanguage.php:13 -msgid "Authentication error" -msgstr "Błąd uwierzytelniania" - -#: ../ajax/changepassword.php:19 -msgid "You have to enter the old and the new password!" -msgstr "Musisz wprowadzić zarówno stare, jak i nowe hasło!" - -#: ../ajax/changepassword.php:25 -msgid "Your old password is wrong!" -msgstr "Twoje stare hasło jest błędne!" +#: templates/users.php:11 +msgid "Name" +msgstr "" -#: ../ajax/changepassword.php:31 -msgid "Password changed" -msgstr "Hasło zmienione" +#: templates/users.php:12 +msgid "Password" +msgstr "" -#: ../ajax/changepassword.php:34 -msgid "Unable to change password" -msgstr "NIe można zmienić hasła" +#: templates/users.php:13 templates/users.php:28 +msgid "Groups" +msgstr "" -#: ../ajax/setlanguage.php:21 -msgid "Language changed" -msgstr "Język zmieniony" +#: templates/users.php:18 +msgid "Create" +msgstr "" -#: ../ajax/setlanguage.php:23 -msgid "Invalid request" -msgstr "Nieprawidłowe żądanie" +#: templates/users.php:36 +msgid "Remove" +msgstr "" diff --git a/l10n/templates/admin.pot b/l10n/templates/admin.pot deleted file mode 100644 index e28b1eb7ae4..00000000000 --- a/l10n/templates/admin.pot +++ /dev/null @@ -1,58 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-09 17:52+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../templates/app.php:17 -msgid "read more" -msgstr "" - -#: ../templates/app.php:19 -msgid "Install" -msgstr "" - -#: ../templates/app_noconn.php:1 -msgid "Cannot connect to apps repository" -msgstr "" - -#: ../templates/apps.php:5 ../templates/users.php:3 ../templates/users.php:7 -msgid "Name" -msgstr "" - -#: ../templates/apps.php:6 -msgid "Modified" -msgstr "" - -#: ../templates/system.php:1 -msgid "System Settings" -msgstr "" - -#: ../templates/users.php:4 ../templates/users.php:14 -msgid "Create" -msgstr "" - -#: ../templates/users.php:8 -msgid "Password" -msgstr "" - -#: ../templates/users.php:9 -msgid "Groups" -msgstr "" - -#: ../templates/users.php:33 -msgid "Remove" -msgstr "" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 7189eb49889..18ebf15942f 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-09 17:52+0200\n" +"POT-Creation-Date: 2011-08-13 12:41+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,120 +17,91 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ../templates/404.php:12 -msgid "Cloud not found" +#: templates/login.php:4 +msgid "Login failed!" +msgstr "" + +#: templates/login.php:9 templates/login.php:13 +msgid "remember" msgstr "" -#: ../templates/installation.php:20 +#: templates/installation.php:20 msgid "Create an <strong>admin account</strong>" msgstr "" -#: ../templates/installation.php:21 +#: templates/installation.php:21 msgid "Username" msgstr "" -#: ../templates/installation.php:22 +#: templates/installation.php:22 msgid "Password" msgstr "" -#: ../templates/installation.php:27 +#: templates/installation.php:27 msgid "Configure the database" msgstr "" -#: ../templates/installation.php:31 -msgid "SQLite will be used." -msgstr "" - -#: ../templates/installation.php:34 -msgid "SQLite" -msgstr "" - -#: ../templates/installation.php:41 -msgid "MySQL will be used." +#: templates/installation.php:32 templates/installation.php:43 +#: templates/installation.php:53 +msgid "will be used" msgstr "" -#: ../templates/installation.php:50 -msgid "PostgreSQL will be used." -msgstr "" - -#: ../templates/installation.php:59 +#: templates/installation.php:64 msgid "Database user" msgstr "" -#: ../templates/installation.php:60 +#: templates/installation.php:65 msgid "Database password" msgstr "" -#: ../templates/installation.php:61 +#: templates/installation.php:66 msgid "Database name" msgstr "" -#: ../templates/installation.php:62 -msgid "Host" -msgstr "" - -#: ../templates/installation.php:63 -msgid "Table prefix" +#: templates/installation.php:74 +msgid "Advanced" msgstr "" -#: ../templates/installation.php:70 -msgid "Advanced" +#: templates/installation.php:77 +msgid "Host" msgstr "" -#: ../templates/installation.php:73 -msgid "Set data folder" +#: templates/installation.php:78 +msgid "Table prefix" msgstr "" -#: ../templates/installation.php:74 +#: templates/installation.php:80 msgid "Data folder" msgstr "" -#: ../templates/installation.php:77 +#: templates/installation.php:83 msgid "Finish setup" msgstr "" -#: ../templates/layout.guest.php:38 -msgid "" -"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs " -"on your own server.</p>" -msgstr "" - -#: ../templates/login.php:4 -msgid "Login failed!" -msgstr "" - -#: ../templates/login.php:9 ../templates/login.php:13 -msgid "remember" +#: templates/404.php:12 +msgid "Cloud not found" msgstr "" -#: ../templates/logout.php:1 -msgid "You are logged out." +#: templates/layout.guest.php:38 +msgid "is a personal cloud which runs on your own server" msgstr "" -#: ../templates/part.pagenavi.php:6 +#: templates/part.pagenavi.php:6 msgid "prev" msgstr "" -#: ../templates/part.pagenavi.php:26 +#: templates/part.pagenavi.php:26 msgid "next" msgstr "" -#: ../../lib/app.php:204 -msgid "Users" -msgstr "" - -#: ../../lib/app.php:205 -msgid "Apps" -msgstr "" - -#: ../../lib/app.php:206 -msgid "Files" +#: templates/logout.php:1 +msgid "You are logged out." msgstr "" -#: ../../lib/app.php:209 -msgid "Help" +#: templates/layout.user.php:36 +msgid "Log out" msgstr "" -#: ../../lib/app.php:210 -msgid "Personal" +#: templates/layout.user.php:49 +msgid "Settings" msgstr "" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 271ca0fcb40..258ec3c7729 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-09 17:52+0200\n" +"POT-Creation-Date: 2011-08-13 12:41+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,48 +17,52 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ../appinfo/app.php:7 +#: appinfo/app.php:7 msgid "Files" msgstr "" -#: ../templates/index.php:11 +#: templates/admin.php:5 +msgid "Maximum upload size" +msgstr "" + +#: templates/part.list.php:1 +msgid "Nothing in here. Upload something!" +msgstr "" + +#: templates/index.php:9 msgid "Upload" msgstr "" -#: ../templates/index.php:17 +#: templates/index.php:16 msgid "New Folder" msgstr "" -#: ../templates/index.php:30 +#: templates/index.php:29 msgid "Name" msgstr "" -#: ../templates/index.php:32 +#: templates/index.php:31 msgid "Download" msgstr "" -#: ../templates/index.php:36 -msgid "Size MB" +#: templates/index.php:35 +msgid "Size" msgstr "" -#: ../templates/index.php:37 +#: templates/index.php:36 msgid "Modified" msgstr "" -#: ../templates/index.php:37 +#: templates/index.php:36 msgid "Delete" msgstr "" -#: ../templates/index.php:45 +#: templates/index.php:44 msgid "Upload too large" msgstr "" -#: ../templates/index.php:47 +#: templates/index.php:46 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" - -#: ../templates/part.list.php:1 -msgid "Nothing in here. Upload something!" -msgstr "" diff --git a/l10n/templates/help.pot b/l10n/templates/media.pot index 0e24e1c9655..5556272181e 100644 --- a/l10n/templates/help.pot +++ b/l10n/templates/media.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-09 17:52+0200\n" +"POT-Creation-Date: 2011-08-13 12:41+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,6 +17,30 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ../templates/index.php:21 -msgid "Ask a question" +#: appinfo/app.php:31 +msgid "Music" +msgstr "" + +#: templates/music.php:27 +msgid "Songs scanned" +msgstr "" + +#: templates/music.php:28 +msgid "Rescan Collection" +msgstr "" + +#: templates/music.php:29 +msgid "Pause" +msgstr "" + +#: templates/music.php:35 +msgid "Artist" +msgstr "" + +#: templates/music.php:36 +msgid "Album" +msgstr "" + +#: templates/music.php:37 +msgid "Title" msgstr "" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index dc438e488c2..2eb346eb414 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-09 17:52+0200\n" +"POT-Creation-Date: 2011-08-13 12:41+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,70 +17,94 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ../templates/index.php:3 +#: ajax/openid.php:13 ajax/setlanguage.php:13 +msgid "Authentication error" +msgstr "" + +#: ajax/openid.php:21 +msgid "OpenID Changed" +msgstr "" + +#: ajax/openid.php:23 ajax/setlanguage.php:23 +msgid "Invalid request" +msgstr "" + +#: ajax/setlanguage.php:21 +msgid "Language changed" +msgstr "" + +#: templates/help.php:21 +msgid "Ask a question" +msgstr "" + +#: templates/apps.php:12 +msgid "Select an App" +msgstr "" + +#: templates/apps.php:14 +msgid "-licensed" +msgstr "" + +#: templates/apps.php:14 +msgid "by" +msgstr "" + +#: templates/personal.php:3 msgid "Account information" msgstr "" -#: ../templates/index.php:5 +#: templates/personal.php:5 msgid "You're currently using" msgstr "" -#: ../templates/index.php:5 +#: templates/personal.php:5 msgid "of your" msgstr "" -#: ../templates/index.php:5 +#: templates/personal.php:5 msgid "space" msgstr "" -#: ../templates/index.php:11 ../templates/index.php:17 +#: templates/personal.php:11 templates/personal.php:17 msgid "Change Password" msgstr "" -#: ../templates/index.php:12 +#: templates/personal.php:12 msgid "Your password got changed" msgstr "" -#: ../templates/index.php:14 +#: templates/personal.php:14 msgid "Old password" msgstr "" -#: ../templates/index.php:15 +#: templates/personal.php:15 msgid "New password" msgstr "" -#: ../templates/index.php:16 +#: templates/personal.php:16 msgid "show" msgstr "" -#: ../templates/index.php:23 +#: templates/personal.php:23 msgid "Language" msgstr "" -#: ../ajax/changepassword.php:13 ../ajax/setlanguage.php:13 -msgid "Authentication error" +#: templates/users.php:11 +msgid "Name" msgstr "" -#: ../ajax/changepassword.php:19 -msgid "You have to enter the old and the new password!" +#: templates/users.php:12 +msgid "Password" msgstr "" -#: ../ajax/changepassword.php:25 -msgid "Your old password is wrong!" +#: templates/users.php:13 templates/users.php:28 +msgid "Groups" msgstr "" -#: ../ajax/changepassword.php:31 -msgid "Password changed" +#: templates/users.php:18 +msgid "Create" msgstr "" -#: ../ajax/changepassword.php:34 -msgid "Unable to change password" -msgstr "" - -#: ../ajax/setlanguage.php:21 -msgid "Language changed" -msgstr "" - -#: ../ajax/setlanguage.php:23 -msgid "Invalid request" +#: templates/users.php:36 +msgid "Remove" msgstr "" diff --git a/lib/app.php b/lib/app.php index e7cf74af85c..e9f97a4354e 100644 --- a/lib/app.php +++ b/lib/app.php @@ -52,7 +52,7 @@ class OC_App{ } // Our very own core apps are hardcoded - foreach( array( 'admin', 'files', 'help', 'settings' ) as $app ){ + foreach( array('files', 'settings') as $app ){ require( $app.'/appinfo/app.php' ); } @@ -200,13 +200,13 @@ class OC_App{ public static function getSettingsNavigation(){ $l=new OC_L10N('core'); $admin=array( - array( "id" => "core_users", "order" => 2, "href" => OC_Helper::linkTo( "admin", "users.php" ), "name" => $l->t("Users"), "icon" => OC_Helper::imagePath( "admin", "users.svg" )), - array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkTo( "admin", "apps.php?installed" ), "name" => $l->t("Apps"), "icon" => OC_Helper::imagePath( "admin", "apps.svg" )), + array( "id" => "core_users", "order" => 2, "href" => OC_Helper::linkTo( "settings", "users.php" ), "name" => $l->t("Users"), "icon" => OC_Helper::imagePath( "settings", "users.svg" )), + array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkTo( "settings", "apps.php?installed" ), "name" => $l->t("Apps"), "icon" => OC_Helper::imagePath( "settings", "apps.svg" )), // array( "id" => "files_administration", "order" => 3, "href" => OC_Helper::linkTo( "files", "admin.php" ), "name" => $l->t("Files"), "icon" => OC_Helper::imagePath( "settings", "options.svg" )), ); $settings=array( - array( "id" => "help", "order" => 1000, "href" => OC_Helper::linkTo( "help", "index.php" ), "name" => $l->t("Help"), "icon" => OC_Helper::imagePath( "help", "help.svg" )), - array( "id" => "settings", "order" => 1, "href" => OC_Helper::linkTo( "settings", "index.php" ), "name" => $l->t("Personal"), "icon" => OC_Helper::imagePath( "settings", "personal.svg" )) + array( "id" => "help", "order" => 1000, "href" => OC_Helper::linkTo( "settings", "help.php" ), "name" => $l->t("Help"), "icon" => OC_Helper::imagePath( "settings", "help.svg" )), + array( "id" => "settings", "order" => 1, "href" => OC_Helper::linkTo( "settings", "personal.php" ), "name" => $l->t("Personal"), "icon" => OC_Helper::imagePath( "settings", "personal.svg" )) ); if( OC_Group::inGroup( $_SESSION["user_id"], "admin" )){ $settings=array_merge($admin,$settings); diff --git a/lib/setup.php b/lib/setup.php index c7259d6b8ce..8386846358b 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -37,13 +37,13 @@ class OC_Setup { $dbtype = $options['dbtype']; if(empty($options['adminlogin'])) { - $error[] = 'STEP 1 : admin login is not set.'; + $error[] = 'Set an admin username.'; } if(empty($options['adminpass'])) { - $error[] = 'STEP 1 : admin password is not set.'; + $error[] = 'Set an admin password.'; } if(empty($options['directory'])) { - $error[] = 'STEP 2 : data directory path is not set.'; + $error[] = 'Specify a data folder.'; } if($dbtype=='mysql' or $dbtype=='pgsql') { //mysql and postgresql needs more config options @@ -53,19 +53,19 @@ class OC_Setup { $dbprettyname = 'PostgreSQL'; if(empty($options['dbuser'])) { - $error[] = "STEP 3 : $dbprettyname database user is not set."; + $error[] = "$dbprettyname enter the database username."; } if(empty($options['dbpass'])) { - $error[] = "STEP 3 : $dbprettyname database password is not set."; + $error[] = "$dbprettyname enter the database password."; } if(empty($options['dbname'])) { - $error[] = "STEP 3 : $dbprettyname database name is not set."; + $error[] = "$dbprettyname enter the database name."; } if(empty($options['dbhost'])) { - $error[] = "STEP 3 : $dbprettyname database host is not set."; + $error[] = "$dbprettyname set the database host."; } if(!isset($options['dbtableprefix'])) { - $error[] = "STEP 3 : $dbprettyname database table prefix is not set."; + $error[] = "$dbprettyname set a table prefix."; } } @@ -97,8 +97,8 @@ class OC_Setup { $connection = @mysql_connect($dbhost, $dbuser, $dbpass); if(!$connection) { $error[] = array( - 'error' => 'mysql username and/or password not valid', - 'hint' => 'you need to enter either an existing account, or the administrative account if you wish to create a new user for ownCloud' + 'error' => 'MySQL username and/or password not valid', + 'hint' => 'You need to enter either an existing account or the administrator.' ); } else { @@ -151,8 +151,8 @@ class OC_Setup { $connection = @pg_connect($connection_string); if(!$connection) { $error[] = array( - 'error' => 'postgresql username and/or password not valid', - 'hint' => 'you need to enter either an existing account, or the administrative account if you wish to create a new user for ownCloud' + 'error' => 'PostgreSQL username and/or password not valid', + 'hint' => 'You need to enter either an existing account or the administrator.' ); } else { diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php index b9b2417ad9a..98c2a8b37a1 100644 --- a/settings/ajax/changepassword.php +++ b/settings/ajax/changepassword.php @@ -3,35 +3,24 @@ // Init owncloud require_once('../../lib/base.php'); -$l=new OC_L10N('settings'); - // We send json data -header("Content-Type: application/jsonrequest"); +header( "Content-Type: application/jsonrequest" ); // Check if we are a user -if(!OC_User::isLoggedIn()){ - echo json_encode(array("status" => "error", "data" => array("message" => $l->t("Authentication error")))); +if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){ + echo json_encode( array( "status" => "error", "data" => array( "message" => "Authentication error" ))); exit(); } -// Get data -if(!isset($_POST["password"]) && !isset($_POST["oldpassword"])){ - echo json_encode(array("status" => "error", "data" => array("message" => $l->t("You have to enter the old and the new password!")))); - exit(); -} +$username = $_POST["username"]; +$password = $_POST["password"]; -// Check if the old password is correct -if(!OC_User::checkPassword($_SESSION["user_id"], $_POST["oldpassword"])){ - echo json_encode(array("status" => "error", "data" => array("message" => $l->t("Your old password is wrong!")))); - exit(); +// Return Success story +if( OC_User::setPassword( $username, $password )){ + echo json_encode( array( "status" => "success", "data" => array( "username" => $username ))); } - -// Change password -if(OC_User::setPassword($_SESSION["user_id"], $_POST["password"])){ - echo json_encode(array("status" => "success", "data" => array("message" => $l->t("Password changed")))); - OC_Crypt::changekeypasscode($_POST["password"]); -}else{ - echo json_encode(array("status" => "error", "data" => array("message" => $l->t("Unable to change password")))); +else{ + echo json_encode( array( "status" => "error", "data" => array( "message" => "Unable to change password" ))); } ?> diff --git a/admin/ajax/creategroup.php b/settings/ajax/creategroup.php index 2631937b14d..2631937b14d 100644 --- a/admin/ajax/creategroup.php +++ b/settings/ajax/creategroup.php diff --git a/admin/ajax/createuser.php b/settings/ajax/createuser.php index de52f90d4f3..de52f90d4f3 100644 --- a/admin/ajax/createuser.php +++ b/settings/ajax/createuser.php diff --git a/admin/ajax/disableapp.php b/settings/ajax/disableapp.php index 0cf66a553f8..0cf66a553f8 100644 --- a/admin/ajax/disableapp.php +++ b/settings/ajax/disableapp.php diff --git a/admin/ajax/enableapp.php b/settings/ajax/enableapp.php index eb1bfc54a04..eb1bfc54a04 100644 --- a/admin/ajax/enableapp.php +++ b/settings/ajax/enableapp.php diff --git a/admin/ajax/removegroup.php b/settings/ajax/removegroup.php index bf80da741c7..bf80da741c7 100644 --- a/admin/ajax/removegroup.php +++ b/settings/ajax/removegroup.php diff --git a/admin/ajax/removeuser.php b/settings/ajax/removeuser.php index 0a94884cb96..0a94884cb96 100644 --- a/admin/ajax/removeuser.php +++ b/settings/ajax/removeuser.php diff --git a/admin/ajax/togglegroups.php b/settings/ajax/togglegroups.php index 3210252af02..3210252af02 100644 --- a/admin/ajax/togglegroups.php +++ b/settings/ajax/togglegroups.php diff --git a/settings/appinfo/app.php b/settings/appinfo/app.php index 4ffb944aba3..d18bcdbff0d 100644 --- a/settings/appinfo/app.php +++ b/settings/appinfo/app.php @@ -1,5 +1,7 @@ <?php OC_App::register( array( "id" => "settings", "name" => "Settings" )); +OC_App::register( array( "order" => 1, "id" => "admin", "name" => "Administration" )); +OC_App::register( array( "order" => 1, "id" => "help", "name" => "Help" )); ?> diff --git a/admin/apps.php b/settings/apps.php index c74f9032916..e41a0cbf8dd 100644 --- a/admin/apps.php +++ b/settings/apps.php @@ -28,8 +28,9 @@ if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )) } // Load the files we need -OC_Util::addStyle( "admin", "apps" ); -OC_Util::addScript( "admin", "apps" ); +OC_Util::addStyle( "settings", "settings" ); +OC_Util::addScript( "settings", "apps" ); +OC_App::setActiveNavigationEntry( "core_apps" ); $registeredApps=OC_App::getAllApps(); $apps=array(); @@ -59,7 +60,7 @@ foreach($externalApps as $app){ -$tmpl = new OC_Template( "admin", "apps", "user" ); +$tmpl = new OC_Template( "settings", "apps", "user" ); $tmpl->assign('apps',$apps); $tmpl->printPage(); diff --git a/settings/css/settings.css b/settings/css/settings.css index 66299b1faa0..c8163ff2f82 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -1,4 +1,32 @@ +input#openid, input#webdav { width:20em; } + +/* PERSONAL */ #passworderror { display:none; } #passwordchanged { display:none; } - input#identity { width:20em; } + + +/* USERS */ +form { display:inline; } +td.name, td.password { padding-left:.8em; } +td.password>img, td.remove>img { display:none; cursor:pointer; } +td.password>span { margin-right:1.2em; } +td.password { width:12em; cursor:pointer; } + +td.remove { width:1em; padding-right:1em; } +tr:hover>td.password>span { margin:0; cursor:pointer; } +tr:hover>td.remove>img, tr:hover>td.password>img { display:inline; cursor:pointer; } +tr:hover>td.remove>img { float:right; } +li.selected { background-color:#ddd; } +#content>table { margin-top:6.5em; } +table { width:100%; } + + +/* APPS */ +li{color:#888} +li.active{color:#000} +span.version{margin-left:3em;color:#ddd} + + +/* HELP */ +table#help tr td { white-space:normal; } diff --git a/help/index.php b/settings/help.php index 7eb0c6b1820..b6466d282bf 100644 --- a/help/index.php +++ b/settings/help.php @@ -12,13 +12,13 @@ $page=2; // Load the files we need -OC_Util::addStyle( "help", "help" ); +OC_Util::addStyle( "settings", "settings" ); OC_App::setActiveNavigationEntry( "help" ); $kbe=OC_OCSClient::getKnownledgebaseEntries(); -$tmpl = new OC_Template( "help", "index", "user" ); +$tmpl = new OC_Template( "settings", "help", "user" ); $tmpl->assign( "kbe", $kbe ); $tmpl->assign( "pagecount", $pagecount ); $tmpl->assign( "page", $page ); diff --git a/admin/img/apps.png b/settings/img/apps.png Binary files differindex 17f47d632b9..17f47d632b9 100644 --- a/admin/img/apps.png +++ b/settings/img/apps.png diff --git a/admin/img/apps.svg b/settings/img/apps.svg index cda246bc4a8..cda246bc4a8 100644 --- a/admin/img/apps.svg +++ b/settings/img/apps.svg diff --git a/help/img/help.png b/settings/img/help.png Binary files differindex 2257d144d11..2257d144d11 100644 --- a/help/img/help.png +++ b/settings/img/help.png diff --git a/help/img/help.svg b/settings/img/help.svg index 1e07aed8527..1e07aed8527 100644 --- a/help/img/help.svg +++ b/settings/img/help.svg diff --git a/admin/img/users.png b/settings/img/users.png Binary files differindex f56e2442c9e..f56e2442c9e 100644 --- a/admin/img/users.png +++ b/settings/img/users.png diff --git a/admin/img/users.svg b/settings/img/users.svg index 1c8c8955693..1c8c8955693 100644 --- a/admin/img/users.svg +++ b/settings/img/users.svg diff --git a/admin/js/apps.js b/settings/js/apps.js index 069681e1cd1..069681e1cd1 100644 --- a/admin/js/apps.js +++ b/settings/js/apps.js diff --git a/settings/js/main.js b/settings/js/personal.js index f6b7eeb7584..d16917d5393 100644 --- a/settings/js/main.js +++ b/settings/js/personal.js @@ -32,4 +32,12 @@ $(document).ready(function(){ }); return false; }); + + // reset value when edited, workaround because of .select() not working with disabled inputs + $('#webdav').focus(function(event){ + openidValue = $('#webdav').val(); + }); + $('#webdav').blur(function(event){ + $('#webdav').val(openidValue); + }); } ); diff --git a/admin/js/users.js b/settings/js/users.js index addf1c2d65f..bc1b8fc3ed0 100644 --- a/admin/js/users.js +++ b/settings/js/users.js @@ -11,7 +11,7 @@ $(document).ready(function(){ return false; } $.post( - OC.filePath('admin','ajax','togglegroups.php'), + OC.filePath('settings','ajax','togglegroups.php'), { username:user, group:group @@ -36,7 +36,7 @@ $(document).ready(function(){ $('td.remove>img').live('click',function(event){ var uid=$(this).parent().parent().data('uid'); $.post( - OC.filePath('admin','ajax','removeuser.php'), + OC.filePath('settings','ajax','removeuser.php'), {username:uid}, function(result){ @@ -57,7 +57,7 @@ $(document).ready(function(){ if(event.keyCode == 13) { if($(this).val().length>0){ $.post( - OC.filePath('admin','ajax','changepassword.php'), + OC.filePath('settings','ajax','changepassword.php'), {username:uid,password:$(this).val()}, function(result){} ); @@ -82,7 +82,7 @@ $(document).ready(function(){ var password=$('#newuserpassword').val(); var groups=$('#newusergroups').prev().children('div').data('settings').checked; $.post( - OC.filePath('admin','ajax','createuser.php'), + OC.filePath('settings','ajax','createuser.php'), { username:username, password:password, @@ -104,7 +104,7 @@ $(document).ready(function(){ }); tr.find('td.groups').append(select); if(tr.find('td.remve img').length==0){ - tr.find('td.remove').append($('<img alt="Remove" title="'+t('admin','Remove')+'" class="svg" src="'+OC.imagePath('core','actions/delete')+'"/>')); + tr.find('td.remove').append($('<img alt="Delete" title="'+t('settings','Delete')+'" class="svg action" src="'+OC.imagePath('core','actions/delete')+'"/>')); } applyMultiplySelect(select); $('#content table tr').last().after(tr); diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php index f81a9f5e413..3212b489403 100644 --- a/settings/l10n/bg_BG.php +++ b/settings/l10n/bg_BG.php @@ -1,19 +1,13 @@ <?php $TRANSLATIONS = array( +"Authentication error" => "Проблем с индентификацията", +"Invalid request" => "Невалидна заявка", +"Language changed" => "Езика е сменен", "Account information" => "Информация за профила", "You're currently using" => "Вие ползвате", "of your" => "на Вашето", "space" => "място", "Change Password" => "Промяна на парола", "Your password got changed" => "Вашата парола е сменена", -"Old password:" => "Стара парола", "New password" => "Нова парола", -"Show new password" => "Покажи новата парола", -"Language" => "Език", -"Authentication error" => "Проблем с индентификацията", -"You have to enter the old and the new password!" => "Трябва да въведете новата и старата парола!", -"Your old password is wrong!" => "Вашата стара парола е грешна!", -"Password changed" => "Паролата е сменена", -"Unable to change password" => "Невъзможна смяна на паролата", -"Language changed" => "Езика е сменен", -"Invalid request" => "Невалидна заявка" +"Language" => "Език" ); diff --git a/settings/l10n/da.php b/settings/l10n/da.php index 37a56f2f64c..ddccc98e482 100644 --- a/settings/l10n/da.php +++ b/settings/l10n/da.php @@ -1,19 +1,13 @@ <?php $TRANSLATIONS = array( +"Authentication error" => "Godkendelsesfejl", +"Invalid request" => "Invalid forespørgsel", +"Language changed" => "Sprog ændret", "Account information" => "Konto information", "You're currently using" => "Du udnytter i øjeblikket", "of your" => "af din", "space" => "plads", "Change Password" => "Ændre adgangskode", "Your password got changed" => "Din adgangskode er ændret", -"Old password:" => "Gamle adgangskode", "New password" => "Nye adgangskode", -"Show new password" => "Vis den nye adgangskode", -"Language" => "Sprog", -"Authentication error" => "Godkendelsesfejl", -"You have to enter the old and the new password!" => "Du skal indtaste din gamle og nye adganskode", -"Your old password is wrong!" => "Din gamle adgangskode er forkert!", -"Password changed" => "Adgangskoden er ændret", -"Unable to change password" => "Kan ikke ændre din adgangskode", -"Language changed" => "Sprog ændret", -"Invalid request" => "Invalid forespørgsel" +"Language" => "Sprog" ); diff --git a/settings/l10n/de.php b/settings/l10n/de.php index e3be20de33e..a1fa2e26817 100644 --- a/settings/l10n/de.php +++ b/settings/l10n/de.php @@ -1,19 +1,25 @@ <?php $TRANSLATIONS = array( +"Authentication error" => "Berechtigungsfehler", +"OpenID Changed" => "OpenID geändert", +"Invalid request" => "Ungültige Anfrage", +"Language changed" => "Sprache geändert", +"Ask a question" => "Stell eine Frage", +"Select an App" => "Wähle eine Anwendung aus", +"-licensed" => "-lizenziert", +"by" => "von", "Account information" => "Konto-Information", "You're currently using" => "Du benutzt gerade", "of your" => "von deinem", "space" => "Speicherplatz", "Change Password" => "Passwort ändern", -"Your password got changed" => "Dein Passwort wurde geändert.", -"Old password:" => "Aktuelles Passwort:", -"New password" => "Neues Passwort:", -"Show new password" => "Neues Passwort anzeigen", +"Your password got changed" => "Dein Passwort wurde geändert", +"Old password" => "Altes Passwort", +"New password" => "Neues Passwort", +"show" => "zeigen", "Language" => "Sprache", -"Authentication error" => "Berechtigungsfehler", -"You have to enter the old and the new password!" => "Du musst das aktuelle und ein neues Passwort angeben!", -"Your old password is wrong!" => "Du hast dein aktuelles Passwort falsch eingegeben!", -"Password changed" => "Passwort geändert", -"Unable to change password" => "Passwort konnte nicht geändert werden", -"Language changed" => "Sprache geändert", -"Invalid request" => "Ungültige Anfrage" +"Name" => "Name", +"Password" => "Passwort", +"Groups" => "Gruppen", +"Create" => "Anlegen", +"Remove" => "Entfernen" ); diff --git a/settings/l10n/es.php b/settings/l10n/es.php index bde223680fb..388680e53fc 100644 --- a/settings/l10n/es.php +++ b/settings/l10n/es.php @@ -1,19 +1,13 @@ <?php $TRANSLATIONS = array( +"Authentication error" => "Error de autentificación", +"Invalid request" => "Solicitud no válida", +"Language changed" => "Idioma cambiado", "Account information" => "Información de la cuenta", "You're currently using" => "Estás utilizando", "of your" => "de tus", "space" => "de espacio total", "Change Password" => "Cambiar contraseña", "Your password got changed" => "Tu contraseña ha sido cambiada", -"Old password:" => "Antigua contraseña:", "New password" => "Nueva contraseña:", -"Show new password" => "Mostrar nueva contraseña", -"Language" => "Idioma", -"Authentication error" => "Error de autentificación", -"You have to enter the old and the new password!" => "¡Tienes que introducir la contraseña antigua y la contraseña nueva!", -"Your old password is wrong!" => "¡Tu contraseña antigua es incorrecta!", -"Password changed" => "Contraseña cambiada", -"Unable to change password" => "No se puede cambiar la contraseña", -"Language changed" => "Idioma cambiado", -"Invalid request" => "Solicitud no válida" +"Language" => "Idioma" ); diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php index 758189e18bc..4105886552f 100644 --- a/settings/l10n/fr.php +++ b/settings/l10n/fr.php @@ -1,19 +1,25 @@ <?php $TRANSLATIONS = array( +"Authentication error" => "Erreur d'authentification", +"OpenID Changed" => "Identifiant OpenID changé avec succès", +"Invalid request" => "Requète invalide", +"Language changed" => "Langue changée avec succès", +"Ask a question" => "Poser une question", +"Select an App" => "Sélectionner une Application", +"-licensed" => "sous licence", +"by" => "par", "Account information" => "Informations sur le compte", "You're currently using" => "Vous utilisez actuellement", -"of your" => "de votre", -"space" => "espace de stockage", +"of your" => "de votre espace de stockage de", +"space" => " ", "Change Password" => "Changer votre mot de passe", "Your password got changed" => "Votre mot de passe a été changé", -"Old password:" => "Ancien mot de passe :", +"Old password" => "Ancien mot de passe", "New password" => "Nouveau mot de passe :", -"Show new password" => "Afficher votre nouveau mot de passe", +"show" => "Afficher", "Language" => "Langue", -"Authentication error" => "Erreur d'authentification", -"You have to enter the old and the new password!" => "Vous devez saisir l'ancien et le nouveau mot de passe !", -"Your old password is wrong!" => "Votre ancien mot de passe est erroné !", -"Password changed" => "Mot de passe changé avec succès", -"Unable to change password" => "Impossible de changer le mot de passe", -"Language changed" => "Langue changée avec succès", -"Invalid request" => "Requète invalide" +"Name" => "Nom", +"Password" => "Mot de passe", +"Groups" => "Groupes", +"Create" => "Créer", +"Remove" => "Supprimer" ); diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php index 3c2f3dbd271..2394fbd74ff 100644 --- a/settings/l10n/nl.php +++ b/settings/l10n/nl.php @@ -1,19 +1,13 @@ <?php $TRANSLATIONS = array( +"Authentication error" => "Authenticatiefout.", +"Invalid request" => "Ongeldig verzoek", +"Language changed" => "Taal aangepast", "Account information" => "Gebruikersgegevens", "You're currently using" => "U gebruikt momenteel", "of your" => "van de", "space" => "beschikbare ruimte.", "Change Password" => "Wachtwoord aanpassen", "Your password got changed" => "Uw wachtwoord is aangepast", -"Old password:" => "Oud wachtwoord:", "New password" => "Nieuw wachtwoord", -"Show new password" => "Toon nieuw wachtwoord", -"Language" => "Taal", -"Authentication error" => "Authenticatiefout.", -"You have to enter the old and the new password!" => "U moet het oude en nieuwe wachtwoord invullen.", -"Your old password is wrong!" => "Het oude wachtwoord is verkeerd.", -"Password changed" => "Wachtwoord aangepast", -"Unable to change password" => "Wachtwoord aanpassen is niet mogelijk", -"Language changed" => "Taal aangepast", -"Invalid request" => "Ongeldig verzoek" +"Language" => "Taal" ); diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php index b65fdd15b4d..c5afac7d2e0 100644 --- a/settings/l10n/pl.php +++ b/settings/l10n/pl.php @@ -1,19 +1,13 @@ <?php $TRANSLATIONS = array( +"Authentication error" => "Błąd uwierzytelniania", +"Invalid request" => "Nieprawidłowe żądanie", +"Language changed" => "Język zmieniony", "Account information" => "Dane konta", "You're currently using" => "Obecnie używasz", "of your" => "ze swoich", "space" => "przestrzeni", "Change Password" => "Zmień hasło", "Your password got changed" => "Twoje hasło zostało zmienione", -"Old password:" => "Stare hasło", "New password" => "Nowe hasło", -"Show new password" => "Pokaż nowe hasło", -"Language" => "Język", -"Authentication error" => "Błąd uwierzytelniania", -"You have to enter the old and the new password!" => "Musisz wprowadzić zarówno stare, jak i nowe hasło!", -"Your old password is wrong!" => "Twoje stare hasło jest błędne!", -"Password changed" => "Hasło zmienione", -"Unable to change password" => "NIe można zmienić hasła", -"Language changed" => "Język zmieniony", -"Invalid request" => "Nieprawidłowe żądanie" +"Language" => "Język" ); diff --git a/settings/languageCodes.php b/settings/languageCodes.php new file mode 100644 index 00000000000..aaf745d0457 --- /dev/null +++ b/settings/languageCodes.php @@ -0,0 +1,147 @@ +<?php return array( +'ab'=>'Abkhazian', +'aa'=>'Afar', +'af'=>'Afrikaans', +'sq'=>'Shqip', +'am'=>'Amharic', +'ar'=>'Arabic', +'hy'=>'Armenian', +'as'=>'Assamese', +'ay'=>'Aymara', +'az'=>'Azerbaijani', +'ba'=>'Bashkir', +'eu'=>'Euskara', +'bn'=>'Bengali (Bangla)', +'dz'=>'Bhutani', +'bh'=>'Bihari', +'bi'=>'Bislama', +'br'=>'Breton', +'bg'=>'Balgarski ezik', +'my'=>'Burmese', +'be'=>'Byelorussian (Belarusian)', +'km'=>'Cambodian', +'ca'=>'Catala', +'zh'=>'Chinese (Simplified)', +'zh'=>'Chinese (Traditional)', +'co'=>'Corsican', +'hr'=>'Hrvatski', +'cs'=>'Cestina', +'da'=>'Dansk', +'nl'=>'Nederlands', +'en'=>'English', +'eo'=>'Esperanto', +'et'=>'Eesti', +'fo'=>'Faeroese', +'fa'=>'Farsi', +'fj'=>'Fiji', +'fi'=>'Finnish', +'nl-be'=>'Flemish', +'fr'=>'Francais', +'fy'=>'Frisian', +'gl'=>'Galician', +'gd'=>'Gaelic (Scottish)', +'gv'=>'Gaelic (Manx)', +'ka'=>'Georgian', +'de'=>'Deutsch', +'el'=>'Ellinika', +'kl'=>'Greenlandic', +'gn'=>'Guarani', +'gu'=>'Gujarati', +'ha'=>'Hausa', +'he'=>'Hebrew', +'iw'=>'Hebrew', +'hi'=>'Hindi', +'hu'=>'Hungarian', +'is'=>'Icelandic', +'id'=>'Bahasa Indonesia', +'in'=>'Bahasa Indonesia', +'ia'=>'Interlingua', +'ie'=>'Interlingue', +'iu'=>'Inuktitut', +'ik'=>'Inupiak', +'ga'=>'Irish', +'it'=>'Italiano', +'ja'=>'Japanese', +'jv'=>'Javanese', +'kn'=>'Kannada', +'ks'=>'Kashmiri', +'kk'=>'Kazakh', +'rw'=>'Kinyarwanda (Ruanda)', +'ky'=>'Kirghiz', +'rn'=>'Kirundi (Rundi)', +'ko'=>'Korean', +'ku'=>'Kurdish', +'lo'=>'Laothian', +'la'=>'Latin', +'lv'=>'Latvian (Lettish)', +'li'=>'Limburgish ( Limburger)', +'ln'=>'Lingala', +'lt'=>'Lithuanian', +'mk'=>'Macedonian', +'mg'=>'Malagasy', +'ms'=>'Malay', +'ml'=>'Malayalam', +'mt'=>'Maltese', +'mi'=>'Maori', +'mr'=>'Marathi', +'mo'=>'Moldavian', +'mn'=>'Mongolian', +'na'=>'Nauru', +'ne'=>'Nepali', +'no'=>'Norsk', +'oc'=>'Occitan', +'or'=>'Oriya', +'om'=>'Oromo (Afan, Galla)', +'ps'=>'Pashto (Pushto)', +'pl'=>'Polski', +'pt'=>'Portugues', +'pa'=>'Punjabi', +'qu'=>'Quechua', +'rm'=>'Rhaeto-Romance', +'ro'=>'Romanian', +'ru'=>'Russian', +'sm'=>'Samoan', +'sg'=>'Sangro', +'sa'=>'Sanskrit', +'sr'=>'Serbian', +'sh'=>'Serbo-Croatian', +'st'=>'Sesotho', +'tn'=>'Setswana', +'sn'=>'Shona', +'sd'=>'Sindhi', +'si'=>'Sinhalese', +'ss'=>'Siswati', +'sk'=>'Slovak', +'sl'=>'Slovenian', +'so'=>'Somali', +'es'=>'Espanol', +'su'=>'Sundanese', +'sw'=>'Swahili (Kiswahili)', +'sv'=>'Swedish', +'tl'=>'Tagalog', +'tg'=>'Tajik', +'ta'=>'Tamil', +'tt'=>'Tatar', +'te'=>'Telugu', +'th'=>'Thai', +'bo'=>'Tibetan', +'ti'=>'Tigrinya', +'to'=>'Tonga', +'ts'=>'Tsonga', +'tr'=>'Turkish', +'tk'=>'Turkmen', +'tw'=>'Twi', +'ug'=>'Uighur', +'uk'=>'Ukrainian', +'ur'=>'Urdu', +'uz'=>'Uzbek', +'vi'=>'Vietnamese', +'vo'=>'Volapk', +'cy'=>'Welsh', +'wo'=>'Wolof', +'xh'=>'Xhosa', +'yi'=>'Yiddish', +'ji'=>'Yiddish', +'yo'=>'Yoruba', +'zu'=>'Zulu', +); diff --git a/settings/index.php b/settings/personal.php index aea35054930..a31042bb53f 100644 --- a/settings/index.php +++ b/settings/personal.php @@ -7,9 +7,9 @@ if( !OC_User::isLoggedIn()){ } // Highlight navigation entry -OC_App::setActiveNavigationEntry( "settings" ); -OC_Util::addScript( "settings", "main" ); +OC_Util::addScript( "settings", "personal" ); OC_Util::addStyle( "settings", "settings" ); +OC_App::setActiveNavigationEntry( "settings" ); // calculate the disc space $used=OC_Filesystem::filesize('/'); @@ -18,13 +18,18 @@ $total=$free+$used; $relative=round(($used/$total)*100); $lang=OC_Preferences::getValue( OC_User::getUser(), 'core', 'lang', 'en' ); -$languages=OC_L10N::findAvailableLanguages(); +$languageCodes=OC_L10N::findAvailableLanguages(); //put the current language in the front -unset($languages[array_search($lang,$languages)]); -array_unshift($languages,$lang); +unset($languageCodes[array_search($lang,$languageCodes)]); +array_unshift($languageCodes,$lang); +$languageNames=include 'languageCodes.php'; +$languages=array(); +foreach($languageCodes as $lang){ + $languages[]=array('code'=>$lang,'name'=>$languageNames[$lang]); +} // Return template -$tmpl = new OC_Template( "settings", "index", "user"); +$tmpl = new OC_Template( "settings", "personal", "user"); $tmpl->assign('usage',OC_Helper::humanFileSize($used)); $tmpl->assign('total_space',OC_Helper::humanFileSize($total)); $tmpl->assign('usage_relative',$relative); diff --git a/admin/templates/apps.php b/settings/templates/apps.php index 025fbc4c81f..025fbc4c81f 100644 --- a/admin/templates/apps.php +++ b/settings/templates/apps.php diff --git a/help/templates/index.php b/settings/templates/help.php index ef5510e78b4..4cd748c3dff 100644 --- a/help/templates/index.php +++ b/settings/templates/help.php @@ -14,7 +14,7 @@ </tbody> </table> <?php - $url=OC_Helper::linkTo( "help", "index.php" ).'?page='; + $url=OC_Helper::linkTo( "settings", "help.php" ).'?page='; $pageNavi=OC_Util::getPageNavi($_['pagecount'],$_['page'],$url); $pageNavi->printPage(); ?> diff --git a/settings/templates/index.php b/settings/templates/index.php deleted file mode 100644 index 48c3f542018..00000000000 --- a/settings/templates/index.php +++ /dev/null @@ -1,35 +0,0 @@ -<form id="quota"> - <fieldset> - <legend><?php echo $l->t( 'Account information' );?></legend> - <div id="quota_indicator"><div style="width:<?php echo $_['usage_relative'] ?>%;"> </div></div> - <p><?php echo $l->t( 'You\'re currently using' );?> <?php echo $_['usage_relative'] ?>% (<?php echo $_['usage'] ?>) <?php echo $l->t( 'of your' );?> <?php echo $_['total_space'] ?> <?php echo $l->t( 'space' );?>.</p> - </fieldset> -</form> - -<form id="passwordform"> - <fieldset> - <legend><?php echo $l->t( 'Change Password' );?></legend> - <div id="passwordchanged"><?php echo $l->t( 'Your password got changed');?></div> - <div id="passworderror"></div> - <input type="password" id="pass1" name="oldpassword" placeholder="<?php echo $l->t( 'Old password' );?>" /> - <input type="password" id="pass2" name="password" placeholder="<?php echo $l->t( 'New password' );?>" data-typetoggle="#show" /> - <input type="checkbox" id="show" name="show" /><label for="show"><?php echo $l->t( 'show' );?></label> - <input id="passwordbutton" type="submit" value="<?php echo $l->t( 'Change Password' );?>" /> - </fieldset> -</form> - -<form id="languageform"> - <fieldset> - <legend><?php echo $l->t( 'Language' );?></legend> - <label for=''></label> - <select id="languageinput" name='lang'> - <?php foreach($_['languages'] as $language):?> - <option value='<?php echo $language;?>'><?php echo $language;?></option> - <?php endforeach;?> - </select> - </fieldset> -</form> - -<?php foreach($_['forms'] as $form){ - echo $form; -};?> diff --git a/settings/templates/personal.php b/settings/templates/personal.php new file mode 100644 index 00000000000..95df4d8c712 --- /dev/null +++ b/settings/templates/personal.php @@ -0,0 +1,35 @@ +<div id="quota" class="personalblock"><div style="width:<?php echo $_['usage_relative'];?>%;"> + <p><?php echo $l->t('You use');?> <strong><?php echo $_['usage'];?></strong> <?php echo $l->t('of the available');?> <strong><?php echo $_['total_space'];?></strong></p> +</div></div> + +<form id="passwordform"> + <fieldset class="personalblock"> + <div id="passwordchanged"><?php echo $l->t('Your password got changed');?></div> + <div id="passworderror"></div> + <input type="password" id="pass1" name="oldpassword" placeholder="<?php echo $l->t('Current password');?>" /> + <input type="password" id="pass2" name="password" placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#show" /> + <input type="checkbox" id="show" name="show" /><label for="show"><?php echo $l->t('show');?></label> + <input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" /> + </fieldset> +</form> + +<form> + <fieldset class="personalblock"> + <label for="languageinput"><strong><?php echo $l->t('Language');?></strong></label> + <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> + </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" /> +</p> + +<?php foreach($_['forms'] as $form){ + echo $form; +};?> diff --git a/admin/templates/users.php b/settings/templates/users.php index 77a4f0c0d57..01e2adf4e97 100644 --- a/admin/templates/users.php +++ b/settings/templates/users.php @@ -22,7 +22,7 @@ foreach($_["groups"] as $group) { <td class="name"><?php echo $user["name"]; ?></td> <td class="password"> <span>●●●●●●●</span> - <img class="svg" src="<?php echo image_path('core','actions/rename.svg')?>"/> + <img class="svg action" src="<?php echo image_path('core','actions/rename.svg')?>" alt="set new password" title="set new password" /> </td> <td class="groups"> <select data-username="<?php echo $user['name'] ;?>" data-user-groups="<?php echo $user['groups'] ;?>" data-placeholder="groups" title="<?php echo $l->t('Groups')?>" multiple="multiple"> @@ -33,7 +33,7 @@ foreach($_["groups"] as $group) { </td> <td class="remove"> <?php if($user['name']!=OC_User::getUser()):?> - <img alt="Remove" title="<?php echo $l->t('Remove')?>" class='svg' src='<?php echo image_path('core','actions/delete.svg') ?>'/> + <img alt="Delete" title="<?php echo $l->t('Delete')?>" class="svg action" src="<?php echo image_path('core','actions/delete.svg') ?>" /> <?php endif;?> </td> </tr> diff --git a/admin/users.php b/settings/users.php index cbec28a544b..cd7d04a55e7 100644 --- a/admin/users.php +++ b/settings/users.php @@ -28,8 +28,8 @@ if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )) } // We have some javascript foo! -OC_Util::addScript( 'admin', 'users' ); -OC_Util::addStyle( 'admin', 'users' ); +OC_Util::addScript( 'settings', 'users' ); +OC_Util::addStyle( 'settings', 'settings' ); OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' ); OC_Util::addStyle( '3rdparty', 'chosen' ); OC_App::setActiveNavigationEntry( 'core_users' ); @@ -46,7 +46,7 @@ foreach( OC_Group::getGroups() as $i ){ $groups[] = array( "name" => $i ); } -$tmpl = new OC_Template( "admin", "users", "user" ); +$tmpl = new OC_Template( "settings", "users", "user" ); $tmpl->assign( "users", $users ); $tmpl->assign( "groups", $groups ); $tmpl->printPage(); |
