From c08a04bc839651f14816f04d10a9250ac2515f35 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Mon, 4 Mar 2013 17:05:08 +0100 Subject: VCategories: Don't forget to save category relations if category exists. --- lib/vcategories.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/vcategories.php b/lib/vcategories.php index f94a0a55d3b..2f990c5d2d2 100644 --- a/lib/vcategories.php +++ b/lib/vcategories.php @@ -348,12 +348,11 @@ class OC_VCategories { self::$relations[] = array('objid' => $id, 'category' => $name); } } - if(count($newones) > 0) { - $this->categories = array_merge($this->categories, $newones); - if($sync === true) { - $this->save(); - } + $this->categories = array_merge($this->categories, $newones); + if($sync === true) { + $this->save(); } + return true; } -- cgit v1.2.3 From 8b09402b771fcede0cc5183340729b9c4be654e9 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Mon, 4 Mar 2013 12:08:41 -0500 Subject: Fix #2074 by initializing as an array --- lib/group/backend.php | 10 +++++----- lib/group/database.php | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/group/backend.php b/lib/group/backend.php index e7b7b21d957..26a784efb28 100644 --- a/lib/group/backend.php +++ b/lib/group/backend.php @@ -142,14 +142,14 @@ abstract class OC_Group_Backend implements OC_Group_Interface { * @param int $offset * @return array with display names (value) and user ids (key) */ - public function DisplayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) { - $displayNames = ''; + public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) { + $displayNames = array(); $users = $this->usersInGroup($gid, $search, $limit, $offset); - foreach ( $users as $user ) { - $DisplayNames[$user] = $user; + foreach ($users as $user) { + $displayNames[$user] = $user; } - return $DisplayNames; + return $displayNames; } } diff --git a/lib/group/database.php b/lib/group/database.php index 40e9b0d4147..d0974685ff6 100644 --- a/lib/group/database.php +++ b/lib/group/database.php @@ -219,8 +219,8 @@ class OC_Group_Database extends OC_Group_Backend { * @param int $offset * @return array with display names (value) and user ids (key) */ - public function DisplayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) { - $displayNames = ''; + public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) { + $displayNames = array(); $stmt = OC_DB::prepare('SELECT `*PREFIX*users`.`uid`, `*PREFIX*users`.`displayname`' .' FROM `*PREFIX*users`' -- cgit v1.2.3 From a97006144e520d5789ed5e06ddebc00d6b16c664 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Mon, 4 Mar 2013 20:35:58 +0100 Subject: Only send the standard headers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes https://github.com/owncloud/apps/issues/675 --- lib/template.php | 1 - 1 file changed, 1 deletion(-) (limited to 'lib') diff --git a/lib/template.php b/lib/template.php index b2d1f0c0292..398f9de0655 100644 --- a/lib/template.php +++ b/lib/template.php @@ -200,7 +200,6 @@ class OC_Template{ .'img-src *; ' .'font-src \'self\' data:'); header('Content-Security-Policy:'.$policy); // Standard - header('X-WebKit-CSP:'.$policy); // Older webkit browsers $this->findTemplate($name); } -- cgit v1.2.3 From 6019cdd5bdba8623673299e9ae7b765bef8235a9 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Mon, 4 Mar 2013 21:10:18 +0100 Subject: adding test case for getDefaultEmailAddress() + fixing #1844 again --- lib/mail.php | 8 ++++++++ lib/public/util.php | 4 ++-- tests/lib/util.php | 5 +++++ 3 files changed, 15 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/mail.php b/lib/mail.php index 22194045a76..61634632efc 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -119,4 +119,12 @@ class OC_Mail { return($txt); } + + /** + * @param string $emailAddress a given email address to be validated + * @return bool + */ + public static function ValidateAddress($emailAddress) { + return PHPMailer::ValidateAddress($emailAddress); + } } diff --git a/lib/public/util.php b/lib/public/util.php index 5d814114a24..db07cbcfff3 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -219,11 +219,11 @@ class Util { $host_name = self::getServerHostName(); $defaultEmailAddress = $user_part.'@'.$host_name; - if (\PHPMailer::ValidateAddress($defaultEmailAddress)) { + if (\OC_Mail::ValidateAddress($defaultEmailAddress)) { return $defaultEmailAddress; } - // incase we cannot build a valid email address from the hostname let's fallback to 'localhost.localdomain' + // in case we cannot build a valid email address from the hostname let's fallback to 'localhost.localdomain' return $user_part.'@localhost.localdomain'; } diff --git a/tests/lib/util.php b/tests/lib/util.php index ebff3c7381a..b904c359807 100644 --- a/tests/lib/util.php +++ b/tests/lib/util.php @@ -42,4 +42,9 @@ class Test_Util extends PHPUnit_Framework_TestCase { $result = strlen(OC_Util::generate_random_bytes(59)); $this->assertEquals(59, $result); } + + function testGetDefaultEmailAddress() { + $email = \OCP\Util::getDefaultEmailAddress("no-reply"); + $this->assertEquals('no-reply@localhost.localdomain', $email); + } } \ No newline at end of file -- cgit v1.2.3 From 56ae4bb6e9a08c5ada36b4c42ae4e22eaf288df7 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 4 Mar 2013 22:26:03 +0100 Subject: Cache: also check if the file id is already in the cache during upgrade Should solve upgrade issues if only some of the configured storages were migrated previously --- lib/files/cache/upgrade.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/files/cache/upgrade.php b/lib/files/cache/upgrade.php index 1fe4c584686..4d98abb2f8d 100644 --- a/lib/files/cache/upgrade.php +++ b/lib/files/cache/upgrade.php @@ -64,7 +64,7 @@ class Upgrade { * @param array $data the data for the new cache */ function insert($data) { - if (!$this->inCache($data['storage'], $data['path_hash'])) { + if (!$this->inCache($data['storage'], $data['path_hash'], $data['id'])) { $insertQuery = \OC_DB::prepare('INSERT INTO `*PREFIX*filecache` ( `fileid`, `storage`, `path`, `path_hash`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted` ) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)'); @@ -78,12 +78,19 @@ class Upgrade { /** * @param string $storage * @param string $pathHash + * @param string $id * @return bool */ - function inCache($storage, $pathHash) { + function inCache($storage, $pathHash, $id) { $query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path_hash` = ?'); $result = $query->execute(array($storage, $pathHash)); - return (bool)$result->fetchRow(); + if ($result->fetchRow()) { + return true; + } else { + $query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `fileid` = ?'); + $result = $query->execute(array($id)); + return (bool)$result->fetchRow(); + } } /** -- cgit v1.2.3 From 9d9acf24de482bdd5d0b700ba75631b246e5699b Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 4 Mar 2013 23:19:55 +0100 Subject: Cache: more efficient detection for existing entries during upgrade --- lib/files/cache/upgrade.php | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/lib/files/cache/upgrade.php b/lib/files/cache/upgrade.php index 4d98abb2f8d..811d82d7437 100644 --- a/lib/files/cache/upgrade.php +++ b/lib/files/cache/upgrade.php @@ -82,15 +82,9 @@ class Upgrade { * @return bool */ function inCache($storage, $pathHash, $id) { - $query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path_hash` = ?'); - $result = $query->execute(array($storage, $pathHash)); - if ($result->fetchRow()) { - return true; - } else { - $query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `fileid` = ?'); - $result = $query->execute(array($id)); - return (bool)$result->fetchRow(); - } + $query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE (`storage` = ? AND `path_hash` = ?) OR `fileid` = ?'); + $result = $query->execute(array($storage, $pathHash, $id)); + return (bool)$result->fetchRow(); } /** -- cgit v1.2.3 From 6c96b93fd49304afa438c79dbca77c25ec246a94 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Tue, 5 Mar 2013 00:19:07 +0100 Subject: [tx-robot] updated from transifex --- apps/files/l10n/cs_CZ.php | 1 + apps/files/l10n/da.php | 2 ++ apps/files/l10n/de.php | 1 + apps/files/l10n/de_DE.php | 1 + apps/files_versions/l10n/da.php | 1 + apps/user_ldap/l10n/cs_CZ.php | 8 ++++- apps/user_ldap/l10n/it.php | 2 ++ l10n/cs_CZ/files.po | 8 ++--- l10n/cs_CZ/user_ldap.po | 20 +++++------ l10n/da/files.po | 11 +++--- l10n/da/files_versions.po | 13 +++---- l10n/da/lib.po | 9 ++--- l10n/da/settings.po | 67 +++++++++++++++++++------------------ l10n/de/files.po | 6 ++-- l10n/de_DE/files.po | 6 ++-- l10n/fa/settings.po | 25 +++++++------- l10n/it/user_ldap.po | 8 ++--- l10n/nl/settings.po | 9 ++--- l10n/templates/core.pot | 2 +- l10n/templates/files.pot | 2 +- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_trashbin.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 2 +- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- l10n/templates/user_webdavauth.pot | 2 +- lib/l10n/da.php | 1 + settings/l10n/da.php | 30 +++++++++++++++++ settings/l10n/fa.php | 9 +++++ settings/l10n/nl.php | 1 + 33 files changed, 161 insertions(+), 100 deletions(-) (limited to 'lib') diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php index 4c7dc898cc9..48b60bfb711 100644 --- a/apps/files/l10n/cs_CZ.php +++ b/apps/files/l10n/cs_CZ.php @@ -61,6 +61,7 @@ "From link" => "Z odkazu", "Deleted files" => "Odstraněné soubory", "Cancel upload" => "Zrušit odesílání", +"You don’t have write permissions here." => "Nemáte zde práva zápisu.", "Nothing in here. Upload something!" => "Žádný obsah. Nahrajte něco.", "Download" => "Stáhnout", "Unshare" => "Zrušit sdílení", diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php index c9042e30b4e..c147c939f84 100644 --- a/apps/files/l10n/da.php +++ b/apps/files/l10n/da.php @@ -59,7 +59,9 @@ "Text file" => "Tekstfil", "Folder" => "Mappe", "From link" => "Fra link", +"Deleted files" => "Slettede filer", "Cancel upload" => "Fortryd upload", +"You don’t have write permissions here." => "Du har ikke skriverettigheder her.", "Nothing in here. Upload something!" => "Her er tomt. Upload noget!", "Download" => "Download", "Unshare" => "Fjern deling", diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php index b78ffe1c168..53427503f4c 100644 --- a/apps/files/l10n/de.php +++ b/apps/files/l10n/de.php @@ -61,6 +61,7 @@ "From link" => "Von einem Link", "Deleted files" => "Gelöschte Dateien", "Cancel upload" => "Upload abbrechen", +"You don’t have write permissions here." => "Du besitzt hier keine Schreib-Berechtigung.", "Nothing in here. Upload something!" => "Alles leer. Lade etwas hoch!", "Download" => "Herunterladen", "Unshare" => "Nicht mehr freigeben", diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php index dd5dd28472d..56aaabe9e81 100644 --- a/apps/files/l10n/de_DE.php +++ b/apps/files/l10n/de_DE.php @@ -61,6 +61,7 @@ "From link" => "Von einem Link", "Deleted files" => "Gelöschte Dateien", "Cancel upload" => "Upload abbrechen", +"You don’t have write permissions here." => "Sie haben keine Schreib-Berechtigungen hier.", "Nothing in here. Upload something!" => "Alles leer. Bitte laden Sie etwas hoch!", "Download" => "Herunterladen", "Unshare" => "Nicht mehr freigeben", diff --git a/apps/files_versions/l10n/da.php b/apps/files_versions/l10n/da.php index 76ababe665a..447a3d2b85d 100644 --- a/apps/files_versions/l10n/da.php +++ b/apps/files_versions/l10n/da.php @@ -6,5 +6,6 @@ "File %s could not be reverted to version %s" => "Filen %s blev genskabt til version: %s", "No old versions available" => "Ingen gamle version tilgængelige", "No path specified" => "Ingen sti specificeret", +"Versions" => "Versioner", "Revert a file to a previous version by clicking on its revert button" => "Genskab en fil til en tidligere version ved at klikke på denne genskab knap." ); diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php index 4c74f195cf4..c5d77026b9e 100644 --- a/apps/user_ldap/l10n/cs_CZ.php +++ b/apps/user_ldap/l10n/cs_CZ.php @@ -1,5 +1,5 @@ "Selhalo smazání konfigurace serveru", +"Failed to delete the server configuration" => "Selhalo smazání nastavení serveru", "The configuration is valid and the connection could be established!" => "Nastavení je v pořádku a spojení bylo navázáno.", "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurace je v pořádku, ale spojení selhalo. Zkontrolujte, prosím, nastavení serveru a přihlašovací údaje.", "The configuration is invalid. Please look in the ownCloud log for further details." => "Nastavení je neplatné. Zkontrolujte, prosím, záznam ownCloud pro další podrobnosti.", @@ -48,6 +48,7 @@ "Turn off SSL certificate validation." => "Vypnout ověřování SSL certifikátu.", "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Pokud připojení pracuje pouze s touto možností, tak importujte SSL certifikát SSL serveru do Vašeho serveru ownCloud", "Not recommended, use for testing only." => "Není doporučeno, pouze pro testovací účely.", +"Cache Time-To-Live" => "TTL vyrovnávací paměti", "in seconds. A change empties the cache." => "ve vteřinách. Změna vyprázdní vyrovnávací paměť.", "Directory Settings" => "Nastavení adresáře", "User Display Name Field" => "Pole pro zobrazované jméno uživatele", @@ -63,7 +64,12 @@ "Group Search Attributes" => "Atributy vyhledávání skupin", "Group-Member association" => "Asociace člena skupiny", "Special Attributes" => "Speciální atributy", +"Quota Field" => "Pole pro kvótu", +"Quota Default" => "Výchozí kvóta", "in bytes" => "v bajtech", +"Email Field" => "Pole e-mailu", +"User Home Folder Naming Rule" => "Pravidlo pojmenování domovské složky uživatele", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ponechte prázdné pro uživatelské jméno (výchozí). Jinak uveďte LDAP/AD parametr.", +"Test Configuration" => "Vyzkoušet nastavení", "Help" => "Nápověda" ); diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php index 86887970dab..a2790fd1dec 100644 --- a/apps/user_ldap/l10n/it.php +++ b/apps/user_ldap/l10n/it.php @@ -48,6 +48,7 @@ "Turn off SSL certificate validation." => "Disattiva il controllo del certificato SSL.", "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Se la connessione funziona esclusivamente con questa opzione, importa il certificato SSL del server LDAP nel tuo server ownCloud.", "Not recommended, use for testing only." => "Non consigliato, utilizzare solo per test.", +"Cache Time-To-Live" => "Tempo di vita della cache", "in seconds. A change empties the cache." => "in secondi. Il cambio svuota la cache.", "Directory Settings" => "Impostazioni delle cartelle", "User Display Name Field" => "Campo per la visualizzazione del nome utente", @@ -67,6 +68,7 @@ "Quota Default" => "Quota predefinita", "in bytes" => "in byte", "Email Field" => "Campo Email", +"User Home Folder Naming Rule" => "Regola di assegnazione del nome della cartella utente", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Lascia vuoto per il nome utente (predefinito). Altrimenti, specifica un attributo LDAP/AD.", "Test Configuration" => "Prova configurazione", "Help" => "Aiuto" diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po index ccb6c7fa431..5aaad214447 100644 --- a/l10n/cs_CZ/files.po +++ b/l10n/cs_CZ/files.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" -"PO-Revision-Date: 2013-03-03 23:06+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"PO-Revision-Date: 2013-03-04 07:30+0000\n" +"Last-Translator: Tomáš Chvátal \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -281,7 +281,7 @@ msgstr "Zrušit odesílání" #: templates/index.php:53 msgid "You don’t have write permissions here." -msgstr "" +msgstr "Nemáte zde práva zápisu." #: templates/index.php:60 msgid "Nothing in here. Upload something!" diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po index a1d1984547e..cd9f8f37827 100644 --- a/l10n/cs_CZ/user_ldap.po +++ b/l10n/cs_CZ/user_ldap.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-02 00:03+0100\n" -"PO-Revision-Date: 2013-03-01 23:04+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"PO-Revision-Date: 2013-03-04 12:20+0000\n" +"Last-Translator: Tomáš Chvátal \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +21,7 @@ msgstr "" #: ajax/deleteConfiguration.php:34 msgid "Failed to delete the server configuration" -msgstr "Selhalo smazání konfigurace serveru" +msgstr "Selhalo smazání nastavení serveru" #: ajax/testConfiguration.php:36 msgid "The configuration is valid and the connection could be established!" @@ -238,7 +238,7 @@ msgstr "Není doporučeno, pouze pro testovací účely." #: templates/settings.php:65 msgid "Cache Time-To-Live" -msgstr "" +msgstr "TTL vyrovnávací paměti" #: templates/settings.php:65 msgid "in seconds. A change empties the cache." @@ -302,11 +302,11 @@ msgstr "Speciální atributy" #: templates/settings.php:79 msgid "Quota Field" -msgstr "" +msgstr "Pole pro kvótu" #: templates/settings.php:80 msgid "Quota Default" -msgstr "" +msgstr "Výchozí kvóta" #: templates/settings.php:80 msgid "in bytes" @@ -314,11 +314,11 @@ msgstr "v bajtech" #: templates/settings.php:81 msgid "Email Field" -msgstr "" +msgstr "Pole e-mailu" #: templates/settings.php:82 msgid "User Home Folder Naming Rule" -msgstr "" +msgstr "Pravidlo pojmenování domovské složky uživatele" #: templates/settings.php:82 msgid "" @@ -328,7 +328,7 @@ msgstr "Ponechte prázdné pro uživatelské jméno (výchozí). Jinak uveďte L #: templates/settings.php:86 msgid "Test Configuration" -msgstr "" +msgstr "Vyzkoušet nastavení" #: templates/settings.php:86 msgid "Help" diff --git a/l10n/da/files.po b/l10n/da/files.po index 637f4779fb9..7d64d326b93 100644 --- a/l10n/da/files.po +++ b/l10n/da/files.po @@ -10,15 +10,16 @@ # , 2012. # Pascal d'Hermilly , 2011. # , 2012. +# Thomas , 2013. # Thomas Tanghus <>, 2012. # Thomas Tanghus , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" -"PO-Revision-Date: 2013-03-03 23:06+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"PO-Revision-Date: 2013-03-04 18:10+0000\n" +"Last-Translator: cronner \n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -279,7 +280,7 @@ msgstr "Fra link" #: templates/index.php:40 msgid "Deleted files" -msgstr "" +msgstr "Slettede filer" #: templates/index.php:46 msgid "Cancel upload" @@ -287,7 +288,7 @@ msgstr "Fortryd upload" #: templates/index.php:53 msgid "You don’t have write permissions here." -msgstr "" +msgstr "Du har ikke skriverettigheder her." #: templates/index.php:60 msgid "Nothing in here. Upload something!" diff --git a/l10n/da/files_versions.po b/l10n/da/files_versions.po index 00cf12aa115..6b6ab2ac91f 100644 --- a/l10n/da/files_versions.po +++ b/l10n/da/files_versions.po @@ -6,13 +6,14 @@ # Frederik Lassen , 2013. # Morten Juhl-Johansen Zölde-Fejér , 2012. # , 2012. +# Thomas , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-28 00:04+0100\n" -"PO-Revision-Date: 2013-02-27 23:04+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"PO-Revision-Date: 2013-03-04 18:20+0000\n" +"Last-Translator: cronner \n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -43,17 +44,17 @@ msgstr "fejl" msgid "File %s could not be reverted to version %s" msgstr "Filen %s blev genskabt til version: %s" -#: history.php:68 +#: history.php:69 msgid "No old versions available" msgstr "Ingen gamle version tilgængelige" -#: history.php:73 +#: history.php:74 msgid "No path specified" msgstr "Ingen sti specificeret" #: js/versions.js:6 msgid "Versions" -msgstr "" +msgstr "Versioner" #: templates/history.php:20 msgid "Revert a file to a previous version by clicking on its revert button" diff --git a/l10n/da/lib.po b/l10n/da/lib.po index e541159bed1..a8476f00b37 100644 --- a/l10n/da/lib.po +++ b/l10n/da/lib.po @@ -7,13 +7,14 @@ # Frederik Lassen , 2013. # Morten Juhl-Johansen Zölde-Fejér , 2012-2013. # , 2012. +# Thomas , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-27 14:35+0100\n" -"PO-Revision-Date: 2013-02-27 13:35+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"PO-Revision-Date: 2013-03-04 18:10+0000\n" +"Last-Translator: cronner \n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -178,7 +179,7 @@ msgstr "Fejlende kommando var: \"%s\", navn: %s, password: %s" #: setup.php:631 #, php-format msgid "MS SQL username and/or password not valid: %s" -msgstr "" +msgstr "MS SQL brugernavn og/eller adgangskode ikke er gyldigt: %s" #: setup.php:849 msgid "" diff --git a/l10n/da/settings.po b/l10n/da/settings.po index a70828aa5ea..645026b75e3 100644 --- a/l10n/da/settings.po +++ b/l10n/da/settings.po @@ -12,15 +12,16 @@ # Pascal d'Hermilly , 2011. # , 2012. # , 2012-2013. +# Thomas , 2013. # Thomas Tanghus <>, 2012. # Thomas Tanghus , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-27 14:35+0100\n" -"PO-Revision-Date: 2013-02-27 13:35+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"PO-Revision-Date: 2013-03-04 18:30+0000\n" +"Last-Translator: cronner \n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -141,7 +142,7 @@ msgstr "fortryd" #: js/users.js:62 msgid "Unable to remove user" -msgstr "" +msgstr "Kan ikke fjerne bruger" #: js/users.js:75 templates/users.php:26 templates/users.php:80 #: templates/users.php:105 @@ -158,19 +159,19 @@ msgstr "Slet" #: js/users.js:191 msgid "add group" -msgstr "" +msgstr "Tilføj gruppe" #: js/users.js:352 msgid "A valid username must be provided" -msgstr "" +msgstr "Et gyldigt brugernavn skal angives" #: js/users.js:353 js/users.js:359 js/users.js:374 msgid "Error creating user" -msgstr "" +msgstr "Fejl ved oprettelse af bruger" #: js/users.js:358 msgid "A valid password must be provided" -msgstr "" +msgstr "En gyldig adgangskode skal angives" #: personal.php:29 personal.php:30 msgid "__language_name__" @@ -191,7 +192,7 @@ msgstr "Din data mappe og dine filer er muligvis tilgængelige fra internettet. #: templates/admin.php:29 msgid "Setup Warning" -msgstr "" +msgstr "Opsætnings Advarsel" #: templates/admin.php:32 msgid "" @@ -206,17 +207,17 @@ msgstr "Dobbelttjek venligst installations vejledningerne." #: templates/admin.php:44 msgid "Module 'fileinfo' missing" -msgstr "" +msgstr "Module 'fileinfo' mangler" #: templates/admin.php:47 msgid "" "The PHP module 'fileinfo' is missing. We strongly recommend to enable this " "module to get best results with mime-type detection." -msgstr "" +msgstr "PHP modulet 'fileinfo' mangler. Vi anbefaler stærkt at aktivere dette modul til at få de bedste resultater med mime-type detektion." #: templates/admin.php:58 msgid "Locale not working" -msgstr "" +msgstr "Landestandard fungerer ikke" #: templates/admin.php:63 #, php-format @@ -224,11 +225,11 @@ msgid "" "This ownCloud server can't set system locale to %s. This means that there " "might be problems with certain characters in file names. We strongly suggest" " to install the required packages on your system to support %s." -msgstr "" +msgstr "Denne ownCloud server kan ikke indstille systemets landestandard for %s. Det betyder, at der kan være problemer med visse tegn i filnavne. Vi anbefaler kraftigt, at installere de nødvendige pakker på dit system til at understøtte %s." #: templates/admin.php:75 msgid "Internet connection not working" -msgstr "" +msgstr "Internetforbindelse fungerer ikke" #: templates/admin.php:78 msgid "" @@ -242,86 +243,86 @@ msgstr "" #: templates/admin.php:92 msgid "Cron" -msgstr "" +msgstr "Cron" #: templates/admin.php:101 msgid "Execute one task with each page loaded" -msgstr "" +msgstr "Udføre en opgave med hver side indlæst" #: templates/admin.php:111 msgid "" "cron.php is registered at a webcron service. Call the cron.php page in the " "owncloud root once a minute over http." -msgstr "" +msgstr "cron.php er registreret hos en webcron service. Kald cron.php side i owncloud rod en gang i minuttet over HTTP." #: templates/admin.php:121 msgid "" "Use systems cron service. Call the cron.php file in the owncloud folder via " "a system cronjob once a minute." -msgstr "" +msgstr "Brug system cron service. Kald cron.php filen i owncloud mappe via et system cronjob en gang i minuttet." #: templates/admin.php:128 msgid "Sharing" -msgstr "" +msgstr "Deling" #: templates/admin.php:134 msgid "Enable Share API" -msgstr "" +msgstr "Aktiver Share API" #: templates/admin.php:135 msgid "Allow apps to use the Share API" -msgstr "" +msgstr "Tillad apps til at bruge Share API" #: templates/admin.php:142 msgid "Allow links" -msgstr "" +msgstr "Tillad links" #: templates/admin.php:143 msgid "Allow users to share items to the public with links" -msgstr "" +msgstr "Tillad brugere at dele elementer til offentligheden med links" #: templates/admin.php:150 msgid "Allow resharing" -msgstr "" +msgstr "Tillad videredeling" #: templates/admin.php:151 msgid "Allow users to share items shared with them again" -msgstr "" +msgstr "Tillad brugere at dele elementer delt med dem igen" #: templates/admin.php:158 msgid "Allow users to share with anyone" -msgstr "" +msgstr "Tillad brugere at dele med alle" #: templates/admin.php:161 msgid "Allow users to only share with users in their groups" -msgstr "" +msgstr "Tillad brugere at kun dele med brugerne i deres grupper" #: templates/admin.php:168 msgid "Security" -msgstr "" +msgstr "Sikkerhed" #: templates/admin.php:181 msgid "Enforce HTTPS" -msgstr "" +msgstr "Gennemtving HTTPS" #: templates/admin.php:182 msgid "" "Enforces the clients to connect to ownCloud via an encrypted connection." -msgstr "" +msgstr "Håndhæver klienter at oprette forbindelse til ownCloud via en krypteret forbindelse." #: templates/admin.php:185 msgid "" "Please connect to this ownCloud instance via HTTPS to enable or disable the " "SSL enforcement." -msgstr "" +msgstr "Opret forbindelse til denne ownCloud enhed via HTTPS for at aktivere eller deaktivere SSL håndhævelse." #: templates/admin.php:195 msgid "Log" -msgstr "" +msgstr "Log" #: templates/admin.php:196 msgid "Log level" -msgstr "" +msgstr "Log niveau" #: templates/admin.php:223 msgid "More" diff --git a/l10n/de/files.po b/l10n/de/files.po index 423becbecde..12c0a5d4504 100644 --- a/l10n/de/files.po +++ b/l10n/de/files.po @@ -28,8 +28,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" -"PO-Revision-Date: 2013-03-03 23:06+0000\n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"PO-Revision-Date: 2013-03-04 13:20+0000\n" "Last-Translator: I Robot \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -299,7 +299,7 @@ msgstr "Upload abbrechen" #: templates/index.php:53 msgid "You don’t have write permissions here." -msgstr "" +msgstr "Du besitzt hier keine Schreib-Berechtigung." #: templates/index.php:60 msgid "Nothing in here. Upload something!" diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po index f6bec1d9e43..533533fac75 100644 --- a/l10n/de_DE/files.po +++ b/l10n/de_DE/files.po @@ -33,8 +33,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" -"PO-Revision-Date: 2013-03-03 23:06+0000\n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"PO-Revision-Date: 2013-03-04 13:20+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" @@ -304,7 +304,7 @@ msgstr "Upload abbrechen" #: templates/index.php:53 msgid "You don’t have write permissions here." -msgstr "" +msgstr "Sie haben keine Schreib-Berechtigungen hier." #: templates/index.php:60 msgid "Nothing in here. Upload something!" diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po index 2f647994415..269b3623500 100644 --- a/l10n/fa/settings.po +++ b/l10n/fa/settings.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Amir Reza Asadi , 2013. # , 2012. # Hossein nag , 2012. # mahdi Kereshteh , 2013. @@ -12,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-27 14:35+0100\n" -"PO-Revision-Date: 2013-02-27 13:35+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"PO-Revision-Date: 2013-03-04 16:30+0000\n" +"Last-Translator: Amir Reza Asadi \n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -152,7 +153,7 @@ msgstr "پاک کردن" #: js/users.js:191 msgid "add group" -msgstr "" +msgstr "افزودن گروه" #: js/users.js:352 msgid "A valid username must be provided" @@ -160,7 +161,7 @@ msgstr "" #: js/users.js:353 js/users.js:359 js/users.js:374 msgid "Error creating user" -msgstr "" +msgstr "خطا در ایجاد کاربر" #: js/users.js:358 msgid "A valid password must be provided" @@ -185,7 +186,7 @@ msgstr "" #: templates/admin.php:29 msgid "Setup Warning" -msgstr "" +msgstr "هشدار راه اندازی" #: templates/admin.php:32 msgid "" @@ -222,7 +223,7 @@ msgstr "" #: templates/admin.php:75 msgid "Internet connection not working" -msgstr "" +msgstr "اتصال اینترنت کار نمی کند" #: templates/admin.php:78 msgid "" @@ -256,7 +257,7 @@ msgstr "" #: templates/admin.php:128 msgid "Sharing" -msgstr "" +msgstr "اشتراک گذاری" #: templates/admin.php:134 msgid "Enable Share API" @@ -272,7 +273,7 @@ msgstr "" #: templates/admin.php:143 msgid "Allow users to share items to the public with links" -msgstr "" +msgstr "اجازه دادن به کاربران برای اشتراک گذاری آیتم ها با عموم از طریق پیوند ها" #: templates/admin.php:150 msgid "Allow resharing" @@ -292,7 +293,7 @@ msgstr "" #: templates/admin.php:168 msgid "Security" -msgstr "" +msgstr "امنیت" #: templates/admin.php:181 msgid "Enforce HTTPS" @@ -369,7 +370,7 @@ msgstr "مستندات مدیر" #: templates/help.php:9 msgid "Online Documentation" -msgstr "" +msgstr "مستندات آنلاین" #: templates/help.php:11 msgid "Forum" @@ -377,7 +378,7 @@ msgstr "انجمن" #: templates/help.php:14 msgid "Bugtracker" -msgstr "" +msgstr "ردیاب باگ " #: templates/help.php:17 msgid "Commercial Support" diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po index 22e3dcf32c4..a03705a5cf6 100644 --- a/l10n/it/user_ldap.po +++ b/l10n/it/user_ldap.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-03 00:05+0100\n" -"PO-Revision-Date: 2013-03-02 00:40+0000\n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"PO-Revision-Date: 2013-03-04 14:30+0000\n" "Last-Translator: Vincenzo Reale \n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" @@ -238,7 +238,7 @@ msgstr "Non consigliato, utilizzare solo per test." #: templates/settings.php:65 msgid "Cache Time-To-Live" -msgstr "" +msgstr "Tempo di vita della cache" #: templates/settings.php:65 msgid "in seconds. A change empties the cache." @@ -318,7 +318,7 @@ msgstr "Campo Email" #: templates/settings.php:82 msgid "User Home Folder Naming Rule" -msgstr "" +msgstr "Regola di assegnazione del nome della cartella utente" #: templates/settings.php:82 msgid "" diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po index 075d5a41e10..595fce94d99 100644 --- a/l10n/nl/settings.po +++ b/l10n/nl/settings.po @@ -14,13 +14,14 @@ # , 2012. # , 2012. # Richard Bos , 2012. +# Wilfred Dijksman , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-27 14:35+0100\n" -"PO-Revision-Date: 2013-02-27 13:35+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"PO-Revision-Date: 2013-03-04 22:30+0000\n" +"Last-Translator: Wilfred Dijksman \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -224,7 +225,7 @@ msgid "" "This ownCloud server can't set system locale to %s. This means that there " "might be problems with certain characters in file names. We strongly suggest" " to install the required packages on your system to support %s." -msgstr "" +msgstr "Deze ownCloud server kan de systeemtaal niet instellen op %s. Hierdoor kunnen er mogelijk problemen optreden met bepaalde karakters in bestandsnamen. Het wordt sterk aangeraden om de vereiste pakketen op uw systeem te installeren zodat %s ondersteund wordt." #: templates/admin.php:75 msgid "Internet connection not working" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 219bf35914a..a7051235b03 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 72f58c06838..af772e8ce1a 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index b57b08dcda2..4e1bf94f6dd 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 74f193704fc..70e3969859d 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index 5c2416d85b0..579bcded725 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index bfccd229646..3ad1f56c805 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index 5c289ea6655..59437ff1c86 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index 6d35680ccd7..d84be95ab90 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 588e6c0b612..c8f5ea514a4 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index 1163dc59840..1dbd4468b92 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index 1973963fc42..11dc1e3768d 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/lib/l10n/da.php b/lib/l10n/da.php index e61fba30ff3..38ccbbe8e21 100644 --- a/lib/l10n/da.php +++ b/lib/l10n/da.php @@ -34,6 +34,7 @@ "MySQL user '%s'@'%%' already exists" => "MySQL brugeren '%s'@'%%' eksisterer allerede.", "Drop this user from MySQL." => "Slet denne bruger fra MySQL", "Offending command was: \"%s\", name: %s, password: %s" => "Fejlende kommando var: \"%s\", navn: %s, password: %s", +"MS SQL username and/or password not valid: %s" => "MS SQL brugernavn og/eller adgangskode ikke er gyldigt: %s", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt.", "Please double check the installation guides." => "Dobbelttjek venligst installations vejledningerne.", "seconds ago" => "sekunder siden", diff --git a/settings/l10n/da.php b/settings/l10n/da.php index 5a330d371a8..a2b9063053b 100644 --- a/settings/l10n/da.php +++ b/settings/l10n/da.php @@ -26,14 +26,44 @@ "Saving..." => "Gemmer...", "deleted" => "Slettet", "undo" => "fortryd", +"Unable to remove user" => "Kan ikke fjerne bruger", "Groups" => "Grupper", "Group Admin" => "Gruppe Administrator", "Delete" => "Slet", +"add group" => "Tilføj gruppe", +"A valid username must be provided" => "Et gyldigt brugernavn skal angives", +"Error creating user" => "Fejl ved oprettelse af bruger", +"A valid password must be provided" => "En gyldig adgangskode skal angives", "__language_name__" => "Dansk", "Security Warning" => "Sikkerhedsadvarsel", "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Din data mappe og dine filer er muligvis tilgængelige fra internettet. .htaccess filen som ownCloud leverer virker ikke. Vi anbefaler på det kraftigste at du konfigurerer din webserver på en måske så data mappen ikke længere er tilgængelig eller at du flytter data mappen uden for webserverens dokument rod. ", +"Setup Warning" => "Opsætnings Advarsel", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt.", "Please double check the installation guides." => "Dobbelttjek venligst installations vejledningerne.", +"Module 'fileinfo' missing" => "Module 'fileinfo' mangler", +"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modulet 'fileinfo' mangler. Vi anbefaler stærkt at aktivere dette modul til at få de bedste resultater med mime-type detektion.", +"Locale not working" => "Landestandard fungerer ikke", +"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Denne ownCloud server kan ikke indstille systemets landestandard for %s. Det betyder, at der kan være problemer med visse tegn i filnavne. Vi anbefaler kraftigt, at installere de nødvendige pakker på dit system til at understøtte %s.", +"Internet connection not working" => "Internetforbindelse fungerer ikke", +"Cron" => "Cron", +"Execute one task with each page loaded" => "Udføre en opgave med hver side indlæst", +"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php er registreret hos en webcron service. Kald cron.php side i owncloud rod en gang i minuttet over HTTP.", +"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Brug system cron service. Kald cron.php filen i owncloud mappe via et system cronjob en gang i minuttet.", +"Sharing" => "Deling", +"Enable Share API" => "Aktiver Share API", +"Allow apps to use the Share API" => "Tillad apps til at bruge Share API", +"Allow links" => "Tillad links", +"Allow users to share items to the public with links" => "Tillad brugere at dele elementer til offentligheden med links", +"Allow resharing" => "Tillad videredeling", +"Allow users to share items shared with them again" => "Tillad brugere at dele elementer delt med dem igen", +"Allow users to share with anyone" => "Tillad brugere at dele med alle", +"Allow users to only share with users in their groups" => "Tillad brugere at kun dele med brugerne i deres grupper", +"Security" => "Sikkerhed", +"Enforce HTTPS" => "Gennemtving HTTPS", +"Enforces the clients to connect to ownCloud via an encrypted connection." => "Håndhæver klienter at oprette forbindelse til ownCloud via en krypteret forbindelse.", +"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Opret forbindelse til denne ownCloud enhed via HTTPS for at aktivere eller deaktivere SSL håndhævelse.", +"Log" => "Log", +"Log level" => "Log niveau", "More" => "Mere", "Version" => "Version", "Developed by the ownCloud community, the source code is licensed under the AGPL." => "Udviklet af ownClouds community, og kildekoden er underlagt licensen AGPL.", diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php index d75efa85eba..688374e8e3b 100644 --- a/settings/l10n/fa.php +++ b/settings/l10n/fa.php @@ -22,8 +22,15 @@ "undo" => "بازگشت", "Groups" => "گروه ها", "Delete" => "پاک کردن", +"add group" => "افزودن گروه", +"Error creating user" => "خطا در ایجاد کاربر", "__language_name__" => "__language_name__", "Security Warning" => "اخطار امنیتی", +"Setup Warning" => "هشدار راه اندازی", +"Internet connection not working" => "اتصال اینترنت کار نمی کند", +"Sharing" => "اشتراک گذاری", +"Allow users to share items to the public with links" => "اجازه دادن به کاربران برای اشتراک گذاری آیتم ها با عموم از طریق پیوند ها", +"Security" => "امنیت", "More" => "بیش‌تر", "Version" => "نسخه", "Add your App" => "برنامه خود را بیافزایید", @@ -33,7 +40,9 @@ "Update" => "به روز رسانی", "User Documentation" => "مستندات کاربر", "Administrator Documentation" => "مستندات مدیر", +"Online Documentation" => "مستندات آنلاین", "Forum" => "انجمن", +"Bugtracker" => "ردیاب باگ ", "Commercial Support" => "پشتیبانی تجاری", "Show First Run Wizard again" => "راهبری کمکی اجرای اول را دوباره نمایش بده", "Password" => "گذرواژه", diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php index 249bf63cd38..1ce0ef88291 100644 --- a/settings/l10n/nl.php +++ b/settings/l10n/nl.php @@ -43,6 +43,7 @@ "Module 'fileinfo' missing" => "Module 'fileinfo' ontbreekt", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "De PHP module 'fileinfo' ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor mime-type detectie.", "Locale not working" => "Taalbestand werkt niet", +"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Deze ownCloud server kan de systeemtaal niet instellen op %s. Hierdoor kunnen er mogelijk problemen optreden met bepaalde karakters in bestandsnamen. Het wordt sterk aangeraden om de vereiste pakketen op uw systeem te installeren zodat %s ondersteund wordt.", "Internet connection not working" => "Internet verbinding werkt niet", "This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Deze ownCloud server heeft geen actieve internet verbinding. dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internet verbinding voor deze server in te schakelen als u alle functies van ownCloud wilt gebruiken.", "Cron" => "Cron", -- cgit v1.2.3 From 2b7ff7273d0c791a3b7eabe90146915f063a8339 Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Sat, 2 Mar 2013 04:06:27 +0100 Subject: ownCloud 5 RC2 --- lib/util.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/util.php b/lib/util.php index de1f870fd7e..c7916b9e774 100755 --- a/lib/util.php +++ b/lib/util.php @@ -75,7 +75,7 @@ class OC_Util { public static function getVersion() { // hint: We only can count up. Reset minor/patchlevel when // updating major/minor version number. - return array(4, 95, 10); + return array(4, 96, 10); } /** @@ -83,7 +83,7 @@ class OC_Util { * @return string */ public static function getVersionString() { - return '5.0 RC 1'; + return '5.0 RC 2'; } /** -- cgit v1.2.3 From 5da9223d1c61257cbccbc762e6a7c28bc06f110b Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Tue, 5 Mar 2013 21:22:34 +0100 Subject: make getDisplayNames optional feature for Group Backends, fall back to internal names --- lib/group.php | 8 +++++++- lib/group/backend.php | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/group.php b/lib/group.php index 88f0a2a032c..d1a830730b7 100644 --- a/lib/group.php +++ b/lib/group.php @@ -294,7 +294,13 @@ class OC_Group { public static function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) { $displayNames=array(); foreach(self::$_usedBackends as $backend) { - $displayNames = array_merge($backend->displayNamesInGroup($gid, $search, $limit, $offset), $displayNames); + if($backend->implementsActions(OC_GROUP_BACKEND_GET_DISPLAYNAME)) { + $displayNames = array_merge($backend->displayNamesInGroup($gid, $search, $limit, $offset), $displayNames); + } else { + $users = $backend->usersInGroup($gid, $search, $limit, $offset); + $names = array_combine($users, $users); + $displayNames = array_merge($names, $displayNames); + } } return $displayNames; } diff --git a/lib/group/backend.php b/lib/group/backend.php index 26a784efb28..2e17b5d0b7f 100644 --- a/lib/group/backend.php +++ b/lib/group/backend.php @@ -33,6 +33,7 @@ define('OC_GROUP_BACKEND_CREATE_GROUP', 0x00000001); define('OC_GROUP_BACKEND_DELETE_GROUP', 0x00000010); define('OC_GROUP_BACKEND_ADD_TO_GROUP', 0x00000100); define('OC_GROUP_BACKEND_REMOVE_FROM_GOUP', 0x00001000); +define('OC_GROUP_BACKEND_GET_DISPLAYNAME', 0x00010000); /** * Abstract base class for user management @@ -43,6 +44,7 @@ abstract class OC_Group_Backend implements OC_Group_Interface { OC_GROUP_BACKEND_DELETE_GROUP => 'deleteGroup', OC_GROUP_BACKEND_ADD_TO_GROUP => 'addToGroup', OC_GROUP_BACKEND_REMOVE_FROM_GOUP => 'removeFromGroup', + OC_GROUP_BACKEND_GET_DISPLAYNAME => 'displayNamesInGroup', ); /** -- cgit v1.2.3 From c1a32b50735b0a8558823d111e546865ddcba790 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Wed, 6 Mar 2013 00:08:33 +0100 Subject: [tx-robot] updated from transifex --- apps/files/l10n/de_DE.php | 2 +- apps/files/l10n/lv.php | 1 + apps/files/l10n/nl.php | 1 + apps/files/l10n/pt_PT.php | 1 + apps/files/l10n/uk.php | 1 + apps/files_external/l10n/nl.php | 2 + apps/files_external/l10n/pt_PT.php | 8 +- apps/files_external/l10n/uk.php | 2 + apps/files_versions/l10n/nl.php | 1 + apps/files_versions/l10n/pt_PT.php | 1 + apps/files_versions/l10n/uk.php | 1 + apps/user_ldap/l10n/de_DE.php | 6 ++ apps/user_ldap/l10n/nl.php | 6 ++ apps/user_ldap/l10n/pt_PT.php | 6 ++ apps/user_ldap/l10n/uk.php | 6 ++ core/l10n/id.php | 21 ++++- l10n/de_DE/files.po | 8 +- l10n/de_DE/files_external.po | 6 +- l10n/de_DE/files_versions.po | 10 +-- l10n/de_DE/lib.po | 8 +- l10n/de_DE/settings.po | 9 +- l10n/de_DE/user_ldap.po | 18 ++-- l10n/id/core.po | 162 ++++++++++++++++++------------------ l10n/id/lib.po | 4 +- l10n/lv/files.po | 8 +- l10n/nl/files.po | 8 +- l10n/nl/files_external.po | 12 +-- l10n/nl/files_versions.po | 12 +-- l10n/nl/lib.po | 8 +- l10n/nl/user_ldap.po | 18 ++-- l10n/pt_PT/files.po | 8 +- l10n/pt_PT/files_external.po | 17 ++-- l10n/pt_PT/files_trashbin.po | 16 ++-- l10n/pt_PT/files_versions.po | 13 +-- l10n/pt_PT/lib.po | 9 +- l10n/pt_PT/settings.po | 10 +-- l10n/pt_PT/user_ldap.po | 18 ++-- l10n/templates/core.pot | 2 +- l10n/templates/files.pot | 2 +- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_trashbin.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 2 +- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- l10n/templates/user_webdavauth.pot | 2 +- l10n/uk/files.po | 8 +- l10n/uk/files_external.po | 11 +-- l10n/uk/files_versions.po | 12 +-- l10n/uk/lib.po | 8 +- l10n/uk/settings.po | 8 +- l10n/uk/user_ldap.po | 18 ++-- lib/l10n/de_DE.php | 2 +- lib/l10n/nl.php | 1 + lib/l10n/pt_PT.php | 1 + lib/l10n/uk.php | 1 + settings/l10n/de_DE.php | 2 +- settings/l10n/pt_PT.php | 1 + settings/l10n/uk.php | 1 + 61 files changed, 306 insertions(+), 238 deletions(-) (limited to 'lib') diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php index 56aaabe9e81..538c1b63652 100644 --- a/apps/files/l10n/de_DE.php +++ b/apps/files/l10n/de_DE.php @@ -61,7 +61,7 @@ "From link" => "Von einem Link", "Deleted files" => "Gelöschte Dateien", "Cancel upload" => "Upload abbrechen", -"You don’t have write permissions here." => "Sie haben keine Schreib-Berechtigungen hier.", +"You don’t have write permissions here." => "Sie haben hier keine Schreib-Berechtigungen.", "Nothing in here. Upload something!" => "Alles leer. Bitte laden Sie etwas hoch!", "Download" => "Herunterladen", "Unshare" => "Nicht mehr freigeben", diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php index 93c3593b095..a7a9284c651 100644 --- a/apps/files/l10n/lv.php +++ b/apps/files/l10n/lv.php @@ -61,6 +61,7 @@ "From link" => "No saites", "Deleted files" => "Dzēstās datnes", "Cancel upload" => "Atcelt augšupielādi", +"You don’t have write permissions here." => "Jums nav tiesību šeit rakstīt.", "Nothing in here. Upload something!" => "Te vēl nekas nav. Rīkojies, sāc augšupielādēt!", "Download" => "Lejupielādēt", "Unshare" => "Pārtraukt dalīšanos", diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php index 1719350f9c7..6af7edf2501 100644 --- a/apps/files/l10n/nl.php +++ b/apps/files/l10n/nl.php @@ -61,6 +61,7 @@ "From link" => "Vanaf link", "Deleted files" => "Verwijderde bestanden", "Cancel upload" => "Upload afbreken", +"You don’t have write permissions here." => "U hebt hier geen schrijfpermissies.", "Nothing in here. Upload something!" => "Er bevindt zich hier niets. Upload een bestand!", "Download" => "Download", "Unshare" => "Stop delen", diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php index b8334db2725..7162517e816 100644 --- a/apps/files/l10n/pt_PT.php +++ b/apps/files/l10n/pt_PT.php @@ -61,6 +61,7 @@ "From link" => "Da ligação", "Deleted files" => "Ficheiros eliminados", "Cancel upload" => "Cancelar envio", +"You don’t have write permissions here." => "Não tem permissões de escrita aqui.", "Nothing in here. Upload something!" => "Vazio. Envie alguma coisa!", "Download" => "Transferir", "Unshare" => "Deixar de partilhar", diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php index 05f279d8eb6..f5e161996c0 100644 --- a/apps/files/l10n/uk.php +++ b/apps/files/l10n/uk.php @@ -61,6 +61,7 @@ "From link" => "З посилання", "Deleted files" => "Видалено файлів", "Cancel upload" => "Перервати завантаження", +"You don’t have write permissions here." => "У вас тут немає прав на запис.", "Nothing in here. Upload something!" => "Тут нічого немає. Відвантажте що-небудь!", "Download" => "Завантажити", "Unshare" => "Заборонити доступ", diff --git a/apps/files_external/l10n/nl.php b/apps/files_external/l10n/nl.php index ef03f46379a..ad3eda9747f 100644 --- a/apps/files_external/l10n/nl.php +++ b/apps/files_external/l10n/nl.php @@ -8,9 +8,11 @@ "Warning: The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "Waarschuwing: FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van FTP shares is niet mogelijk. Vraag uw beheerder FTP ondersteuning te installeren.", "External Storage" => "Externe opslag", "Folder name" => "Mapnaam", +"External storage" => "Externe opslag", "Configuration" => "Configuratie", "Options" => "Opties", "Applicable" => "Van toepassing", +"Add storage" => "Toevoegen opslag", "None set" => "Niets ingesteld", "All Users" => "Alle gebruikers", "Groups" => "Groepen", diff --git a/apps/files_external/l10n/pt_PT.php b/apps/files_external/l10n/pt_PT.php index 1204f13f42f..aac3c1c2ca0 100644 --- a/apps/files_external/l10n/pt_PT.php +++ b/apps/files_external/l10n/pt_PT.php @@ -4,18 +4,20 @@ "Grant access" => "Conceder acesso", "Please provide a valid Dropbox app key and secret." => "Por favor forneça uma \"app key\" e \"secret\" do Dropbox válidas.", "Error configuring Google Drive storage" => "Erro ao configurar o armazenamento do Google Drive", -"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Aviso: O cliente \"smbclient\" não está instalado. Não é possível montar as partilhas CIFS/SMB . Peça ao seu administrador para instalar.", +"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Atenção: O cliente \"smbclient\" não está instalado. Não é possível montar as partilhas CIFS/SMB . Peça ao seu administrador para instalar.", "Warning: The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "Aviso: O suporte FTP no PHP não está activate ou instalado. Não é possível montar as partilhas FTP. Peça ao seu administrador para instalar.", "External Storage" => "Armazenamento Externo", "Folder name" => "Nome da pasta", +"External storage" => "Armazenamento Externo", "Configuration" => "Configuração", "Options" => "Opções", "Applicable" => "Aplicável", -"None set" => "Nenhum configurado", +"Add storage" => "Adicionar armazenamento", +"None set" => "Não definido", "All Users" => "Todos os utilizadores", "Groups" => "Grupos", "Users" => "Utilizadores", -"Delete" => "Apagar", +"Delete" => "Eliminar", "Enable User External Storage" => "Activar Armazenamento Externo para o Utilizador", "Allow users to mount their own external storage" => "Permitir que os utilizadores montem o seu próprio armazenamento externo", "SSL root certificates" => "Certificados SSL de raiz", diff --git a/apps/files_external/l10n/uk.php b/apps/files_external/l10n/uk.php index f83c1a7eb6a..34d19af0ee9 100644 --- a/apps/files_external/l10n/uk.php +++ b/apps/files_external/l10n/uk.php @@ -8,9 +8,11 @@ "Warning: The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "Попередження: Підтримка FTP в PHP не увімкнута чи не встановлена. Під'єднанатися до FTP тек неможливо. Попрохайте системного адміністратора встановити її.", "External Storage" => "Зовнішні сховища", "Folder name" => "Ім'я теки", +"External storage" => "Зовнішнє сховище", "Configuration" => "Налаштування", "Options" => "Опції", "Applicable" => "Придатний", +"Add storage" => "Додати сховище", "None set" => "Не встановлено", "All Users" => "Усі користувачі", "Groups" => "Групи", diff --git a/apps/files_versions/l10n/nl.php b/apps/files_versions/l10n/nl.php index c50f76c7add..92088522121 100644 --- a/apps/files_versions/l10n/nl.php +++ b/apps/files_versions/l10n/nl.php @@ -6,5 +6,6 @@ "File %s could not be reverted to version %s" => "Bestand %s kon niet worden teruggedraaid naar versie %s", "No old versions available" => "Geen oudere versies beschikbaar", "No path specified" => "Geen pad opgegeven", +"Versions" => "Versies", "Revert a file to a previous version by clicking on its revert button" => "Draai een bestand terug naar een voorgaande versie door te klikken op de terugdraai knop" ); diff --git a/apps/files_versions/l10n/pt_PT.php b/apps/files_versions/l10n/pt_PT.php index 2baccf3def8..93379547295 100644 --- a/apps/files_versions/l10n/pt_PT.php +++ b/apps/files_versions/l10n/pt_PT.php @@ -6,5 +6,6 @@ "File %s could not be reverted to version %s" => "Não foi possível reverter o ficheiro %s para a versão %s", "No old versions available" => "Não existem versões mais antigas", "No path specified" => "Nenhum caminho especificado", +"Versions" => "Versões", "Revert a file to a previous version by clicking on its revert button" => "Reverter um ficheiro para uma versão anterior clicando no seu botão reverter." ); diff --git a/apps/files_versions/l10n/uk.php b/apps/files_versions/l10n/uk.php index bfee066c63d..e722d95497b 100644 --- a/apps/files_versions/l10n/uk.php +++ b/apps/files_versions/l10n/uk.php @@ -6,5 +6,6 @@ "File %s could not be reverted to version %s" => "Файл %s не може бути відновлений до версії %s", "No old versions available" => "Старі версії недоступні", "No path specified" => "Шлях не вказаний", +"Versions" => "Версії", "Revert a file to a previous version by clicking on its revert button" => "Відновити файл на попередню версію, натиснувши на кнопку Відновити" ); diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php index c88ed22b4fa..bff7b0312c7 100644 --- a/apps/user_ldap/l10n/de_DE.php +++ b/apps/user_ldap/l10n/de_DE.php @@ -48,6 +48,7 @@ "Turn off SSL certificate validation." => "Schalten Sie die SSL-Zertifikatsprüfung aus.", "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden.", "Not recommended, use for testing only." => "Nicht empfohlen, nur zu Testzwecken.", +"Cache Time-To-Live" => "Speichere Time-To-Live zwischen", "in seconds. A change empties the cache." => "in Sekunden. Eine Änderung leert den Cache.", "Directory Settings" => "Verzeichniseinstellungen", "User Display Name Field" => "Feld für den Anzeigenamen des Benutzers", @@ -63,7 +64,12 @@ "Group Search Attributes" => "Gruppen-Suche Eigenschaften", "Group-Member association" => "Assoziation zwischen Gruppe und Benutzer", "Special Attributes" => "Besondere Eigenschaften", +"Quota Field" => "Kontingent Feld", +"Quota Default" => "Kontingent Standard", "in bytes" => "in Bytes", +"Email Field" => "E-Mail Feld", +"User Home Folder Naming Rule" => "Benennungsregel für das Heimatverzeichnis des Benutzers", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein.", +"Test Configuration" => "Testkonfiguration", "Help" => "Hilfe" ); diff --git a/apps/user_ldap/l10n/nl.php b/apps/user_ldap/l10n/nl.php index 0eda263aa11..7973c66cd10 100644 --- a/apps/user_ldap/l10n/nl.php +++ b/apps/user_ldap/l10n/nl.php @@ -48,6 +48,7 @@ "Turn off SSL certificate validation." => "Schakel SSL certificaat validatie uit.", "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Als de connectie alleen werkt met deze optie, importeer dan het LDAP server SSL certificaat naar je ownCloud server.", "Not recommended, use for testing only." => "Niet aangeraden, gebruik alleen voor test doeleinden.", +"Cache Time-To-Live" => "Cache time-to-live", "in seconds. A change empties the cache." => "in seconden. Een verandering maakt de cache leeg.", "Directory Settings" => "Mapinstellingen", "User Display Name Field" => "Gebruikers Schermnaam Veld", @@ -63,7 +64,12 @@ "Group Search Attributes" => "Attributen voor groepszoekopdrachten", "Group-Member association" => "Groepslid associatie", "Special Attributes" => "Speciale attributen", +"Quota Field" => "Quota veld", +"Quota Default" => "Quota standaard", "in bytes" => "in bytes", +"Email Field" => "E-mailveld", +"User Home Folder Naming Rule" => "Gebruikers Home map naamgevingsregel", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Laat leeg voor de gebruikersnaam (standaard). Of, specificeer een LDAP/AD attribuut.", +"Test Configuration" => "Test configuratie", "Help" => "Help" ); diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php index bfe6656b3b6..3092d061437 100644 --- a/apps/user_ldap/l10n/pt_PT.php +++ b/apps/user_ldap/l10n/pt_PT.php @@ -48,6 +48,7 @@ "Turn off SSL certificate validation." => "Desligar a validação de certificado SSL.", "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Se a ligação apenas funcionar com está opção, importe o certificado SSL do servidor LDAP para o seu servidor do ownCloud.", "Not recommended, use for testing only." => "Não recomendado, utilizado apenas para testes!", +"Cache Time-To-Live" => "Cache do tempo de vida dos objetos no servidor", "in seconds. A change empties the cache." => "em segundos. Uma alteração esvazia a cache.", "Directory Settings" => "Definições de directorias", "User Display Name Field" => "Mostrador do nome de utilizador.", @@ -63,7 +64,12 @@ "Group Search Attributes" => "Atributos de pesquisa de grupo", "Group-Member association" => "Associar utilizador ao grupo.", "Special Attributes" => "Atributos especiais", +"Quota Field" => "Quota", +"Quota Default" => "Quota padrão", "in bytes" => "em bytes", +"Email Field" => "Campo de email", +"User Home Folder Naming Rule" => "Regra da pasta inicial do utilizador", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixe vazio para nome de utilizador (padrão). De outro modo, especifique um atributo LDAP/AD.", +"Test Configuration" => "Testar a configuração", "Help" => "Ajuda" ); diff --git a/apps/user_ldap/l10n/uk.php b/apps/user_ldap/l10n/uk.php index 3b85e095ff0..623d34c98e6 100644 --- a/apps/user_ldap/l10n/uk.php +++ b/apps/user_ldap/l10n/uk.php @@ -48,6 +48,7 @@ "Turn off SSL certificate validation." => "Вимкнути перевірку SSL сертифіката.", "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Якщо з'єднання працює лише з цією опцією, імпортуйте SSL сертифікат LDAP сервера у ваший ownCloud сервер.", "Not recommended, use for testing only." => "Не рекомендується, використовуйте лише для тестів.", +"Cache Time-To-Live" => "Час актуальності Кеша", "in seconds. A change empties the cache." => "в секундах. Зміна очищує кеш.", "Directory Settings" => "Налаштування Каталога", "User Display Name Field" => "Поле, яке відображає Ім'я Користувача", @@ -63,7 +64,12 @@ "Group Search Attributes" => "Пошукові Атрибути Групи", "Group-Member association" => "Асоціація Група-Член", "Special Attributes" => "Спеціальні Атрибути", +"Quota Field" => "Поле Квоти", +"Quota Default" => "Квота за замовчанням", "in bytes" => "в байтах", +"Email Field" => "Поле Ел. пошти", +"User Home Folder Naming Rule" => "Правило іменування домашньої теки користувача", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Залиште порожнім для імені користувача (за замовчанням). Інакше, вкажіть атрибут LDAP/AD.", +"Test Configuration" => "Тестове налаштування", "Help" => "Допомога" ); diff --git a/core/l10n/id.php b/core/l10n/id.php index 697195e7514..0be3ef20fb5 100644 --- a/core/l10n/id.php +++ b/core/l10n/id.php @@ -1,6 +1,12 @@ "Tipe kategori tidak diberikan.", "No category to add?" => "Tidak ada kategori yang akan ditambahkan?", +"This category already exists: %s" => "Kategori ini sudah ada: %s", +"Object type not provided." => "Tipe obyek tidak diberikan.", +"%s ID not provided." => "%s ID tidak diberikan.", +"Error adding %s to favorites." => "Kesalahan menambah %s ke favorit", "No categories selected for deletion." => "Tidak ada kategori terpilih untuk penghapusan.", +"Error removing %s from favorites." => "Kesalahan menghapus %s dari favorit", "Sunday" => "minggu", "Monday" => "senin", "Tuesday" => "selasa", @@ -23,9 +29,14 @@ "Settings" => "Setelan", "seconds ago" => "beberapa detik yang lalu", "1 minute ago" => "1 menit lalu", +"{minutes} minutes ago" => "{minutes} menit yang lalu", +"1 hour ago" => "1 jam yang lalu", +"{hours} hours ago" => "{hours} jam yang lalu", "today" => "hari ini", "yesterday" => "kemarin", +"{days} days ago" => "{days} hari yang lalu", "last month" => "bulan kemarin", +"{months} months ago" => "{months} bulan yang lalu", "months ago" => "beberapa bulan lalu", "last year" => "tahun kemarin", "years ago" => "beberapa tahun lalu", @@ -35,7 +46,8 @@ "Yes" => "Ya", "Ok" => "Oke", "Error" => "gagal", -"Share" => "berbagi", +"Shared" => "Terbagi", +"Share" => "Bagi", "Error while sharing" => "gagal ketika membagikan", "Error while unsharing" => "gagal ketika membatalkan pembagian", "Error while changing permissions" => "gagal ketika merubah perijinan", @@ -45,6 +57,8 @@ "Share with link" => "bagikan dengan tautan", "Password protect" => "lindungi dengan kata kunci", "Password" => "Password", +"Email link to person" => "Email link ini ke orang", +"Send" => "Kirim", "Set expiration date" => "set tanggal kadaluarsa", "Expiration date" => "tanggal kadaluarsa", "Share via email:" => "berbagi memlalui surel:", @@ -61,9 +75,13 @@ "Password protected" => "dilindungi kata kunci", "Error unsetting expiration date" => "gagal melepas tanggal kadaluarsa", "Error setting expiration date" => "gagal memasang tanggal kadaluarsa", +"Sending ..." => "Sedang mengirim ...", +"Email sent" => "Email terkirim", +"The update was successful. Redirecting you to ownCloud now." => "Update sukses. Membawa anda ke ownCloud sekarang.", "ownCloud password reset" => "reset password ownCloud", "Use the following link to reset your password: {link}" => "Gunakan tautan berikut untuk mereset password anda: {link}", "You will receive a link to reset your password via Email." => "Anda akan mendapatkan link untuk mereset password anda lewat Email.", +"Request failed!" => "Permintaan gagal!", "Username" => "Username", "Request reset" => "Meminta reset", "Your password was reset" => "Password anda telah direset", @@ -100,6 +118,7 @@ "Lost your password?" => "Lupa password anda?", "remember" => "selalu login", "Log in" => "Masuk", +"Alternative Logins" => "Login dengan cara lain", "prev" => "sebelum", "next" => "selanjutnya" ); diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po index 533533fac75..0b1891ce182 100644 --- a/l10n/de_DE/files.po +++ b/l10n/de_DE/files.po @@ -33,9 +33,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-05 00:18+0100\n" -"PO-Revision-Date: 2013-03-04 13:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" +"PO-Revision-Date: 2013-03-05 21:30+0000\n" +"Last-Translator: a.tangemann \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -304,7 +304,7 @@ msgstr "Upload abbrechen" #: templates/index.php:53 msgid "You don’t have write permissions here." -msgstr "Sie haben keine Schreib-Berechtigungen hier." +msgstr "Sie haben hier keine Schreib-Berechtigungen." #: templates/index.php:60 msgid "Nothing in here. Upload something!" diff --git a/l10n/de_DE/files_external.po b/l10n/de_DE/files_external.po index 49517df9cc4..aaa3056fbb6 100644 --- a/l10n/de_DE/files_external.po +++ b/l10n/de_DE/files_external.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-01 00:05+0100\n" -"PO-Revision-Date: 2013-02-28 10:30+0000\n" -"Last-Translator: stefanniedermann \n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" +"PO-Revision-Date: 2013-03-05 21:25+0000\n" +"Last-Translator: a.tangemann \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/l10n/de_DE/files_versions.po b/l10n/de_DE/files_versions.po index 38f4c1b5534..67694eac279 100644 --- a/l10n/de_DE/files_versions.po +++ b/l10n/de_DE/files_versions.po @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-01 00:05+0100\n" -"PO-Revision-Date: 2013-02-28 10:20+0000\n" -"Last-Translator: stefanniedermann \n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" +"PO-Revision-Date: 2013-03-05 21:26+0000\n" +"Last-Translator: a.tangemann \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -49,11 +49,11 @@ msgstr "Fehlgeschlagen" msgid "File %s could not be reverted to version %s" msgstr "Die Datei %s konnte nicht zur Version %s zurückgesetzt werden" -#: history.php:68 +#: history.php:69 msgid "No old versions available" msgstr "Keine älteren Versionen verfügbar" -#: history.php:73 +#: history.php:74 msgid "No path specified" msgstr "Kein Pfad angegeben" diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po index 9dc9d840f2a..f6f092bc77e 100644 --- a/l10n/de_DE/lib.po +++ b/l10n/de_DE/lib.po @@ -18,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-01 00:05+0100\n" -"PO-Revision-Date: 2013-02-28 10:30+0000\n" -"Last-Translator: stefanniedermann \n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" +"PO-Revision-Date: 2013-03-05 21:30+0000\n" +"Last-Translator: a.tangemann \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -185,7 +185,7 @@ msgstr "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s" #: setup.php:631 #, php-format msgid "MS SQL username and/or password not valid: %s" -msgstr "MS SQL Benutzername und/oder Passwort nicht valide: %s" +msgstr "MS SQL Benutzername und/oder Passwort ungültig: %s" #: setup.php:849 msgid "" diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po index 40f04d32f8a..dada42976f1 100644 --- a/l10n/de_DE/settings.po +++ b/l10n/de_DE/settings.po @@ -4,6 +4,7 @@ # # Translators: # , 2011-2012. +# Andreas Tangemann , 2013. # , 2012. # , 2012. # I Robot , 2012-2013. @@ -30,9 +31,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-01 00:05+0100\n" -"PO-Revision-Date: 2013-02-28 10:20+0000\n" -"Last-Translator: stefanniedermann \n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" +"PO-Revision-Date: 2013-03-05 21:30+0000\n" +"Last-Translator: a.tangemann \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -236,7 +237,7 @@ msgid "" "This ownCloud server can't set system locale to %s. This means that there " "might be problems with certain characters in file names. We strongly suggest" " to install the required packages on your system to support %s." -msgstr "Dieser ownCloud Server kann die Ländereinstellung nicht auf %s ändern. Dies bedeutet dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen die für %s benötigten Pakete auf ihrem System zu installieren." +msgstr "Dieser ownCloud Server kann die Ländereinstellung nicht auf %s ändern. Dies bedeutet, dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen, die für %s benötigten Pakete auf ihrem System zu installieren." #: templates/admin.php:75 msgid "Internet connection not working" diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po index 4d2ec8814ee..c3bbb56e717 100644 --- a/l10n/de_DE/user_ldap.po +++ b/l10n/de_DE/user_ldap.po @@ -20,9 +20,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-02 00:03+0100\n" -"PO-Revision-Date: 2013-03-01 23:04+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" +"PO-Revision-Date: 2013-03-05 21:40+0000\n" +"Last-Translator: a.tangemann \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -249,7 +249,7 @@ msgstr "Nicht empfohlen, nur zu Testzwecken." #: templates/settings.php:65 msgid "Cache Time-To-Live" -msgstr "" +msgstr "Speichere Time-To-Live zwischen" #: templates/settings.php:65 msgid "in seconds. A change empties the cache." @@ -313,11 +313,11 @@ msgstr "Besondere Eigenschaften" #: templates/settings.php:79 msgid "Quota Field" -msgstr "" +msgstr "Kontingent Feld" #: templates/settings.php:80 msgid "Quota Default" -msgstr "" +msgstr "Kontingent Standard" #: templates/settings.php:80 msgid "in bytes" @@ -325,11 +325,11 @@ msgstr "in Bytes" #: templates/settings.php:81 msgid "Email Field" -msgstr "" +msgstr "E-Mail Feld" #: templates/settings.php:82 msgid "User Home Folder Naming Rule" -msgstr "" +msgstr "Benennungsregel für das Heimatverzeichnis des Benutzers" #: templates/settings.php:82 msgid "" @@ -339,7 +339,7 @@ msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall tra #: templates/settings.php:86 msgid "Test Configuration" -msgstr "" +msgstr "Testkonfiguration" #: templates/settings.php:86 msgid "Help" diff --git a/l10n/id/core.po b/l10n/id/core.po index c88257c6bd0..181a4aff126 100644 --- a/l10n/id/core.po +++ b/l10n/id/core.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2013. # , 2012. # Muhammad Fauzan , 2012. # Muhammad Panji , 2012. @@ -11,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-22 00:06+0100\n" -"PO-Revision-Date: 2013-02-20 23:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" +"PO-Revision-Date: 2013-03-05 14:10+0000\n" +"Last-Translator: evanlimanto \n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,24 +22,24 @@ msgstr "" "Language: id\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ajax/share.php:85 +#: ajax/share.php:97 #, php-format msgid "User %s shared a file with you" msgstr "" -#: ajax/share.php:87 +#: ajax/share.php:99 #, php-format msgid "User %s shared a folder with you" msgstr "" -#: ajax/share.php:89 +#: ajax/share.php:101 #, php-format msgid "" "User %s shared the file \"%s\" with you. It is available for download here: " "%s" msgstr "" -#: ajax/share.php:91 +#: ajax/share.php:104 #, php-format msgid "" "User %s shared the folder \"%s\" with you. It is available for download " @@ -47,7 +48,7 @@ msgstr "" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." -msgstr "" +msgstr "Tipe kategori tidak diberikan." #: ajax/vcategories/add.php:30 msgid "No category to add?" @@ -56,24 +57,24 @@ msgstr "Tidak ada kategori yang akan ditambahkan?" #: ajax/vcategories/add.php:37 #, php-format msgid "This category already exists: %s" -msgstr "" +msgstr "Kategori ini sudah ada: %s" #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27 #: ajax/vcategories/favorites.php:24 #: ajax/vcategories/removeFromFavorites.php:26 msgid "Object type not provided." -msgstr "" +msgstr "Tipe obyek tidak diberikan." #: ajax/vcategories/addToFavorites.php:30 #: ajax/vcategories/removeFromFavorites.php:30 #, php-format msgid "%s ID not provided." -msgstr "" +msgstr "%s ID tidak diberikan." #: ajax/vcategories/addToFavorites.php:35 #, php-format msgid "Error adding %s to favorites." -msgstr "" +msgstr "Kesalahan menambah %s ke favorit" #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136 msgid "No categories selected for deletion." @@ -82,81 +83,81 @@ msgstr "Tidak ada kategori terpilih untuk penghapusan." #: ajax/vcategories/removeFromFavorites.php:35 #, php-format msgid "Error removing %s from favorites." -msgstr "" +msgstr "Kesalahan menghapus %s dari favorit" -#: js/config.php:32 +#: js/config.php:34 msgid "Sunday" msgstr "minggu" -#: js/config.php:32 +#: js/config.php:35 msgid "Monday" msgstr "senin" -#: js/config.php:32 +#: js/config.php:36 msgid "Tuesday" msgstr "selasa" -#: js/config.php:32 +#: js/config.php:37 msgid "Wednesday" msgstr "rabu" -#: js/config.php:32 +#: js/config.php:38 msgid "Thursday" msgstr "kamis" -#: js/config.php:32 +#: js/config.php:39 msgid "Friday" msgstr "jumat" -#: js/config.php:32 +#: js/config.php:40 msgid "Saturday" msgstr "sabtu" -#: js/config.php:33 +#: js/config.php:45 msgid "January" msgstr "Januari" -#: js/config.php:33 +#: js/config.php:46 msgid "February" msgstr "Februari" -#: js/config.php:33 +#: js/config.php:47 msgid "March" msgstr "Maret" -#: js/config.php:33 +#: js/config.php:48 msgid "April" msgstr "April" -#: js/config.php:33 +#: js/config.php:49 msgid "May" msgstr "Mei" -#: js/config.php:33 +#: js/config.php:50 msgid "June" msgstr "Juni" -#: js/config.php:33 +#: js/config.php:51 msgid "July" msgstr "Juli" -#: js/config.php:33 +#: js/config.php:52 msgid "August" msgstr "Agustus" -#: js/config.php:33 +#: js/config.php:53 msgid "September" msgstr "September" -#: js/config.php:33 +#: js/config.php:54 msgid "October" msgstr "Oktober" -#: js/config.php:33 +#: js/config.php:55 msgid "November" msgstr "Nopember" -#: js/config.php:33 +#: js/config.php:56 msgid "December" msgstr "Desember" @@ -164,55 +165,55 @@ msgstr "Desember" msgid "Settings" msgstr "Setelan" -#: js/js.js:767 +#: js/js.js:777 msgid "seconds ago" msgstr "beberapa detik yang lalu" -#: js/js.js:768 +#: js/js.js:778 msgid "1 minute ago" msgstr "1 menit lalu" -#: js/js.js:769 +#: js/js.js:779 msgid "{minutes} minutes ago" -msgstr "" +msgstr "{minutes} menit yang lalu" -#: js/js.js:770 +#: js/js.js:780 msgid "1 hour ago" -msgstr "" +msgstr "1 jam yang lalu" -#: js/js.js:771 +#: js/js.js:781 msgid "{hours} hours ago" -msgstr "" +msgstr "{hours} jam yang lalu" -#: js/js.js:772 +#: js/js.js:782 msgid "today" msgstr "hari ini" -#: js/js.js:773 +#: js/js.js:783 msgid "yesterday" msgstr "kemarin" -#: js/js.js:774 +#: js/js.js:784 msgid "{days} days ago" -msgstr "" +msgstr "{days} hari yang lalu" -#: js/js.js:775 +#: js/js.js:785 msgid "last month" msgstr "bulan kemarin" -#: js/js.js:776 +#: js/js.js:786 msgid "{months} months ago" -msgstr "" +msgstr "{months} bulan yang lalu" -#: js/js.js:777 +#: js/js.js:787 msgid "months ago" msgstr "beberapa bulan lalu" -#: js/js.js:778 +#: js/js.js:788 msgid "last year" msgstr "tahun kemarin" -#: js/js.js:779 +#: js/js.js:789 msgid "years ago" msgstr "beberapa tahun lalu" @@ -257,11 +258,11 @@ msgstr "" #: js/share.js:29 js/share.js:43 js/share.js:90 msgid "Shared" -msgstr "" +msgstr "Terbagi" #: js/share.js:93 msgid "Share" -msgstr "berbagi" +msgstr "Bagi" #: js/share.js:141 js/share.js:622 msgid "Error while sharing" @@ -295,17 +296,17 @@ msgstr "bagikan dengan tautan" msgid "Password protect" msgstr "lindungi dengan kata kunci" -#: js/share.js:185 templates/installation.php:44 templates/login.php:35 +#: js/share.js:185 templates/installation.php:47 templates/login.php:35 msgid "Password" msgstr "Password" #: js/share.js:189 msgid "Email link to person" -msgstr "" +msgstr "Email link ini ke orang" #: js/share.js:190 msgid "Send" -msgstr "" +msgstr "Kirim" #: js/share.js:194 msgid "Set expiration date" @@ -373,11 +374,11 @@ msgstr "gagal memasang tanggal kadaluarsa" #: js/share.js:609 msgid "Sending ..." -msgstr "" +msgstr "Sedang mengirim ..." #: js/share.js:620 msgid "Email sent" -msgstr "" +msgstr "Email terkirim" #: js/update.js:14 msgid "" @@ -388,7 +389,7 @@ msgstr "" #: js/update.js:18 msgid "The update was successful. Redirecting you to ownCloud now." -msgstr "" +msgstr "Update sukses. Membawa anda ke ownCloud sekarang." #: lostpassword/controller.php:48 msgid "ownCloud password reset" @@ -408,9 +409,9 @@ msgstr "" #: lostpassword/templates/lostpassword.php:8 msgid "Request failed!" -msgstr "" +msgstr "Permintaan gagal!" -#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:41 #: templates/login.php:28 msgid "Username" msgstr "Username" @@ -471,85 +472,86 @@ msgstr "Edit kategori" msgid "Add" msgstr "Tambahkan" -#: templates/installation.php:23 templates/installation.php:30 +#: templates/installation.php:24 templates/installation.php:31 msgid "Security Warning" msgstr "peringatan keamanan" -#: templates/installation.php:24 +#: templates/installation.php:25 msgid "" "No secure random number generator is available, please enable the PHP " "OpenSSL extension." msgstr "" -#: templates/installation.php:25 +#: templates/installation.php:26 msgid "" "Without a secure random number generator an attacker may be able to predict " "password reset tokens and take over your account." msgstr "tanpa generator angka acak, penyerang mungkin dapat menebak token reset kata kunci dan mengambil alih akun anda." -#: templates/installation.php:31 +#: templates/installation.php:32 msgid "" "Your data directory and files are probably accessible from the internet " "because the .htaccess file does not work." msgstr "" -#: templates/installation.php:32 +#: templates/installation.php:33 msgid "" "For information how to properly configure your server, please see the documentation." msgstr "" -#: templates/installation.php:36 +#: templates/installation.php:37 msgid "Create an admin account" msgstr "Buat sebuah akun admin" -#: templates/installation.php:52 +#: templates/installation.php:55 msgid "Advanced" msgstr "Tingkat Lanjut" -#: templates/installation.php:54 +#: templates/installation.php:57 msgid "Data folder" msgstr "Folder data" -#: templates/installation.php:61 +#: templates/installation.php:66 msgid "Configure the database" msgstr "Konfigurasi database" -#: templates/installation.php:66 templates/installation.php:77 -#: templates/installation.php:87 templates/installation.php:97 +#: templates/installation.php:71 templates/installation.php:83 +#: templates/installation.php:94 templates/installation.php:105 +#: templates/installation.php:117 msgid "will be used" msgstr "akan digunakan" -#: templates/installation.php:109 +#: templates/installation.php:129 msgid "Database user" msgstr "Pengguna database" -#: templates/installation.php:113 +#: templates/installation.php:134 msgid "Database password" msgstr "Password database" -#: templates/installation.php:117 +#: templates/installation.php:139 msgid "Database name" msgstr "Nama database" -#: templates/installation.php:125 +#: templates/installation.php:149 msgid "Database tablespace" msgstr "tablespace basis data" -#: templates/installation.php:131 +#: templates/installation.php:156 msgid "Database host" msgstr "Host database" -#: templates/installation.php:136 +#: templates/installation.php:162 msgid "Finish setup" msgstr "Selesaikan instalasi" -#: templates/layout.guest.php:33 +#: templates/layout.guest.php:40 msgid "web services under your control" msgstr "web service dibawah kontrol anda" -#: templates/layout.user.php:48 +#: templates/layout.user.php:58 msgid "Log out" msgstr "Keluar" @@ -581,7 +583,7 @@ msgstr "Masuk" #: templates/login.php:49 msgid "Alternative Logins" -msgstr "" +msgstr "Login dengan cara lain" #: templates/part.pagenavi.php:3 msgid "prev" diff --git a/l10n/id/lib.po b/l10n/id/lib.po index 2a62c2e77fd..6ef9f41ad69 100644 --- a/l10n/id/lib.po +++ b/l10n/id/lib.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-27 14:35+0100\n" -"PO-Revision-Date: 2013-02-27 13:35+0000\n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" +"PO-Revision-Date: 2013-03-05 14:00+0000\n" "Last-Translator: I Robot \n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/lv/files.po b/l10n/lv/files.po index fb3f0b03350..afbd5a98463 100644 --- a/l10n/lv/files.po +++ b/l10n/lv/files.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" -"PO-Revision-Date: 2013-03-03 23:06+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" +"PO-Revision-Date: 2013-03-05 16:30+0000\n" +"Last-Translator: Rūdolfs Mazurs \n" "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -281,7 +281,7 @@ msgstr "Atcelt augšupielādi" #: templates/index.php:53 msgid "You don’t have write permissions here." -msgstr "" +msgstr "Jums nav tiesību šeit rakstīt." #: templates/index.php:60 msgid "Nothing in here. Upload something!" diff --git a/l10n/nl/files.po b/l10n/nl/files.po index a20d754aacb..5443fe2eb4a 100644 --- a/l10n/nl/files.po +++ b/l10n/nl/files.po @@ -19,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" -"PO-Revision-Date: 2013-03-03 23:06+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" +"PO-Revision-Date: 2013-03-05 20:10+0000\n" +"Last-Translator: André Koot \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -290,7 +290,7 @@ msgstr "Upload afbreken" #: templates/index.php:53 msgid "You don’t have write permissions here." -msgstr "" +msgstr "U hebt hier geen schrijfpermissies." #: templates/index.php:60 msgid "Nothing in here. Upload something!" diff --git a/l10n/nl/files_external.po b/l10n/nl/files_external.po index af3a2234e18..3c135ef3441 100644 --- a/l10n/nl/files_external.po +++ b/l10n/nl/files_external.po @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# André Koot , 2012. +# André Koot , 2012-2013. # Richard Bos , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-01 00:05+0100\n" -"PO-Revision-Date: 2013-02-27 23:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" +"PO-Revision-Date: 2013-03-05 20:10+0000\n" +"Last-Translator: André Koot \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -62,7 +62,7 @@ msgstr "Mapnaam" #: templates/settings.php:10 msgid "External storage" -msgstr "" +msgstr "Externe opslag" #: templates/settings.php:11 msgid "Configuration" @@ -78,7 +78,7 @@ msgstr "Van toepassing" #: templates/settings.php:33 msgid "Add storage" -msgstr "" +msgstr "Toevoegen opslag" #: templates/settings.php:90 msgid "None set" diff --git a/l10n/nl/files_versions.po b/l10n/nl/files_versions.po index 0f1655775a1..87ba278235f 100644 --- a/l10n/nl/files_versions.po +++ b/l10n/nl/files_versions.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-28 00:04+0100\n" -"PO-Revision-Date: 2013-02-27 23:04+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" +"PO-Revision-Date: 2013-03-05 20:10+0000\n" +"Last-Translator: André Koot \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -42,17 +42,17 @@ msgstr "mislukking" msgid "File %s could not be reverted to version %s" msgstr "Bestand %s kon niet worden teruggedraaid naar versie %s" -#: history.php:68 +#: history.php:69 msgid "No old versions available" msgstr "Geen oudere versies beschikbaar" -#: history.php:73 +#: history.php:74 msgid "No path specified" msgstr "Geen pad opgegeven" #: js/versions.js:6 msgid "Versions" -msgstr "" +msgstr "Versies" #: templates/history.php:20 msgid "Revert a file to a previous version by clicking on its revert button" diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po index 1dc126dfa79..f226fcaff3a 100644 --- a/l10n/nl/lib.po +++ b/l10n/nl/lib.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-27 14:35+0100\n" -"PO-Revision-Date: 2013-02-27 13:35+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" +"PO-Revision-Date: 2013-03-05 20:10+0000\n" +"Last-Translator: André Koot \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -178,7 +178,7 @@ msgstr "Onjuiste commando was: \"%s\", naam: %s, wachtwoord: %s" #: setup.php:631 #, php-format msgid "MS SQL username and/or password not valid: %s" -msgstr "" +msgstr "MS SQL gebruikersnaam en/of wachtwoord niet geldig: %s" #: setup.php:849 msgid "" diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po index 76fce0bbb3f..bc89175daac 100644 --- a/l10n/nl/user_ldap.po +++ b/l10n/nl/user_ldap.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-02 00:03+0100\n" -"PO-Revision-Date: 2013-03-01 23:04+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" +"PO-Revision-Date: 2013-03-05 20:10+0000\n" +"Last-Translator: André Koot \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -239,7 +239,7 @@ msgstr "Niet aangeraden, gebruik alleen voor test doeleinden." #: templates/settings.php:65 msgid "Cache Time-To-Live" -msgstr "" +msgstr "Cache time-to-live" #: templates/settings.php:65 msgid "in seconds. A change empties the cache." @@ -303,11 +303,11 @@ msgstr "Speciale attributen" #: templates/settings.php:79 msgid "Quota Field" -msgstr "" +msgstr "Quota veld" #: templates/settings.php:80 msgid "Quota Default" -msgstr "" +msgstr "Quota standaard" #: templates/settings.php:80 msgid "in bytes" @@ -315,11 +315,11 @@ msgstr "in bytes" #: templates/settings.php:81 msgid "Email Field" -msgstr "" +msgstr "E-mailveld" #: templates/settings.php:82 msgid "User Home Folder Naming Rule" -msgstr "" +msgstr "Gebruikers Home map naamgevingsregel" #: templates/settings.php:82 msgid "" @@ -329,7 +329,7 @@ msgstr "Laat leeg voor de gebruikersnaam (standaard). Of, specificeer een LDAP/A #: templates/settings.php:86 msgid "Test Configuration" -msgstr "" +msgstr "Test configuratie" #: templates/settings.php:86 msgid "Help" diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po index c940768d139..55c2ec26ca9 100644 --- a/l10n/pt_PT/files.po +++ b/l10n/pt_PT/files.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" -"PO-Revision-Date: 2013-03-03 23:06+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" +"PO-Revision-Date: 2013-03-05 11:39+0000\n" +"Last-Translator: Helder Meneses \n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -286,7 +286,7 @@ msgstr "Cancelar envio" #: templates/index.php:53 msgid "You don’t have write permissions here." -msgstr "" +msgstr "Não tem permissões de escrita aqui." #: templates/index.php:60 msgid "Nothing in here. Upload something!" diff --git a/l10n/pt_PT/files_external.po b/l10n/pt_PT/files_external.po index 78a93385637..6a1dd0910b8 100644 --- a/l10n/pt_PT/files_external.po +++ b/l10n/pt_PT/files_external.po @@ -5,13 +5,14 @@ # Translators: # , 2012. # Duarte Velez Grilo , 2012. +# Helder Meneses , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-01 00:05+0100\n" -"PO-Revision-Date: 2013-02-27 23:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" +"PO-Revision-Date: 2013-03-05 11:40+0000\n" +"Last-Translator: Helder Meneses \n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -43,7 +44,7 @@ msgstr "Erro ao configurar o armazenamento do Google Drive" msgid "" "Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares " "is not possible. Please ask your system administrator to install it." -msgstr "Aviso: O cliente \"smbclient\" não está instalado. Não é possível montar as partilhas CIFS/SMB . Peça ao seu administrador para instalar." +msgstr "Atenção: O cliente \"smbclient\" não está instalado. Não é possível montar as partilhas CIFS/SMB . Peça ao seu administrador para instalar." #: lib/config.php:424 msgid "" @@ -62,7 +63,7 @@ msgstr "Nome da pasta" #: templates/settings.php:10 msgid "External storage" -msgstr "" +msgstr "Armazenamento Externo" #: templates/settings.php:11 msgid "Configuration" @@ -78,11 +79,11 @@ msgstr "Aplicável" #: templates/settings.php:33 msgid "Add storage" -msgstr "" +msgstr "Adicionar armazenamento" #: templates/settings.php:90 msgid "None set" -msgstr "Nenhum configurado" +msgstr "Não definido" #: templates/settings.php:91 msgid "All Users" @@ -99,7 +100,7 @@ msgstr "Utilizadores" #: templates/settings.php:113 templates/settings.php:114 #: templates/settings.php:149 templates/settings.php:150 msgid "Delete" -msgstr "Apagar" +msgstr "Eliminar" #: templates/settings.php:129 msgid "Enable User External Storage" diff --git a/l10n/pt_PT/files_trashbin.po b/l10n/pt_PT/files_trashbin.po index a07384333bf..200d12916bc 100644 --- a/l10n/pt_PT/files_trashbin.po +++ b/l10n/pt_PT/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-22 00:06+0100\n" -"PO-Revision-Date: 2013-02-20 23:32+0000\n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" +"PO-Revision-Date: 2013-03-05 11:40+0000\n" "Last-Translator: I Robot \n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" @@ -40,27 +40,27 @@ msgstr "Eliminar permanentemente o(s) ficheiro(s)" msgid "Delete permanently" msgstr "Eliminar permanentemente" -#: js/trash.js:151 templates/index.php:17 +#: js/trash.js:174 templates/index.php:17 msgid "Name" msgstr "Nome" -#: js/trash.js:152 templates/index.php:27 +#: js/trash.js:175 templates/index.php:27 msgid "Deleted" msgstr "Apagado" -#: js/trash.js:161 +#: js/trash.js:184 msgid "1 folder" msgstr "1 pasta" -#: js/trash.js:163 +#: js/trash.js:186 msgid "{count} folders" msgstr "{count} pastas" -#: js/trash.js:171 +#: js/trash.js:194 msgid "1 file" msgstr "1 ficheiro" -#: js/trash.js:173 +#: js/trash.js:196 msgid "{count} files" msgstr "{count} ficheiros" diff --git a/l10n/pt_PT/files_versions.po b/l10n/pt_PT/files_versions.po index 48ad1466458..54018e45527 100644 --- a/l10n/pt_PT/files_versions.po +++ b/l10n/pt_PT/files_versions.po @@ -5,13 +5,14 @@ # Translators: # Daniel Pinto , 2013. # Duarte Velez Grilo , 2012. +# Helder Meneses , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-28 00:04+0100\n" -"PO-Revision-Date: 2013-02-27 23:04+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" +"PO-Revision-Date: 2013-03-05 11:40+0000\n" +"Last-Translator: Helder Meneses \n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -42,17 +43,17 @@ msgstr "Falha" msgid "File %s could not be reverted to version %s" msgstr "Não foi possível reverter o ficheiro %s para a versão %s" -#: history.php:68 +#: history.php:69 msgid "No old versions available" msgstr "Não existem versões mais antigas" -#: history.php:73 +#: history.php:74 msgid "No path specified" msgstr "Nenhum caminho especificado" #: js/versions.js:6 msgid "Versions" -msgstr "" +msgstr "Versões" #: templates/history.php:20 msgid "Revert a file to a previous version by clicking on its revert button" diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po index 38ec95480be..e251c49b928 100644 --- a/l10n/pt_PT/lib.po +++ b/l10n/pt_PT/lib.po @@ -6,13 +6,14 @@ # , 2012-2013. # Daniel Pinto , 2013. # Duarte Velez Grilo , 2012. +# Helder Meneses , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-27 14:35+0100\n" -"PO-Revision-Date: 2013-02-27 13:35+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" +"PO-Revision-Date: 2013-03-05 11:40+0000\n" +"Last-Translator: Helder Meneses \n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -177,7 +178,7 @@ msgstr "O comando gerador de erro foi: \"%s\", nome: %s, password: %s" #: setup.php:631 #, php-format msgid "MS SQL username and/or password not valid: %s" -msgstr "" +msgstr "Nome de utilizador/password do MySQL é inválido: %s" #: setup.php:849 msgid "" diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po index ed47e12c9c5..84f9f095029 100644 --- a/l10n/pt_PT/settings.po +++ b/l10n/pt_PT/settings.po @@ -8,16 +8,16 @@ # , 2013. # Duarte Velez Grilo , 2012-2013. # , 2012. -# Helder Meneses , 2012. +# Helder Meneses , 2012-2013. # Miguel Sousa , 2013. # , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-27 14:35+0100\n" -"PO-Revision-Date: 2013-02-27 13:35+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" +"PO-Revision-Date: 2013-03-05 11:39+0000\n" +"Last-Translator: Helder Meneses \n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -221,7 +221,7 @@ msgid "" "This ownCloud server can't set system locale to %s. This means that there " "might be problems with certain characters in file names. We strongly suggest" " to install the required packages on your system to support %s." -msgstr "" +msgstr "Este servidor de ownCloud não consegue definir a codificação de caracteres para %s. Isto significa que pode haver problemas com alguns caracteres nos nomes dos ficheiros. É fortemente recomendado que instale o pacote recomendado para ser possível ver caracteres codificados em %s." #: templates/admin.php:75 msgid "Internet connection not working" diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po index d42fa5bc3da..594e6693abe 100644 --- a/l10n/pt_PT/user_ldap.po +++ b/l10n/pt_PT/user_ldap.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-02 00:03+0100\n" -"PO-Revision-Date: 2013-03-01 23:04+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" +"PO-Revision-Date: 2013-03-05 11:40+0000\n" +"Last-Translator: Helder Meneses \n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -241,7 +241,7 @@ msgstr "Não recomendado, utilizado apenas para testes!" #: templates/settings.php:65 msgid "Cache Time-To-Live" -msgstr "" +msgstr "Cache do tempo de vida dos objetos no servidor" #: templates/settings.php:65 msgid "in seconds. A change empties the cache." @@ -305,11 +305,11 @@ msgstr "Atributos especiais" #: templates/settings.php:79 msgid "Quota Field" -msgstr "" +msgstr "Quota" #: templates/settings.php:80 msgid "Quota Default" -msgstr "" +msgstr "Quota padrão" #: templates/settings.php:80 msgid "in bytes" @@ -317,11 +317,11 @@ msgstr "em bytes" #: templates/settings.php:81 msgid "Email Field" -msgstr "" +msgstr "Campo de email" #: templates/settings.php:82 msgid "User Home Folder Naming Rule" -msgstr "" +msgstr "Regra da pasta inicial do utilizador" #: templates/settings.php:82 msgid "" @@ -331,7 +331,7 @@ msgstr "Deixe vazio para nome de utilizador (padrão). De outro modo, especifiqu #: templates/settings.php:86 msgid "Test Configuration" -msgstr "" +msgstr "Testar a configuração" #: templates/settings.php:86 msgid "Help" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index a7051235b03..6e2255ed984 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index af772e8ce1a..be04612b1e7 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 4e1bf94f6dd..ca228bd25c3 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 70e3969859d..507bce8c6e8 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index 579bcded725..0d1b26267ed 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index 3ad1f56c805..7138b2643b8 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index 59437ff1c86..1bee600cccb 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index d84be95ab90..2bed756f26a 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index c8f5ea514a4..1f7dbacc81b 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index 1dbd4468b92..65f3cb621d6 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index 11dc1e3768d..535a1987a50 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/uk/files.po b/l10n/uk/files.po index 9190522a245..58aae0590c5 100644 --- a/l10n/uk/files.po +++ b/l10n/uk/files.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" -"PO-Revision-Date: 2013-03-03 23:06+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" +"PO-Revision-Date: 2013-03-05 12:31+0000\n" +"Last-Translator: volodya327 \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -282,7 +282,7 @@ msgstr "Перервати завантаження" #: templates/index.php:53 msgid "You don’t have write permissions here." -msgstr "" +msgstr "У вас тут немає прав на запис." #: templates/index.php:60 msgid "Nothing in here. Upload something!" diff --git a/l10n/uk/files_external.po b/l10n/uk/files_external.po index fa01cae3e0f..1936a470772 100644 --- a/l10n/uk/files_external.po +++ b/l10n/uk/files_external.po @@ -5,13 +5,14 @@ # Translators: # , 2012. # , 2012. +# пан Володимир , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-01 00:05+0100\n" -"PO-Revision-Date: 2013-02-27 23:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" +"PO-Revision-Date: 2013-03-05 12:31+0000\n" +"Last-Translator: volodya327 \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -62,7 +63,7 @@ msgstr "Ім'я теки" #: templates/settings.php:10 msgid "External storage" -msgstr "" +msgstr "Зовнішнє сховище" #: templates/settings.php:11 msgid "Configuration" @@ -78,7 +79,7 @@ msgstr "Придатний" #: templates/settings.php:33 msgid "Add storage" -msgstr "" +msgstr "Додати сховище" #: templates/settings.php:90 msgid "None set" diff --git a/l10n/uk/files_versions.po b/l10n/uk/files_versions.po index df8def6b684..57d0fd1f10c 100644 --- a/l10n/uk/files_versions.po +++ b/l10n/uk/files_versions.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-28 00:04+0100\n" -"PO-Revision-Date: 2013-02-27 23:04+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" +"PO-Revision-Date: 2013-03-05 12:40+0000\n" +"Last-Translator: volodya327 \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -42,17 +42,17 @@ msgstr "неуспішно" msgid "File %s could not be reverted to version %s" msgstr "Файл %s не може бути відновлений до версії %s" -#: history.php:68 +#: history.php:69 msgid "No old versions available" msgstr "Старі версії недоступні" -#: history.php:73 +#: history.php:74 msgid "No path specified" msgstr "Шлях не вказаний" #: js/versions.js:6 msgid "Versions" -msgstr "" +msgstr "Версії" #: templates/history.php:20 msgid "Revert a file to a previous version by clicking on its revert button" diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po index 13539fc50aa..3c4943397c8 100644 --- a/l10n/uk/lib.po +++ b/l10n/uk/lib.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-27 14:35+0100\n" -"PO-Revision-Date: 2013-02-27 13:35+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" +"PO-Revision-Date: 2013-03-05 12:21+0000\n" +"Last-Translator: volodya327 \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -179,7 +179,7 @@ msgstr "Команда, що викликала проблему: \"%s\", ім' #: setup.php:631 #, php-format msgid "MS SQL username and/or password not valid: %s" -msgstr "" +msgstr "MS SQL ім'я користувача та/або пароль не дійсні: %s" #: setup.php:849 msgid "" diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po index b5d7a8ee06e..dd232bdd1ec 100644 --- a/l10n/uk/settings.po +++ b/l10n/uk/settings.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-27 14:35+0100\n" -"PO-Revision-Date: 2013-02-27 13:35+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" +"PO-Revision-Date: 2013-03-05 12:20+0000\n" +"Last-Translator: volodya327 \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -217,7 +217,7 @@ msgid "" "This ownCloud server can't set system locale to %s. This means that there " "might be problems with certain characters in file names. We strongly suggest" " to install the required packages on your system to support %s." -msgstr "" +msgstr "Цей сервер ownCloud не може встановити мову системи %s. Це означає, що можуть бути проблеми з деякими символами в іменах файлів. Ми наполегливо рекомендуємо встановити необхідні пакети у вашій системі для підтримки %s." #: templates/admin.php:75 msgid "Internet connection not working" diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po index 676a44847ab..c520e539536 100644 --- a/l10n/uk/user_ldap.po +++ b/l10n/uk/user_ldap.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-02 00:03+0100\n" -"PO-Revision-Date: 2013-03-01 23:04+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-06 00:07+0100\n" +"PO-Revision-Date: 2013-03-05 12:31+0000\n" +"Last-Translator: volodya327 \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -239,7 +239,7 @@ msgstr "Не рекомендується, використовуйте лише #: templates/settings.php:65 msgid "Cache Time-To-Live" -msgstr "" +msgstr "Час актуальності Кеша" #: templates/settings.php:65 msgid "in seconds. A change empties the cache." @@ -303,11 +303,11 @@ msgstr "Спеціальні Атрибути" #: templates/settings.php:79 msgid "Quota Field" -msgstr "" +msgstr "Поле Квоти" #: templates/settings.php:80 msgid "Quota Default" -msgstr "" +msgstr "Квота за замовчанням" #: templates/settings.php:80 msgid "in bytes" @@ -315,11 +315,11 @@ msgstr "в байтах" #: templates/settings.php:81 msgid "Email Field" -msgstr "" +msgstr "Поле Ел. пошти" #: templates/settings.php:82 msgid "User Home Folder Naming Rule" -msgstr "" +msgstr "Правило іменування домашньої теки користувача" #: templates/settings.php:82 msgid "" @@ -329,7 +329,7 @@ msgstr "Залиште порожнім для імені користувача #: templates/settings.php:86 msgid "Test Configuration" -msgstr "" +msgstr "Тестове налаштування" #: templates/settings.php:86 msgid "Help" diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php index bbff4948096..9978cdf8b31 100644 --- a/lib/l10n/de_DE.php +++ b/lib/l10n/de_DE.php @@ -34,7 +34,7 @@ "MySQL user '%s'@'%%' already exists" => "MySQL Benutzer '%s'@'%%' existiert bereits", "Drop this user from MySQL." => "Lösche diesen Benutzer aus MySQL.", "Offending command was: \"%s\", name: %s, password: %s" => "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s", -"MS SQL username and/or password not valid: %s" => "MS SQL Benutzername und/oder Passwort nicht valide: %s", +"MS SQL username and/or password not valid: %s" => "MS SQL Benutzername und/oder Passwort ungültig: %s", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.", "Please double check the installation guides." => "Bitte prüfen Sie die Instalationsanleitungen.", "seconds ago" => "Gerade eben", diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php index 4a357889fdc..e26a663e9cc 100644 --- a/lib/l10n/nl.php +++ b/lib/l10n/nl.php @@ -34,6 +34,7 @@ "MySQL user '%s'@'%%' already exists" => "MySQL gebruiker '%s'@'%%' bestaat al", "Drop this user from MySQL." => "Verwijder deze gebruiker uit MySQL.", "Offending command was: \"%s\", name: %s, password: %s" => "Onjuiste commando was: \"%s\", naam: %s, wachtwoord: %s", +"MS SQL username and/or password not valid: %s" => "MS SQL gebruikersnaam en/of wachtwoord niet geldig: %s", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt.", "Please double check the installation guides." => "Conntroleer de installatie handleiding goed.", "seconds ago" => "seconden geleden", diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php index 9bdcfcc9ced..2c813f5b07c 100644 --- a/lib/l10n/pt_PT.php +++ b/lib/l10n/pt_PT.php @@ -34,6 +34,7 @@ "MySQL user '%s'@'%%' already exists" => "O utilizador '%s'@'%%' do MySQL já existe", "Drop this user from MySQL." => "Eliminar este utilizador do MySQL", "Offending command was: \"%s\", name: %s, password: %s" => "O comando gerador de erro foi: \"%s\", nome: %s, password: %s", +"MS SQL username and/or password not valid: %s" => "Nome de utilizador/password do MySQL é inválido: %s", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.", "Please double check the installation guides." => "Por favor verifique installation guides.", "seconds ago" => "há alguns segundos", diff --git a/lib/l10n/uk.php b/lib/l10n/uk.php index 415c0a80c27..68f7151d15e 100644 --- a/lib/l10n/uk.php +++ b/lib/l10n/uk.php @@ -34,6 +34,7 @@ "MySQL user '%s'@'%%' already exists" => "Користувач MySQL '%s'@'%%' вже існує", "Drop this user from MySQL." => "Видалити цього користувача з MySQL.", "Offending command was: \"%s\", name: %s, password: %s" => "Команда, що викликала проблему: \"%s\", ім'я: %s, пароль: %s", +"MS SQL username and/or password not valid: %s" => "MS SQL ім'я користувача та/або пароль не дійсні: %s", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш Web-сервер ще не налаштований належним чином для того, щоб дозволити синхронізацію файлів, через те що інтерфейс WebDAV, здається, зламаний.", "Please double check the installation guides." => "Будь ласка, перевірте інструкції по встановленню.", "seconds ago" => "секунди тому", diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php index d8d6ba58b4a..3192a4a7868 100644 --- a/settings/l10n/de_DE.php +++ b/settings/l10n/de_DE.php @@ -43,7 +43,7 @@ "Module 'fileinfo' missing" => "Das Modul 'fileinfo' fehlt", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen.", "Locale not working" => "Lokalisierung funktioniert nicht", -"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Dieser ownCloud Server kann die Ländereinstellung nicht auf %s ändern. Dies bedeutet dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen die für %s benötigten Pakete auf ihrem System zu installieren.", +"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Dieser ownCloud Server kann die Ländereinstellung nicht auf %s ändern. Dies bedeutet, dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen, die für %s benötigten Pakete auf ihrem System zu installieren.", "Internet connection not working" => "Keine Netzwerkverbindung", "This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Dieser ownCloud Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen von ownCloud nutzen wollen.", "Cron" => "Cron", diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php index e685da4498f..71ad6347e8e 100644 --- a/settings/l10n/pt_PT.php +++ b/settings/l10n/pt_PT.php @@ -43,6 +43,7 @@ "Module 'fileinfo' missing" => "Falta o módulo 'fileinfo'", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "O Módulo PHP 'fileinfo' não se encontra instalado/activado. É fortemente recomendado que active este módulo para obter os melhores resultado com a detecção dos tipos de mime.", "Locale not working" => "Internacionalização não está a funcionar", +"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Este servidor de ownCloud não consegue definir a codificação de caracteres para %s. Isto significa que pode haver problemas com alguns caracteres nos nomes dos ficheiros. É fortemente recomendado que instale o pacote recomendado para ser possível ver caracteres codificados em %s.", "Internet connection not working" => "A ligação à internet não está a funcionar", "This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Este servidor ownCloud não tem uma ligação de internet funcional. Isto significa que algumas funcionalidades como o acesso a locais externos (dropbox, gdrive, etc), notificações sobre actualizções, ou a instalação de aplicações não irá funcionar. Sugerimos que active uma ligação à internet se pretende obter todas as funcionalidades do ownCloud.", "Cron" => "Cron", diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php index e37a919b314..2e182b66292 100644 --- a/settings/l10n/uk.php +++ b/settings/l10n/uk.php @@ -43,6 +43,7 @@ "Module 'fileinfo' missing" => "Модуль 'fileinfo' відсутній", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP модуль 'fileinfo' відсутній. Ми наполегливо рекомендуємо увімкнути цей модуль, щоб отримати кращі результати при виявленні MIME-типів.", "Locale not working" => "Локалізація не працює", +"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Цей сервер ownCloud не може встановити мову системи %s. Це означає, що можуть бути проблеми з деякими символами в іменах файлів. Ми наполегливо рекомендуємо встановити необхідні пакети у вашій системі для підтримки %s.", "Internet connection not working" => "Інтернет-з'єднання не працює", "This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Цей сервер ownCloud не має під'єднання до Інтернету. Це означає, що деякі функції, такі як монтування зовнішніх накопичувачів, повідомлення про оновлення або встановлення допоміжних програм не працюють. Доступ до файлів ​​віддалено та відправка повідомлень електронною поштою також може не працювати. Ми пропонуємо увімкнути під'єднання до Інтернету для даного сервера, якщо ви хочете мати всі можливості ownCloud.", "Cron" => "Cron", -- cgit v1.2.3 From 5300d6ad552585a316107cb483bd68533116d392 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Tue, 5 Mar 2013 21:13:07 -0500 Subject: Clear the CSS and JS cache earlier to make sure update goes smoothly --- core/ajax/update.php | 4 ---- lib/base.php | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/core/ajax/update.php b/core/ajax/update.php index b112cf6266b..8b20150d432 100644 --- a/core/ajax/update.php +++ b/core/ajax/update.php @@ -17,10 +17,6 @@ if (OC::checkUpgrade(false)) { } catch (Exception $exception) { $watcher->failure($exception->getMessage()); } - $minimizerCSS = new OC_Minimizer_CSS(); - $minimizerCSS->clearCache(); - $minimizerJS = new OC_Minimizer_JS(); - $minimizerJS->clearCache(); OC_Config::setValue('version', implode('.', OC_Util::getVersion())); OC_App::checkAppsRequirements(); // load all apps to also upgrade enabled apps diff --git a/lib/base.php b/lib/base.php index bffae36261e..59b861ffce1 100644 --- a/lib/base.php +++ b/lib/base.php @@ -277,6 +277,10 @@ class OC { OC_Log::write('core', 'starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, OC_Log::DEBUG); + $minimizerCSS = new OC_Minimizer_CSS(); + $minimizerCSS->clearCache(); + $minimizerJS = new OC_Minimizer_JS(); + $minimizerJS->clearCache(); OC_Util::addscript('update'); $tmpl = new OC_Template('', 'update', 'guest'); $tmpl->assign('version', OC_Util::getVersionString()); -- cgit v1.2.3 From cfb10dc58c37a2bd9f4fda57b765de07a13b32b8 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Wed, 6 Mar 2013 13:05:22 +0100 Subject: Add warning about sanitization --- lib/template.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/template.php b/lib/template.php index 398f9de0655..434c1e9e990 100644 --- a/lib/template.php +++ b/lib/template.php @@ -519,12 +519,13 @@ class OC_Template{ /** * @brief Print a fatal error page and terminates the script * @param string $error The error message to show - * @param string $hint An option hint message + * @param string $hint An optional hint message + * Warning: All data passed to $hint needs to get sanitized using OC_Util::sanitizeHTML */ public static function printErrorPage( $error_msg, $hint = '' ) { $content = new OC_Template( '', 'error', 'error' ); $errors = array(array('error' => $error_msg, 'hint' => $hint)); - $content->assign( 'errors', $errors, false ); + $content->assign( 'errors', $errors ); $content->printPage(); die(); } -- cgit v1.2.3 From 6acbadf41833c8d5a78aabb06c6c7e0f4f4c019b Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Wed, 6 Mar 2013 15:21:12 +0100 Subject: return 403 when mkdir failed on webDAV, fixes #2127 --- lib/connector/sabre/directory.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php index 953692f80a9..6ccb54b79ab 100644 --- a/lib/connector/sabre/directory.php +++ b/lib/connector/sabre/directory.php @@ -107,7 +107,9 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa public function createDirectory($name) { $newPath = $this->path . '/' . $name; - \OC\Files\Filesystem::mkdir($newPath); + if(!\OC\Files\Filesystem::mkdir($newPath)) { + throw new Sabre_DAV_Exception_Forbidden('Could not create directory '.$newPath); + } } -- cgit v1.2.3 From 4a4f705adc32831c4e90422598dbe0e89c6acd80 Mon Sep 17 00:00:00 2001 From: Björn Schießle Date: Thu, 7 Mar 2013 14:15:02 +0100 Subject: json encode list of files --- apps/files/ajax/download.php | 9 ++++++++- apps/files/js/files.js | 5 +++-- lib/files.php | 5 +++-- 3 files changed, 14 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/apps/files/ajax/download.php b/apps/files/ajax/download.php index b9a4ddaf5e7..163232ef001 100644 --- a/apps/files/ajax/download.php +++ b/apps/files/ajax/download.php @@ -33,4 +33,11 @@ OCP\User::checkLoggedIn(); $files = $_GET["files"]; $dir = $_GET["dir"]; -OC_Files::get($dir, $files, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false); +$files_list = json_decode($files); +if ($files_list === NULL ) { + $files_list = array($files); +} + +foreach ($files_list as $f) error_log("file: $f"); + +OC_Files::get($dir, $files_list, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false); diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 464f7703685..a4ef41c2803 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -220,14 +220,15 @@ $(document).ready(function() { }); $('.download').click('click',function(event) { - var files=getSelectedFiles('name').join(';'); + var files=getSelectedFiles('name'); + var fileslist = JSON.stringify(files); var dir=$('#dir').val()||'/'; OC.Notification.show(t('files','Your download is being prepared. This might take some time if the files are big.')); // use special download URL if provided, e.g. for public shared files if ( (downloadURL = document.getElementById("downloadURL")) ) { window.location=downloadURL.value+"&download&files="+files; } else { - window.location=OC.filePath('files', 'ajax', 'download.php') + '?'+ $.param({ dir: dir, files: files }); + window.location=OC.filePath('files', 'ajax', 'download.php') + '?'+ $.param({ dir: dir, files: fileslist }); } return false; }); diff --git a/lib/files.php b/lib/files.php index b594b78c4b7..ae3144de2c5 100644 --- a/lib/files.php +++ b/lib/files.php @@ -49,8 +49,9 @@ class OC_Files { isset($_SERVER['MOD_X_ACCEL_REDIRECT_ENABLED'])) { $xsendfile = true; } - if(strpos($files, ';')) { - $files=explode(';', $files); + + if (count($files) == 1) { + $files = $files[0]; } if (is_array($files)) { -- cgit v1.2.3 From ce9942331eb09b5e1ae6f38791776625f6663419 Mon Sep 17 00:00:00 2001 From: Björn Schießle Date: Thu, 7 Mar 2013 14:24:18 +0100 Subject: create a meanigful file name if files are from the root folder --- lib/files.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/files.php b/lib/files.php index ae3144de2c5..447ffb50577 100644 --- a/lib/files.php +++ b/lib/files.php @@ -78,7 +78,13 @@ class OC_Files { } } $zip->close(); - $name = basename($dir) . '.zip'; + $basename = basename($dir); + if ($basename) { + $name = $basename . '.zip'; + } else { + $name = 'owncloud.zip'; + } + set_time_limit($executionTime); } elseif (\OC\Files\Filesystem::is_dir($dir . '/' . $files)) { self::validateZipDownload($dir, $files); -- cgit v1.2.3 From 48bb53030c657e1133da47765c7c778a069af665 Mon Sep 17 00:00:00 2001 From: Björn Schießle Date: Thu, 7 Mar 2013 15:51:44 +0100 Subject: distinguish between touch and write --- apps/files_versions/lib/hooks.php | 6 ++++++ apps/files_versions/lib/versions.php | 1 + lib/files/view.php | 10 +++++++++- 3 files changed, 16 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/hooks.php index 7891b20e92f..6e81286052f 100644 --- a/apps/files_versions/lib/hooks.php +++ b/apps/files_versions/lib/hooks.php @@ -21,6 +21,12 @@ class Hooks { if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { $path = $params[\OC\Files\Filesystem::signal_param_path]; + $pos = strrpos($path, '.part'); + if ($pos) { + error_log("old path: $path"); + $path = substr($path, 0, $pos); + error_log("new path: $path"); + } if($path<>'') { Storage::store($path); } diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index c37133cf32c..274f38095db 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -107,6 +107,7 @@ class Storage { // store a new version of a file $users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename)); + error_log("version created!"); $versionsSize = self::getVersionsSize($uid); if ( $versionsSize === false || $versionsSize < 0 ) { $versionsSize = self::calculateSize($uid); diff --git a/lib/files/view.php b/lib/files/view.php index 3e2cb080e1d..59339ff2071 100644 --- a/lib/files/view.php +++ b/lib/files/view.php @@ -245,7 +245,14 @@ class View { if (!is_null($mtime) and !is_numeric($mtime)) { $mtime = strtotime($mtime); } - return $this->basicOperation('touch', $path, array('write'), $mtime); + + $hooks = array('touch'); + + if (!$this->file_exists($path)) { + $hooks[] = 'write'; + } + + return $this->basicOperation('touch', $path, $hooks, $mtime); } public function file_get_contents($path) { @@ -596,6 +603,7 @@ class View { if ($path == null) { return false; } + foreach ($hooks as $h) if ($h == "write") error_log("write triggered by $operation for $path"); $run = $this->runHooks($hooks, $path); list($storage, $internalPath) = Filesystem::resolvePath($absolutePath . $postFix); if ($run and $storage) { -- cgit v1.2.3 From a5cab28bea6188ce840d7d115064c4780531e13d Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Thu, 7 Mar 2013 11:12:59 -0500 Subject: Fix fetching source path of shared files --- apps/files_sharing/lib/share/file.php | 23 ++++++++++++++++++++--- apps/files_sharing/lib/sharedstorage.php | 20 ++++++++++++-------- lib/files/mount.php | 26 ++++++++++++++++++++++++-- lib/files/view.php | 2 +- lib/public/share.php | 2 +- tests/lib/files/mount.php | 8 ++++---- 6 files changed, 62 insertions(+), 19 deletions(-) (limited to 'lib') diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php index 0aeb763d89a..fa43e87b49e 100644 --- a/apps/files_sharing/lib/share/file.php +++ b/apps/files_sharing/lib/share/file.php @@ -73,7 +73,9 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent { if ($format == self::FORMAT_SHARED_STORAGE) { // Only 1 item should come through for this format call return array( + 'parent' => $items[key($items)]['parent'], 'path' => $items[key($items)]['path'], + 'storage' => $items[key($items)]['storage'], 'permissions' => $items[key($items)]['permissions'], 'uid_owner' => $items[key($items)]['uid_owner'] ); @@ -139,13 +141,28 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent { $source = \OCP\Share::getItemSharedWith('folder', $folder, \OC_Share_Backend_File::FORMAT_SHARED_STORAGE); if ($source) { $source['path'] = $source['path'].substr($target, strlen($folder)); - return $source; } } else { $source = \OCP\Share::getItemSharedWith('file', $target, \OC_Share_Backend_File::FORMAT_SHARED_STORAGE); - if ($source) { - return $source; + } + if ($source) { + if (isset($source['parent'])) { + $parent = $source['parent']; + while (isset($parent)) { + $query = \OC_DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1); + $item = $query->execute(array($parent))->fetchRow(); + if (isset($item['parent'])) { + $parent = $item['parent']; + } else { + $fileOwner = $item['uid_owner']; + break; + } + } + } else { + $fileOwner = $source['uid_owner']; } + $source['fileOwner'] = $fileOwner; + return $source; } \OCP\Util::writeLog('files_sharing', 'File source not found for: '.$target, \OCP\Util::ERROR); return false; diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index 5a9864b64ba..be0e59e6732 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -45,11 +45,7 @@ class Shared extends \OC\Files\Storage\Common { */ private function getFile($target) { if (!isset($this->files[$target])) { - $source = \OC_Share_Backend_File::getSource($target); - if ($source) { - $source['path'] = '/'.$source['uid_owner'].'/'.$source['path']; - } - $this->files[$target] = $source; + $this->files[$target] = \OC_Share_Backend_File::getSource($target); } return $this->files[$target]; } @@ -62,8 +58,16 @@ class Shared extends \OC\Files\Storage\Common { private function getSourcePath($target) { $source = $this->getFile($target); if ($source) { - \OC\Files\Filesystem::initMountPoints($source['uid_owner']); - return $source['path']; + if (!isset($source['fullPath'])) { + \OC\Files\Filesystem::initMountPoints($source['fileOwner']); + $mount = \OC\Files\Mount::findByNumericId($source['storage']); + if ($mount) { + $this->files[$target]['fullPath'] = $mount->getMountPoint().$source['path']; + } else { + $this->files[$target]['fullPath'] = false; + } + } + return $this->files[$target]['fullPath']; } return false; } @@ -430,7 +434,7 @@ class Shared extends \OC\Files\Storage\Common { } $source = $this->getFile($path); if ($source) { - return $source['uid_owner']; + return $source['fileOwner']; } return false; } diff --git a/lib/files/mount.php b/lib/files/mount.php index 6e99d8eabb4..1c9382d78e7 100644 --- a/lib/files/mount.php +++ b/lib/files/mount.php @@ -176,10 +176,12 @@ class Mount { } /** + * Find mounts by storage id + * * @param string $id - * @return \OC\Files\Storage\Storage[] + * @return Mount[] */ - public static function findById($id) { + public static function findByStorageId($id) { if (strlen($id) > 64) { $id = md5($id); } @@ -191,4 +193,24 @@ class Mount { } return $result; } + + /** + * Find mounts by numeric storage id + * + * @param string $id + * @return Mount + */ + public static function findByNumericId($id) { + $query = \OC_DB::prepare('SELECT `id` FROM `*PREFIX*storages` WHERE `numeric_id` = ?'); + $result = $query->execute(array($id))->fetchOne(); + if ($result) { + $id = $result; + foreach (self::$mounts as $mount) { + if ($mount->getStorageId() === $id) { + return $mount; + } + } + } + return false; + } } diff --git a/lib/files/view.php b/lib/files/view.php index 3e2cb080e1d..4ed3234552e 100644 --- a/lib/files/view.php +++ b/lib/files/view.php @@ -960,7 +960,7 @@ class View { */ public function getPath($id) { list($storage, $internalPath) = Cache\Cache::getById($id); - $mounts = Mount::findById($storage); + $mounts = Mount::findByStorageId($storage); foreach ($mounts as $mount) { /** * @var \OC\Files\Mount $mount diff --git a/lib/public/share.php b/lib/public/share.php index 8146a23f360..59f41a9bfd6 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -786,7 +786,7 @@ class Share { } else { $select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `item_target`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `uid_owner`, - `file_source`, `path`, `file_target`, `permissions`, `stime`, `expiration`, `token`'; + `file_source`, `path`, `file_target`, `permissions`, `stime`, `expiration`, `token`, `storage`'; } } else { $select = '*'; diff --git a/tests/lib/files/mount.php b/tests/lib/files/mount.php index 4e6aaf0679b..6a5c025b0e1 100644 --- a/tests/lib/files/mount.php +++ b/tests/lib/files/mount.php @@ -42,7 +42,7 @@ class Mount extends \PHPUnit_Framework_TestCase { $this->assertEquals(array($mount), \OC\Files\Mount::findById($id)); $mount2 = new \OC\Files\Mount($storage, '/foo/bar'); - $this->assertEquals(array($mount, $mount2), \OC\Files\Mount::findById($id)); + $this->assertEquals(array($mount, $mount2), \OC\Files\Mount::findByStorageId($id)); } public function testLong() { @@ -51,8 +51,8 @@ class Mount extends \PHPUnit_Framework_TestCase { $id = $mount->getStorageId(); $storageId = $storage->getId(); - $this->assertEquals(array($mount), \OC\Files\Mount::findById($id)); - $this->assertEquals(array($mount), \OC\Files\Mount::findById($storageId)); - $this->assertEquals(array($mount), \OC\Files\Mount::findById(md5($storageId))); + $this->assertEquals(array($mount), \OC\Files\Mount::findByStorageId($id)); + $this->assertEquals(array($mount), \OC\Files\Mount::findByStorageId($storageId)); + $this->assertEquals(array($mount), \OC\Files\Mount::findByStorageId(md5($storageId))); } } -- cgit v1.2.3 From 47d176ae69d9c0b7b76768b52c29cdc5f865979c Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Thu, 7 Mar 2013 17:28:28 +0100 Subject: Remove
from error messages, because they will be escaped and the used template has it's own
already --- lib/util.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'lib') diff --git a/lib/util.php b/lib/util.php index c7916b9e774..489fd309355 100755 --- a/lib/util.php +++ b/lib/util.php @@ -172,7 +172,7 @@ class OC_Util { if(!(is_callable('sqlite_open') or class_exists('SQLite3')) and !is_callable('mysql_connect') and !is_callable('pg_connect')) { - $errors[]=array('error'=>'No database drivers (sqlite, mysql, or postgresql) installed.
', + $errors[]=array('error'=>'No database drivers (sqlite, mysql, or postgresql) installed.', 'hint'=>'');//TODO: sane hint $web_server_restart= true; } @@ -218,74 +218,74 @@ class OC_Util { } // check if all required php modules are present if(!class_exists('ZipArchive')) { - $errors[]=array('error'=>'PHP module zip not installed.
', + $errors[]=array('error'=>'PHP module zip not installed.', 'hint'=>'Please ask your server administrator to install the module.'); $web_server_restart= false; } if(!class_exists('DOMDocument')) { - $errors[] = array('error' => 'PHP module dom not installed.
', + $errors[] = array('error' => 'PHP module dom not installed.', 'hint' => 'Please ask your server administrator to install the module.'); $web_server_restart = false; } if(!function_exists('xml_parser_create')) { - $errors[] = array('error' => 'PHP module libxml not installed.
', + $errors[] = array('error' => 'PHP module libxml not installed.', 'hint' => 'Please ask your server administrator to install the module.'); $web_server_restart = false; } if(!function_exists('mb_detect_encoding')) { - $errors[]=array('error'=>'PHP module mb multibyte not installed.
', + $errors[]=array('error'=>'PHP module mb multibyte not installed.', 'hint'=>'Please ask your server administrator to install the module.'); $web_server_restart= false; } if(!function_exists('ctype_digit')) { - $errors[]=array('error'=>'PHP module ctype is not installed.
', + $errors[]=array('error'=>'PHP module ctype is not installed.', 'hint'=>'Please ask your server administrator to install the module.'); $web_server_restart= false; } if(!function_exists('json_encode')) { - $errors[]=array('error'=>'PHP module JSON is not installed.
', + $errors[]=array('error'=>'PHP module JSON is not installed.', 'hint'=>'Please ask your server administrator to install the module.'); $web_server_restart= false; } if(!function_exists('imagepng')) { - $errors[]=array('error'=>'PHP module GD is not installed.
', + $errors[]=array('error'=>'PHP module GD is not installed.', 'hint'=>'Please ask your server administrator to install the module.'); $web_server_restart= false; } if(!function_exists('gzencode')) { - $errors[]=array('error'=>'PHP module zlib is not installed.
', + $errors[]=array('error'=>'PHP module zlib is not installed.', 'hint'=>'Please ask your server administrator to install the module.'); $web_server_restart= false; } if(!function_exists('iconv')) { - $errors[]=array('error'=>'PHP module iconv is not installed.
', + $errors[]=array('error'=>'PHP module iconv is not installed.', 'hint'=>'Please ask your server administrator to install the module.'); $web_server_restart= false; } if(!function_exists('simplexml_load_string')) { - $errors[]=array('error'=>'PHP module SimpleXML is not installed.
', + $errors[]=array('error'=>'PHP module SimpleXML is not installed.', 'hint'=>'Please ask your server administrator to install the module.'); $web_server_restart= false; } if(floatval(phpversion())<5.3) { - $errors[]=array('error'=>'PHP 5.3 is required.
', + $errors[]=array('error'=>'PHP 5.3 is required.', 'hint'=>'Please ask your server administrator to update PHP to version 5.3 or higher.' .' PHP 5.2 is no longer supported by ownCloud and the PHP community.'); $web_server_restart= false; } if(!defined('PDO::ATTR_DRIVER_NAME')) { - $errors[]=array('error'=>'PHP PDO module is not installed.
', + $errors[]=array('error'=>'PHP PDO module is not installed.', 'hint'=>'Please ask your server administrator to install the module.'); $web_server_restart= false; } if(ini_get('safe_mode')) { - $errors[]=array('error'=>'PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly.
', + $errors[]=array('error'=>'PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly.', 'hint'=>'PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.'); $web_server_restart= false; } if($web_server_restart) { - $errors[]=array('error'=>'PHP modules have been installed, but they are still listed as missing?
', + $errors[]=array('error'=>'PHP modules have been installed, but they are still listed as missing?', 'hint'=>'Please ask your server administrator to restart the web server.'); } -- cgit v1.2.3 From 8d26400cb5427763b0562da8799bea52f4eae21e Mon Sep 17 00:00:00 2001 From: Björn Schießle Date: Fri, 8 Mar 2013 11:27:25 +0100 Subject: remove some debug output; move code to the right function --- apps/files_versions/lib/hooks.php | 6 ------ apps/files_versions/lib/versions.php | 8 ++++++++ lib/files/view.php | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/hooks.php index 6e81286052f..7891b20e92f 100644 --- a/apps/files_versions/lib/hooks.php +++ b/apps/files_versions/lib/hooks.php @@ -21,12 +21,6 @@ class Hooks { if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { $path = $params[\OC\Files\Filesystem::signal_param_path]; - $pos = strrpos($path, '.part'); - if ($pos) { - error_log("old path: $path"); - $path = substr($path, 0, $pos); - error_log("new path: $path"); - } if($path<>'') { Storage::store($path); } diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index 79b16f2586f..20611c61ec7 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -82,6 +82,14 @@ class Storage { */ public static function store($filename) { if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { + + // if the file gets streamed we need to remove the .part extension + // to get the right target + $ext = pathinfo($filename, PATHINFO_EXTENSION); + if ($ext === 'part') { + $filename = substr($filename, 0, strlen($filename)-5); + } + list($uid, $filename) = self::getUidAndFilename($filename); $files_view = new \OC\Files\View('/'.$uid .'/files'); diff --git a/lib/files/view.php b/lib/files/view.php index 59339ff2071..fe753342b6c 100644 --- a/lib/files/view.php +++ b/lib/files/view.php @@ -603,7 +603,7 @@ class View { if ($path == null) { return false; } - foreach ($hooks as $h) if ($h == "write") error_log("write triggered by $operation for $path"); + $run = $this->runHooks($hooks, $path); list($storage, $internalPath) = Filesystem::resolvePath($absolutePath . $postFix); if ($run and $storage) { -- cgit v1.2.3 From f9c24a0368876313205d988106b92ab052129b18 Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Fri, 8 Mar 2013 10:01:22 +0100 Subject: 5.0.0 RC3 --- lib/util.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/util.php b/lib/util.php index 489fd309355..47c02074a8c 100755 --- a/lib/util.php +++ b/lib/util.php @@ -75,7 +75,7 @@ class OC_Util { public static function getVersion() { // hint: We only can count up. Reset minor/patchlevel when // updating major/minor version number. - return array(4, 96, 10); + return array(4, 97, 10); } /** @@ -83,7 +83,7 @@ class OC_Util { * @return string */ public static function getVersionString() { - return '5.0 RC 2'; + return '5.0 RC 3'; } /** -- cgit v1.2.3 From f4a326173e978e4b3491b23d27f8dcafdfbaff09 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Fri, 8 Mar 2013 19:21:06 +0100 Subject: fix foldersize check to validate zip input size --- lib/files.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/files.php b/lib/files.php index b594b78c4b7..059c465792a 100644 --- a/lib/files.php +++ b/lib/files.php @@ -212,12 +212,18 @@ class OC_Files { $zipLimit = OC_Config::getValue('maxZipInputSize', OC_Helper::computerFileSize('800 MB')); if ($zipLimit > 0) { $totalsize = 0; - if (is_array($files)) { - foreach ($files as $file) { - $totalsize += \OC\Files\Filesystem::filesize($dir . '/' . $file); + if(!is_array($files)) { + $files = array($files); + } + foreach ($files as $file) { + $path = $dir . '/' . $file; + if(\OC\Files\Filesystem::is_dir($path)) { + foreach (\OC\Files\Filesystem::getDirectoryContent($path) as $i) { + $totalsize += $i['size']; + } + } else { + $totalsize += \OC\Files\Filesystem::filesize($path); } - } else { - $totalsize += \OC\Files\Filesystem::filesize($dir . '/' . $files); } if ($totalsize > $zipLimit) { $l = OC_L10N::get('lib'); -- cgit v1.2.3