Git June 2010

git@phpmyadmin.net

3 participants
104 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_3-33-gbf4fbb3

by Michal Čihař

The branch, QA_3_3 has been updated via bf4fbb395a2ff3ac33272546d521904bf2b4cfee (commit) via 2ff0e610fce1d8687f0901991c73d054ef6f4769 (commit) from 5d525e89ebc32eb19fc6266b96988d8df0d22ff4 (commit) - Log ----------------------------------------------------------------- commit bf4fbb395a2ff3ac33272546d521904bf2b4cfee Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Jun 3 14:47:12 2010 +0200 Update translations from master branch. commit 2ff0e610fce1d8687f0901991c73d054ef6f4769 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Jun 3 14:46:59 2010 +0200 Fix some unicode problems with the script. ----------------------------------------------------------------------- Summary of changes: lang/arabic-utf-8.inc.php | 46 +++--- lang/dutch-utf-8.inc.php | 2 +- lang/slovenian-utf-8.inc.php | 378 +++++++++++++++++++++--------------------- scripts/update-from-po | 16 +- 4 files changed, 219 insertions(+), 223 deletions(-) diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php index 362e464..c04780b 100644 --- a/lang/arabic-utf-8.inc.php +++ b/lang/arabic-utf-8.inc.php @@ -88,6 +88,7 @@ $strBLOBRepositoryEnabled = 'مفعل'; $strBLOBRepositoryEnable = 'فعل'; $strBLOBRepositoryRepair = 'صلح'; $strBookmarkAllUsers = 'اسمح لكل المستخدمين الوصول إلى هذه العلامة المرجعية'; +$strBookmarkCreated = 'تم إنشاء العلامة المرجعية %s'; $strBookmarkDeleted = 'لقد حذفت العلامة المرجعية.'; $strBookmarkLabel = 'علامة'; $strBookmarkQuery = 'علامة مرجعية SQL-استعلام'; @@ -126,11 +127,13 @@ $strConnections = 'اتصالات'; $strConstraintsForDumped = 'قيود الجداول المحفوظة'; $strConstraintsForTable = 'القيود للجدول'; $strCookiesRequired = 'يجب تفعيل دعم الكوكيز في هذه المرحلة.'; +$strCopyDatabaseOK = 'تم نسخ قاعدة البيانات %s إلى %s'; $strCopyTableOK = 'الجدول %s لقد تم نسخه إلى %s.'; $strCopyTableSameNames = 'لا يمكن نسخ الجدول إلى نفسه!'; $strCopyTable = 'نسخ الجدول إلى'; $strCopy = 'انسخ'; $strCouldNotKill = 'لم يستطع phpMyAdmin إيقاف العملية %s. يبدو أنها أوقفت مسبقا.'; +$strCreateDatabaseBeforeCopying = 'CREATE DATABASE قبل النسخ'; $strCreateIndexTopic = 'تصميم فهرسه جديده'; $strCreateIndex = 'تصميم فهرسه على %s عمود'; $strCreateNewDatabase = 'تكوين قاعدة بيانات جديدة'; @@ -169,6 +172,7 @@ $strCheck = 'تحقق'; $strChoosePage = 'رجاء اختر صفحة لتعديلها'; $strDanish = 'الدنمركية'; +$strDatabaseEmpty = 'إسم قاعدة البيانات خالي!'; $strDatabaseExportOptions = 'خيارات تصدير قاعدة بيانات'; $strDatabaseHasBeenDropped = 'قاعدة بيانات %s محذوفه.'; $strDatabasesDropped = 'تم حذف قواعد البيانات %s بنجاح.'; @@ -182,7 +186,10 @@ $strDataDict = 'قاموس البيانات'; $strDataOnly = 'بيانات فقط'; $strData = 'بيانات'; $strDBComment = 'ملاحظة قاعدة البيانات: '; +$strDBCopy = 'إنسخ قاعدة البيانات إلى'; +$strDbIsEmpty = 'قاعدة البيانات فارغة!'; $strDbPrivileges = 'صلاحيات خاصة بقاعدة البيانات'; +$strDBRename = 'أعد تسمية قاعدة البيانات ﺇﻠﻰ'; $strDbSpecific = 'خاص بقاعدة بيانات'; $strDefaultValueHelp = 'للقيم الافتراضية، الرجاء أدخل قيمة مفردة، دون علامات هروب أو تنصيص، باستخدام التنسيق: a'; $strDefault = 'افتراضي'; @@ -204,7 +211,7 @@ $strDisplayPDF = 'إظهار بناء ملف PDF'; $strDoAQuery = 'تجعل "استعلام بواسطة المثال" (wildcard: "%")'; $strDocu = 'مستندات وثائقية'; $strDownloadFile = 'نزل الملف'; -$strDoYouReally = 'هل تريد التنفيذ حقا'; +$strDoYouReally = 'هل تريد حقا '; $strDropUsersDb = 'احذف قواعد البيانات التي لها نفس أسماء المستخدمين.'; $strDrop = 'حذف'; $strDumpingData = 'إرجاع أو استيراد بيانات الجدول'; @@ -225,6 +232,7 @@ $strEnd = 'نهاية'; $strEngines = 'محركات'; $strEnglishPrivileges = ' ملاحظه: اسم الامتياز لـMySQL يظهر ويقرأ باللغة الإنجليزية فقط '; $strEnglish = 'الإنجليزية'; +$strErrorRenamingTable = 'خطأ في إعادة تسمية الجدول %1$s إلى %2$s'; $strError = 'خطأ'; $strEsperanto = 'إسبرانتو'; $strEstonian = 'الإستونية'; @@ -293,6 +301,7 @@ $strId = 'رقم'; $strIgnore = 'تجاهل'; $strImportFiles = 'استورد الملفات'; $strImport = 'استورد'; +$strIndexesSeemEqual = 'الفهارس %1$s و %2$s متساويان ويمكن حذف أحدهما.'; $strIndexes = 'فهارس'; $strIndexHasBeenDropped = 'فهرسة محذوفة %s'; $strIndexName = 'اسم الفهرس :'; @@ -306,6 +315,8 @@ $strInsertAsNewRow = 'إدخال كتسجيل جديد'; $strInsert = 'إدخال'; $strInternalRelations = 'العلاقات الداخلية'; $strInUse = 'قيد الإستعمال'; +$strInvalidDatabase = 'قاعدة البيانات غير صالحة'; +$strInvalidTableName = 'اسم الجدول غير صالح'; $strJapanese = 'اليابانية'; $strJumpToDB = 'إذهب إلى قاعدة بيانات "%s".'; @@ -340,7 +351,7 @@ $strLoginInformation = 'بيانات الدخول'; $strLogin = 'دخول'; $strLogout = 'تسجيل خروج'; $strLogPassword = 'كلمة السر:'; -$strLogServer = 'خادم السجل'; +$strLogServer = 'الخادم:'; $strLogUsername = 'اسم المستخدم:'; $strMediaWiki = 'جدول ميدياويكي'; @@ -380,7 +391,7 @@ $strNone = 'لا شيء'; $strNoOptions = 'هذا التنسيق ليس له أي خيارات'; $strNoPassword = 'لا كلمة سر'; $strNoPermission = 'خادم الويب ليس لديه صلاحية لحفظ الملف %s.'; -$strNoPhp = 'بدون شيفرة PHP'; +$strNoPhp = 'بدون كود PHP'; $strNoPrivileges = 'امتياز غير موجود'; $strNoRights = 'ليس لديك الحقوق الكافية بأن تكون هنا الآن!'; $strNoSpace = 'لا توجد مساحة كافية لحفظ الملف %s.'; @@ -423,8 +434,9 @@ $strPersian = 'فارسية'; $strPhoneBook = 'دفتر الهاتف'; $strPHPVersion = ' PHP إصدارة'; $strPhp = 'أنشئ شيفرة PHP'; +$strPlayAudio = 'شغل الصوت'; $strPmaDocumentation = 'مستندات وثائقية لـ phpMyAdmin (بالإنجليزية)'; -$strPmaUriError = 'المتغير <tt>$cfg[\'PmaAbsoluteUri\']</tt> يجب تعديله في ملف الكوفيك !'; +$strPmaUriError = 'المتغير <tt>$cfg[\'PmaAbsoluteUri\']</tt> يجب تعديله في ملف التعريف !'; $strPolish = 'البولندية'; $strPortrait = 'طول الصفحة'; $strPos1 = 'بداية'; @@ -490,7 +502,8 @@ $strRelations = 'الروابط'; $strRelationView = 'عرض الروابط'; $strReloadingThePrivileges = 'قيد إعادة قراءة الصلاحيات.'; $strRemoveSelectedUsers = 'احذف المستخدمين المحددين'; -$strRenameTableOK = 'تم تغيير اسمهم إلى %s جدول%s'; +$strRenameDatabaseOK = 'تم إعادة تسمية قاعدة البيانات %s إلى %s'; +$strRenameTableOK = 'تم إعادة تسمية الجدول %s إلى %s'; $strRenameTable = 'تغيير اسم جدول إلى'; $strRepairTable = 'إصلاح الجدول'; $strRepair = 'صلح'; @@ -566,7 +579,7 @@ $strSetupOptionNone = '- لا شيء -'; $strSetupSQLQuery_Edit_name = 'تحرير'; $strSetupSQLQuery_Explain_name = 'اشرح SQL'; $strSetupSQLQuery_Refresh_name = 'حدث'; -$strSetupSQLQuery_ShowAsPHP_name = 'أنشئ شيفرة PHP'; +$strSetupSQLQuery_ShowAsPHP_name = 'أنشئ كود PHP'; $strSetupWarning = 'تحذير'; $strSetupZipDump_name = 'زيب'; $strShowAll = 'شاهد الكل'; @@ -630,7 +643,7 @@ $strTableOfContents = 'جدول المحتويات'; $strTableOptions = 'خيارات الجدول'; $strTables = '%s جدول (جداول)'; $strTableStructure = 'بنية الجدول'; -$strTable = 'الجدول '; +$strTable = 'الجدول'; $strTblPrivileges = 'صلاحيات خاصة بالجدول'; $strTextAreaLength = ' بسبب طوله, فمن المحتمل أن هذا الحقل غير قابل للتحرير '; $strThai = 'التايلندية'; @@ -644,6 +657,7 @@ $strTrackingDate = 'تاريخ'; $strTrackingReportClose = 'أغلق'; $strTrackingStatusActive = 'نشط'; $strTrackingStatusNotActive = 'غير نشط'; +$strTrackingThCreated = 'أنشئ'; $strTrackingThUpdated = 'محدث'; $strTrackingThVersion = 'نسخة'; $strTrackingUsername = 'اسم المستخدم'; @@ -696,6 +710,8 @@ $strVar = 'متغير'; $strViewDumpDatabases = 'اعرض أو احفظ بناء قواعد البيانات.'; $strViewDumpDB = 'عرض بنية قاعدة البيانات'; $strViewDump = 'عرض بنية الجدول '; +$strViewImage = 'اعرض الصورة'; +$strViewVideo = 'اعرض الفيديو'; $strWebServerUploadDirectoryError = 'الدليل الذي حددته لتحميل عملك لا يمكن الوصول إليه.'; $strWebServerUploadDirectory = 'دليل تحميل الملفات على خادم الشبكة'; @@ -731,7 +747,6 @@ $strBLOBRepositoryDisableAreYouSure = 'Are you sure you want to disable all BLOB $strBLOBRepositoryDisableStrongWarning = 'You are about to DISABLE a BLOB Repository!'; //to translate $strBLOBRepositoryRemove = 'Remove BLOB Repository Reference'; //to translate $strBLOBRepositoryUpload = 'Upload to BLOB repository'; //to translate -$strBookmarkCreated = 'Bookmark %s created'; //to translate $strBookmarkReplace = 'Replace existing bookmark of same name'; //to translate $strBrowseDistinctValues = 'Browse distinct values'; //to translate $strBufferPoolActivity = 'Buffer Pool Activity'; //to translate @@ -751,10 +766,8 @@ $strConfigDefaultFileError = 'Could not load default configuration from: "%1$s"' $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strConnectionError = 'Cannot connect: invalid settings.'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate -$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate $strCouldNotConnectSource = 'Could not connect to the source'; //to translate $strCouldNotConnectTarget = 'Could not connect to the target'; //to translate -$strCreateDatabaseBeforeCopying = 'CREATE DATABASE before copying'; //to translate $strCreateRelation = 'Create relation'; //to translate $strCreateUserDatabase = 'Database for user'; //to translate $strCreateUserDatabaseName = 'Create database with same name and grant all privileges'; //to translate @@ -763,7 +776,6 @@ $strCreateUserDatabaseWildcard = 'Grant all privileges on wildcard name (usernam $strCustomColor = 'Custom color'; //to translate $strCzechSlovak = 'Czech-Slovak'; //to translate -$strDatabaseEmpty = 'The database name is empty!'; //to translate $strDatabaseHasBeenCreated = 'Database %1$s has been created.'; //to translate $strDatabaseNotExisting = '\'%s\' database does not exist.'; //to translate $strDatabase_src = 'Source database'; //to translate @@ -771,9 +783,6 @@ $strDatabase_trg = 'Target database'; //to translate $strDataDiff = 'Data Difference'; //to translate $strDataPages = 'Pages containing data'; //to translate $strDataSyn = 'Data Synchronization'; //to translate -$strDBCopy = 'Copy database to'; //to translate -$strDbIsEmpty = 'Database seems to be empty!'; //to translate -$strDBRename = 'Rename database to'; //to translate $strDefaultEngine = '%s is the default storage engine on this MySQL server.'; //to translate $strDefragment = 'Defragment table'; //to translate $strDeleteNoUsersSelected = 'No users selected for deleting!'; //to translate @@ -798,7 +807,6 @@ $strEngineUnsupported = 'This MySQL server does not support the %s storage engin $strErrorInZipFile = 'Error in ZIP archive:'; //to translate $strErrorRelationAdded = 'Error: Relation not added.'; //to translate $strErrorRelationExists = 'Error: relation already exists.'; //to translate -$strErrorRenamingTable = 'Error renaming table %1$s to %2$s'; //to translate $strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate $strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -849,7 +857,6 @@ $strImportSuccessfullyFinished = 'Import has been successfully finished, %d quer $strImportUploadInfoNotAvailable = 'Please be patient, the file is being uploaded. Details about the upload are not available.'; //to translate $strImportXLS = 'Excel 97-2003 XLS Workbook'; //to translate $strImportXLSX = 'Excel 2007 XLSX Workbook'; //to translate -$strIndexesSeemEqual = 'The indexes %1$s and %2$s seem to be equal and one of them could possibly be removed.'; //to translate $strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate $strInnoDBAutoextendIncrement = 'Autoextend increment'; //to translate $strInnoDBAutoextendIncrementDesc = ' The increment size for extending the size of an autoextending tablespace when it becomes full.'; //to translate @@ -867,14 +874,12 @@ $strInvalidColumn = 'Invalid column (%s) specified!'; //to translate $strInvalidCSVFieldCount = 'Invalid field count in CSV input on line %d.'; //to translate $strInvalidCSVFormat = 'Invalid format of CSV input on line %d.'; //to translate $strInvalidCSVParameter = 'Invalid parameter for CSV import: %s'; //to translate -$strInvalidDatabase = 'Invalid database'; //to translate $strInvalidFieldAddCount = 'You have to add at least one field.'; //to translate $strInvalidFieldCount = 'Table must have at least one field.'; //to translate $strInvalidLDIImport = 'This plugin does not support compressed imports!'; //to translate $strInvalidRowNumber = '%d is not valid row number.'; //to translate $strInvalidServerHostname = 'Invalid hostname for server %1$s. Please review your configuration.'; //to translate $strInvalidServerIndex = 'Invalid server index: "%s"'; //to translate -$strInvalidTableName = 'Invalid table name'; //to translate $strJoins = 'Joins'; //to translate @@ -965,7 +970,6 @@ $strPDFReportExplanation = '(Generates a report containing the data of a single $strPDFReportTitle = 'Report title'; //to translate $strPhpArray = 'PHP array'; //to translate $strPHPExtension = 'PHP extension'; //to translate -$strPlayAudio = 'Play audio'; //to translate $strPleaseSelectPrimaryOrUniqueKey = 'Please select the primary key or a unique key'; //to translate $strPort = 'Port'; //to translate $strPrivDescAlterRoutine = 'Allows altering and dropping stored routines.'; //to translate @@ -998,7 +1002,6 @@ $strReload = 'Reload'; //to translate $strRemoteServer = 'Remote server'; //to translate $strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate $strRemovePartitioning = 'Remove partitioning'; //to translate -$strRenameDatabaseOK = 'Database %s has been renamed to %s'; //to translate $strReplicationAddLines = 'Now, add the following lines at the end of your my.cnf and please restart the MySQL server afterwards.'; //to translate $strReplicationAddSlaveUser = 'Add slave replication user'; //to translate $strReplicationConfiguredMaster = 'This server is configured as master in a replication process.'; //to translate @@ -1592,7 +1595,6 @@ $strTrackingSQLExecution = 'SQL execution'; //to translate $strTrackingSQLExported = 'SQL statements exported. Please copy the dump or execute it.'; //to translate $strTrackingStatements = 'Tracking statements'; //to translate $strTrackingStructureSnapshot = 'Structure snapshot'; //to translate -$strTrackingThCreated = 'Created'; //to translate $strTrackingThLastVersion = 'Last version'; //to translate $strTrackingTrackDDStatements = 'Track these data definition statements:'; //to translate $strTrackingTrackDMStatements = 'Track these data manipulation statements:'; //to translate @@ -1627,9 +1629,7 @@ $strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move $strVersionInformation = 'Version information'; //to translate $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate $strViewHasBeenDropped = 'View %s has been dropped'; //to translate -$strViewImage = 'View image'; //to translate $strViewName = 'VIEW name'; //to translate -$strViewVideo = 'View video'; //to translate $strView = 'View'; //to translate $strWriteRequests = 'Write requests'; //to translate diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php index 98ccbde..a45c1d5 100644 --- a/lang/dutch-utf-8.inc.php +++ b/lang/dutch-utf-8.inc.php @@ -1153,7 +1153,7 @@ $strSetupServers_port_name = 'Server poort'; $strSetupServers_relation_desc = 'Laat dit veld leeg om geen [a@http://wiki.phpmyadmin.net/pma/relation]relation-links[/a] te ondersteunen, suggestie: [kbd]pma_relation[/kbd]'; $strSetupServers_relation_name = 'Relatie tabel'; $strSetupServers_ShowDatabasesCommand_desc = 'SQL-commando om de beschikbare databases op te vragen'; -$strSetupServers_ShowDatabasesCommand_name = 'SHOW DATABASES commando'; +$strSetupServers_ShowDatabasesCommand_name = 'SHOW DATABASES opdracht'; $strSetupServers_SignonSession_desc = 'Zie [a@http://wiki.phpmyadmin.net/pma/auth_types#signon]authenticatie typen[/a] voor een voorbeeld'; $strSetupServers_SignonSession_name = 'Signon sessienaam'; $strSetupServers_SignonURL_name = 'Signon URL'; diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php index d0ddadb..c1e9829 100644 --- a/lang/slovenian-utf-8.inc.php +++ b/lang/slovenian-utf-8.inc.php @@ -52,10 +52,11 @@ $strAnalyze = 'Analiziraj'; $strAnalyzeTable = 'Analiziraj tabelo'; $strAnd = 'In'; $strAndThen = 'in potem'; +$strAngularLinks = 'Oglate povezave'; $strAnIndex = 'Na %s je dodan indeks'; -$strAnyHost = 'Katerikoli gostitelj'; -$strAny = 'Katerikoli'; -$strAnyUser = 'Katerikoli uporabnik'; +$strAnyHost = 'Kateri koli gostitelj'; +$strAny = 'Kateri koli'; +$strAnyUser = 'Kateri koli uporabnik'; $strApplyChanges = 'Uporabi izbrane spremembe'; $strApproximateCount = 'Morda je približno. Glej [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]'; $strAPrimaryKey = 'Na %s je dodan primarni ključ'; @@ -71,7 +72,7 @@ $strAutomaticLayout = 'Samodejna postavitev'; $strBack = 'Nazaj'; $strBaltic = 'Baltsko'; $strBeginCut = 'ZAČETEK IZREZA'; -$strBeginRaw = 'BEGIN RAW'; +$strBeginRaw = 'ZAČETEK NAVADNO'; $strBinaryDoNotEdit = 'Dvojiško - ne urejaj'; $strBinary = 'Dvojiško'; $strBinaryLog = 'Dvojiški dnevnik'; @@ -100,6 +101,13 @@ $strBookmarkView = 'Samo pogled'; $strBrowseDistinctValues = 'Prebrskaj različne vrednosti'; $strBrowseForeignValues = 'Prebrskaj tuje vrednosti'; $strBrowse = 'Prebrskaj'; +$strBufferPoolActivity = 'Dejavnost zaloge medpomnilnika'; +$strBufferPoolUsage = 'Uporaba zaloge medpomnilnika'; +$strBufferPool = 'Zaloga medpomnilnika'; +$strBufferReadMissesInPercent = 'Zgrešena branja v %'; +$strBufferReadMisses = 'Zgrešena branja'; +$strBufferWriteWaits = 'Čakajoča pisanja'; +$strBufferWriteWaitsInPercent = 'Čakajoča pisanja v %'; $strBulgarian = 'Bolgarsko'; $strBusyPages = 'Zasedene strani'; $strBzip = '"bzipano"'; @@ -268,7 +276,7 @@ $strEnabled = 'Omogočeno'; $strEncloseInTransaction = 'Vključi izvoz v transakcijo'; $strEndCut = 'KONEC IZREZA'; $strEnd = 'Konec'; -$strEndRaw = 'END RAW'; +$strEndRaw = 'KONEC NAVADNO'; $strEngineAvailable = '%s je na voljo na tem strežniku MySQL.'; $strEngineDisabled = '%s je onemogočeno za ta strežnik MySQL.'; $strEngines = 'Pogoni'; @@ -288,6 +296,7 @@ $strEvents = 'Dogodki'; $strExcelEdition = 'Izdaja za Excel'; $strExecuteBookmarked = 'Izvedi izbrano poizvedbo'; $strExplain = 'Razloži SQL stavek'; +$strExportImportToScale = 'Izvozi/Uvozi v razmerju'; $strExport = 'Izvozi'; $strExportMustBeFile = 'Izbrana vrsta izvoza mora biti shranjena v datoteko!'; $strExtendedInserts = 'Razširjene poizvedbe insert'; @@ -397,6 +406,7 @@ $strIndexWarningTable = 'Težave z indeksi tabele `%s`'; $strInnoDBAutoextendIncrementDesc = ' Velikost povečevanja pri razširjanju velikosti samorazširitvenega prostora v tabeli, ko ta postane poln.'; $strInnoDBAutoextendIncrement = 'Povečevanje pri samorazširitvi'; $strInnoDBBufferPoolSizeDesc = 'Velikost spominskega medpomnilnika, ki ga InnoDB uporablja za predpomnjenje podatkov in indeksov svojih tabel.'; +$strInnoDBBufferPoolSize = 'Velikost zaloge medpomnilnika'; $strInnoDBDataFilePath = 'Podatkovne datoteke'; $strInnoDBDataHomeDirDesc = 'Pogosti del poti mape za vse podatkovne datoteke InnoDB.'; $strInnoDBDataHomeDir = 'Domača mapa podatkov'; @@ -426,6 +436,7 @@ $strInvalidServerHostname = 'Neveljavno ime gostitelja za strežnik %1$s. Prosim $strInvalidTableName = 'Neveljavno ime tabele'; $strJapanese = 'Japonsko'; +$strJoins = 'Stiki'; $strJumpToDB = 'Preskoči na podatkovno zbirko "%s".'; $strJustDeleteDescr = '"Izbrisani" uporabniki lahko še vedno normalno dostopajo do strežnika, dokler ne osvežite privilegijev'; $strJustDelete = 'Samo izbriši uporabnike iz tabel privilegijev.'; @@ -448,10 +459,11 @@ $strLatexIncludeCaption = 'Vključi ime tabele'; $strLatexLabel = 'Označi ključ'; $strLaTeX = 'LaTeX'; $strLatexStructure = 'Struktura tabele __TABLE__'; +$strLatchedPages = 'Zapahnjene strani'; $strLatvian = 'Latvijsko'; $strLDI = 'CSV z uporabo LOAD DATA'; $strLDILocal = 'Uporabi ključno besedo LOCAL'; -$strLengthSet = 'Dolžina/Vrednosti*'; +$strLengthSet = 'Dolžina/Vrednosti'; $strLimitNumRows = 'Število vrstic na stran'; $strLinesTerminatedBy = 'Vrstice zaključene z'; $strLinkNotFound = 'Povezave ni mogoče najti'; @@ -469,7 +481,7 @@ $strLogServer = 'Strežnik:'; $strLogUsername = 'Uporabniško ime:'; $strLongOperation = 'Ta operacija lahko traja dolgo časa. Vseeno nadaljujem?'; -$strMaxConnects = 'največ sočasnih povezav'; +$strMaxConnects = 'Največ sočasnih povezav'; $strMaximalQueryLength = 'Največja dolžina ustvarjene poizvedbe'; $strMaximumSize = 'Največja velikost: %s%s'; $strMbExtensionMissing = 'Razširitev PHP mbstring ni bila najdena in kaže, da uporabljate večbajtni nabor znakov. Brez razširitve mbstring phpMyAdmin ni sposoben pravilno razcepiti nizov, kar lahko vodi v nepričakovane rezultate.'; @@ -480,7 +492,7 @@ $strMIME_available_transform = 'Razpoložljive pretvorbe'; $strMIME_description = 'Opis'; $strMIME_MIMEtype = 'Vrsta MIME'; $strMIME_nodescription = 'Za to pretvorbo ni na voljo opisa. Za funkcije %s se pozanimajte pri avtorju.'; -$strMIME_transformation_note = 'Seznam razpoložljivih možnosti pretvorbe in pretvorbe vrst MIME boste videli, če kliknete na %sopise transformacij%s'; +$strMIME_transformation_note = 'Za seznam razpoložljivih možnosti pretvorbe in vrst MIME kliknite na %sopise transformacij%s'; $strMIME_transformation_options = 'Možnosti pretvorbe'; $strMIME_transformation_options_note = 'Vrednosti za možnosti pretvorbe vnesite v naslednji obliki: \'a\', 100, b,\'c\'... Če želite med vrednosti vnesti poševnico nazaj ("\") ali enojni narekovaj ("\'"), morate pred ta znak postaviti (še eno) poševnico nazaj (npr. \'\\\\xyz\' ali \'a\\\'b\').'; $strMIME_transformation = 'Pretvorba z brskalnikom'; @@ -496,12 +508,14 @@ $strMoveTableSameNames = 'Tabele ni mogoče premakniti same vase!'; $strMultilingual = 'večjezično'; $strMyISAMDataPointerSizeDesc = 'Privzeta velikost kazalca v bajtih, ki se naj uporablja s CREATE TABLE za tabele MyISAM, ko možnost MAX_ROWS ni določena.'; $strMyISAMDataPointerSize = 'Velikost kazalca podatkov'; +$strMyISAMMaxExtraSortFileSizeDesc = 'Če bi bila začasna datoteka, uporabljena za hitro ustvarjanje indeksa MyISAM, večja kot uporabljena vrednost predpomnilnika ključev določena tukaj, raje izberite način predpomnilnika ključev.'; $strMyISAMMaxExtraSortFileSize = 'Največja velikost začasnih datotek ob ustvarjanju indeksa'; $strMyISAMMaxSortFileSizeDesc = 'Največja velikost začasnih datotek, ki jih lahko MySQL uporablja, ko ponovno ustvarja indeks MyISAM (med REPAIR TABLE, ALTER TABLE ali LOAD DATA INFILE).'; $strMyISAMMaxSortFileSize = 'Največja velikost začasnih razvrstitvenih datotek'; $strMyISAMRecoverOptionsDesc = 'Način za samodejno obnovitev sesutih tabel MyISAM, ko je določen preko zagonske možnosti strežnika --myisam-recover.'; $strMyISAMRecoverOptions = 'Način samodejne obnovitve'; -$strMyISAMRepairThreads = 'Popravi niti'; +$strMyISAMRepairThreadsDesc = 'Če je vrednost večja od 1, so indeksi tabel MyISAM med popravljanjem zaradi postopka razvrščanja ustvarjeni vzporedno (vsak indeks v svoji niti).'; +$strMyISAMRepairThreads = 'Niti popravljanja'; $strMyISAMSortBufferSizeDesc = 'Medpomnilnik, ki je dodeljen razvrščanju indeksov MyISAM med REPAIR TABLE ali ustvarjanju indeksov s CREATE INDEX ali ALTER TABLE.'; $strMyISAMSortBufferSize = 'Velikost medpomnilnika razvrščanja'; $strMysqlClientVersion = 'Različica odjemalca MySQL'; @@ -541,6 +555,7 @@ $strNoTablesFound = 'V podatkovni zbirki ni mogoče najti tabel.'; $strNoThemeSupport = 'Podprta ni nobena tema; prosimo, preverite vašo konfiguracijo in/ali dodajte teme v mapo %s.'; $strNotNumber = 'To ni število!'; $strNotOK = 'ni v redu'; +$strNotPresent = 'ni prisotno'; $strNotSet = 'Tabele %s ni mogoče najti ali pa ni v %s'; $strNoUsersFound = 'Ni mogoče najti uporabnika(ov).'; $strNoValidateSQL = 'Preskoči preverjanje pravilnosti SQL stavka'; @@ -564,6 +579,7 @@ $strOr = 'Ali'; $strOverhead = 'Presežek'; $strOverwriteExisting = 'Prepiši obstoječo(e) datoteko(e)'; +$strPacked = 'Stisnjeno'; $strPageNumber = 'Številka strani:'; $strPagesToBeFlushed = 'Strani za izplakniti'; $strPaperSize = 'Velikost papirja'; @@ -578,7 +594,26 @@ $strPassword = 'Geslo'; $strPasswordHashing = 'Šifriranje gesel'; $strPasswordChanged = 'Geslo za %s je uspešno spremenjeno.'; $strPasswordNotSame = 'Gesli se ne ujemata!'; +$strPBXTDataLogThresholdDesc = 'Največja velikost podatkovnega dnevnika. Privzeta vrednost je 64 MB. PBXT lahko ustvari največ 32000 podatkovnih dnevnikov, katere uporabljajo vse tabele. Tako se lahko ta vrednost poveča za povečanje skupne količine podatkov, ki so lahko shranjeni v zbirki podatkov.'; +$strPBXTDataLogThreshold = 'Omejitev podatkovnega dnevnika'; +$strPBXTGarbageThresholdDesc = 'Odstotek smeti v dnevniški datoteki, preden je ta stisnjena. Vrednost je med 1 in 99. Privzeto je 50.'; +$strPBXTGarbageThreshold = 'Omejitev smeti'; +$strPBXTCheckpointFrequencyDesc = 'Količina podatkov, zapisanih v dnevnik transakcij, preden se izvede nadzorna točka. Privzeta vrednost je 24 MB.'; +$strPBXTCheckpointFrequency = 'Pogostnost nadzornih točk'; +$strPBXTIndexCacheSizeDesc = 'Količina pomnilnika uporabljena za predpomnjenje indeksov. Privzeta vrednost je 32 MB. Tukaj dodeljen pomnilnik se uporablja samo za predpomnjenje strani indeksov.'; $strPBXTIndexCacheSize = 'Velikost predpomnilnika indeksov'; +$strPBXTLogBufferSizeDesc = 'Velikost medpomnilnika uporabljenega med pisanjem podatkovnega dnevnika. Privzeto je 256 MB. Pogon vsaki niti dodeli en medpomnilnik, vendar samo v primeru, če mora nit zapisovati v podatkovni dnevnik.'; +$strPBXTLogBufferSize = 'Velikost medpomnilnika dnevnikov'; +$strPBXTLogCacheSizeDesc = 'Količina spomina dodeljenega predpomnilniku dnevnika transakcij, ki se uporablja za predpomnjenje ob podatkih dnevnika transakcij. Privzeto je 16 MB.'; +$strPBXTLogCacheSize = 'Velikost predpomnilnika dnevnika'; +$strPBXTLogFileCountDesc = 'Število datotek transakcijskih dnevnikov (pbxt/system/xlog*.xt), ki jih vzdržuje sistem. Če število dnevnikov presega to vrednost, bodo stari dnevniki izbrani, v naprotnem primeru pa bodo preimenovani in dodeljena jim bo naslednja najvišja številka.'; +$strPBXTLogFileCount = 'Število dnevniških datotek'; +$strPBXTLogFileThresholdDesc = 'Velikost dnevnika transakcij pred prehodom in ustvarjanjem novega dnevnika. Privzeta vrednost je 16 MB.'; +$strPBXTLogFileThreshold = 'Omejitev dnevniške datoetke'; +$strPBXTRecordCacheSizeDesc = 'Količina dodeljenega spomina zapisljivemu predpomnilniku, uporabljenemu za predpomnjenje podatkov tabele. Privzeta vrednost je 32 MB. Ta spomin se uporablja za predpomnjenje sprememb datotek oprimkov podatkov (.xtd) in kazalcev vrstic (.xtr).'; +$strPBXTRecordCacheSize = 'Velikost predpomnilnika zapisov'; +$strPBXTTransactionBufferSizeDesc = 'Velikost globalnega medpomnilnika dnevnika transakcij (pogon dodeli dva medpomnilnika te velikosti). Privzeto je 1 MB.'; +$strPBXTTransactionBufferSize = 'Velikost medpomnilnika transakcij'; $strPdfDbSchema = 'Shema podatkovne baze "%s" - Stran %s'; $strPdfInvalidTblName = 'Tabela "%s" ne obstaja!'; $strPdfNoTables = 'Ni tabel'; @@ -670,6 +705,7 @@ $strQueryTime = 'Poizvedba je potrebovala %01.4f s'; $strQueryType = 'Vrsta poizvedbe'; $strQueryWindowLock = 'Ne prepiši te poizvedbe od zunaj'; +$strReadRequests = 'Zahtev branja'; $strRebuild = 'Ponovno sestavi'; $strReceived = 'Prejeto'; $strRecommended = 'priporočeno'; @@ -696,11 +732,44 @@ $strRepairTable = 'Popravi tabelo'; $strReplaceNULLBy = 'Zamenjaj NULL z'; $strReplaceTable = 'Podatke v tabeli zamenjaj z datoteko'; $strReplicationAddLines = 'Sedaj dodajte naslednje vrstice na konec razdelka [mysqld] v vašem my.cnf in nato, prosimo, ponovno zaženite strežnik MySQL.'; +$strReplicationAddSlaveUser = 'Dodaj uporabnika podvojevanja podrejencev'; +$strReplicationConfiguredMaster = 'Ta strežnik je konfiguriran kot glavni strežnik v postopku podvojevanja.'; +$strReplicationControlSlave = 'Upravljaj podrejenca:'; +$strReplicationErrorGetPosition = 'Ne morem prebrati položaja dnevnika glavnega strežnika. Možne težave s privilegiji na glavnem strežniku.'; +$strReplicationErrorMasterConnect = 'Ne morem se povezati z glavnim strežnikom %s.'; +$strReplicationChangedSuccesfully = 'Glavni strežnik je uspešno spremenjen v %s'; +$strReplicationMasterConfiguration = 'Konfiguracija glavnega strežnika'; +$strReplicationMasterChooseAll = 'Podvoji vse zbirke podatkov; prezri:'; +$strReplicationMasterChooseIgn = 'Prezri vse zbirke podatkov; podvoji:'; +$strReplicationMasterChooseMode = 'Ta strežnik ni konfiguriran kot glavni strežnik v postopku podvojevanja. Izbirate lahko med ali podvojevanjem vseh zbirk podatkov in prezrtjem nekaterih (uporabno, če želite podvojiti večino zbirk podatkov) ali prezrtjem vseh zbirk podatkov po privzetem in podvojitvijo samo določenih zbirk podatkov. Prosimo, izberite način:'; +$strReplicationMaster = 'Podvojevanje glavnega strežnika'; $strReplication = 'Podvojevanje'; +$strReplicationRestartServer = 'Ko enkrat ponovno zažetene strežnik MySQL, prosimo, kliknite na gumb Pojdi. Nato bi morali videti sporočilo, ki vam sporoča, da ta strežnik je konfiguriran kot glavni strežnik'; $strReplicationSelectDatabases = 'Prosimo, izberite zbirke podatkov:'; +$strReplicationServernConfiguredMaster = 'Ta strežnik ni konfiguriran kot glavni strežnik v postopku podvojevanja. Ali ga želite <a href="%s">konfigurirati</a>?'; +$strReplicationShowConnectedSlavesNote = 'Samo podrejenci, ki so bili zagnani z možnostjo --report-host=host_name, so vidni na tem seznamu.'; +$strReplicationShowConnectedSlaves = 'Pokaži povezane podrejence'; +$strReplicationSlaveConfiguration = 'Konfiguracija podrejencev'; +$strReplicationSlaveConfigured = 'Strežnik je konfiguriran kot podrejenec v postopku podvojevanja. Ali želite:'; +$strReplicationSlaveErrorManagement = 'Upravljanje napak:'; +$strReplicationSlaveChangeMaster = 'Spremeni ali ponovno konfiguriraj glavni strežnik'; +$strReplicationSlaveIOThread = 'Nit IO samo %s'; +$strReplicationSlaveIOThreadNotRunning = 'Podrejenčeva nit IO ni zagnana!'; +$strReplicationSlaveNotConfigured = 'Ta strežnik ni konfiguriran kot podrejenec v postopku podvojevanja. Ali ga želite <a href="%s">konfigurirati</a>?'; +$strReplicationSlave = 'Podvojevanje podrejencev'; +$strReplicationSlaveReset = 'Ponovno zaženi podrejenca'; +$strReplicationSlaveSeeStatus = 'Oglej si tabelo stanj podrejencev'; $strReplicationSlaveSkipCurrentError = 'Preskoči trenutno napako'; $strReplicationSlaveSkipNextErrors = 'napak.'; $strReplicationSlaveSkipNext = 'Preskoči naslednjo'; +$strReplicationSlaveSQLThread = 'Nit SQL samo %s'; +$strReplicationSlaveSQLThreadNotRunning = 'Podrejenčeva nit SQL ni zagnana!'; +$strReplicationStatus_master = 'Stanje glavnega strežnika'; +$strReplicationStatus_slave = 'Stanje podrejenca'; +$strReplicationStatus = 'Stanje podvojevanja'; +$strReplicationSynchronize = 'Sinhroniziraj zbirke podatkov z glavnim strežnikom'; +$strReplicationUnableToChange = 'Ne morem spremeniti glavnega strežnika'; +$strReplicationUnknownError = 'Neznana napaka'; $strReset = 'Ponastavi'; $strResourceLimits = 'Omejitve virov'; $strRestartInsertion = 'Ponovno začni vstavljanje z %s vrsticami'; @@ -768,6 +837,8 @@ $strSessionValue = 'Vrednost seje'; $strSetEnumVal = 'Če je polje vrste "enum" ali "set", navedite vrednosti v obliki: \'a\',\'b\',\'c\'... Če želite med vrednostmi uporabiti poševnico ("\") ali enojni narekovaj ("\'"), pred tem znakom vnesite poševnico (n.pr. \'\\\\xyz\' ali \'a\\\'b\').'; $strSettings = 'nastavitve'; $strSetupAllowAnywhereRecoding_name = 'Omogoči pretvarjanje nabora znakov'; +$strSetupAllowArbitraryServer_desc = 'Če je omogočeno, lahko uporabnik vstopi v kateri koli strežnik MySQL v prijavnem obrazcu z overovitvijo piškotkov'; +$strSetupAllowArbitraryServerMsg = 'Ta [a@?page=form&formset=features#tab_Security]možnost[/a] naj bo onemogočena, saj omogoča napadalcem, da se z načinom bruteforce prijavijo v kateri koli strežnik MySQL. Če menite, da je to potrebno, uporabite [a@?page=form&formset=features#tab_Security]seznam zaupanih proxyjev[/a]. Kakor koli, zaščita temelječa na IP ni zanesljiva, če vaš IP pripada ISP-ju, na katerega je povezanih tisoče uporabnikov, vključno z vami.'; $strSetupAllowArbitraryServer_name = 'Dovoli prijavo v kateri koli strežnik MySQL'; $strSetupAllowUserDropDatabase_name = 'Pokaži povezavo »Zavrzi zbirko podatkov« normalnim uporabnikom'; $strSetupblowfish_secret_desc = 'Skrivno geslo, ki se uporabi pri šifriranju piškotkov v overovitvi [kbd]cookie[/kbd]'; @@ -838,6 +909,10 @@ $strSetupFalse = 'ne'; $strSetupForceSSL_desc = 'Vsili varno povezavo med uporabo phpMyAdmin'; $strSetupForceSSLMsg = 'Ta [a@?page=form&formset=features#tab_Security]možnost[/a] naj bo omogočena, če jo vaš spletni strežnik podpira'; $strSetupForceSSL_name = 'Vsili povezavo SSL'; +$strSetupForeignKeyDropdownOrder_desc = 'Vrstni red za predmete na spustnem seznamu tujih ključev; [kbd]content[/kbd] je sklicevan podatek, [kbd]id[/kbd] je vrednost ključa'; +$strSetupForeignKeyDropdownOrder_name = 'Vrstni red spustnega seznama tujih ključev'; +$strSetupForeignKeyMaxLimit_desc = 'Uporabljen bo spustni seznam, če je prisotnih manj elementov'; +$strSetupForeignKeyMaxLimit_name = 'Omejitev tujih ključev'; $strSetupForm_Browse_desc = 'Prilagodite način brskanja'; $strSetupForm_Browse = 'Način brskanja'; $strSetupForm_Edit_desc = 'Prilagodite način urejanja'; @@ -866,7 +941,10 @@ $strSetupForm_Security = 'Varnost'; $strSetupForm_Server_config_desc = 'Napredne nastavitve strežnika; ne spreminjajte teh možnosti, če ne veste čemu služijo'; $strSetupForm_Server_config = 'Konfiguracija strežnika'; $strSetupForm_Server_desc = 'Vnesite parametre povezave s strežnikom'; +$strSetupForm_Server_login_options_desc = 'Vnesite prijavne možnosti za overovitev signon'; +$strSetupForm_Server_login_options = 'Prijavne možnosti signon'; $strSetupForm_Server = 'Osnovne nastavitve'; +$strSetupForm_Server_pmadb_desc = 'Konfigurira zbirko podatkov phpMyAdmin za pridobitev dostopa do dodatnih funkcij, glej [a@../Documentation.html#linked-tables]infrastrukturo povezanih tabel[/a] v dokumentaciji'; $strSetupFormset_customization = 'Prilagoditev'; $strSetupFormset_export = 'Prilagodi možnosti izvoza'; $strSetupFormset_features = 'Lastnosti'; @@ -928,8 +1006,14 @@ $strSetupLetUserChoose = 'naj uporabnik izbere'; $strSetupLightTabs_desc = 'Uporabi grafično manj zahtevne zavihke'; $strSetupLightTabs_name = 'Lahki zavihki'; $strSetupLoad = 'Naloži'; +$strSetupLoginCookieDeleteAll_desc = 'Če je TRUE, odjava izbriše piškotke za vse strežnike; če je nastavljeno na FALSE, se odjava izvrši samo za trenutni strežnik. Nastavitev FALSE lahko hitro povzroči pozabljanje odjavljanja iz ostalih strežnikov, ko ste povezani na več strežnikov.'; $strSetupLoginCookieDeleteAll_name = 'Izbriši vse piškotke ob odjavi'; +$strSetupLoginCookieRecall_desc = 'Določi, ali se naj prejšnji prijavni podatki v načinu overovitve piškotkov prikličejo ali ne'; +$strSetupLoginCookieRecall_name = 'Prikliči uporabniško ime'; +$strSetupLoginCookieStore_desc = 'Določa, kako dolgo (v sekundah) naj bo prijavni piškotek shranjen v brskalniku. Privzeta vrednost 0 pomeni, da bo shranjen samo za obstoječo sejo in bo izbrisan takoj, ko zaprete okno brskalnika. To je priporočeno za okolja, ki jim ne zaupate.'; +$strSetupLoginCookieStore_name = 'Shranjevanje prijavnih piškotkov'; $strSetupLoginCookieValidity_desc = 'Določa, kako dolgo (v sekundah) je prijavni piškotek veljaven'; +$strSetupLoginCookieValidityMsg = '[a@?page=form&formset=features#tab_Security]Veljavnost prijavnega piškotka[/a] naj bo nastavljena na največ 1800 sekund (30 minut). Vrednosti večje od 1800 lahko predstavljajo varnostno tveganje, kot je pretvarjanje za drugo osebo.'; $strSetupLoginCookieValidity_name = 'Veljavnost prijavnega piškotka'; $strSetupMaxDbList_desc = 'Največje število podatkovnih zbirk prikazanih v levem okvirju in na seznamu zbirk podatkov'; $strSetupMaxDbList_name = 'Največ podatkovnih zbirk'; @@ -941,6 +1025,7 @@ $strSetupMaxTableList_desc = 'Največje število tabel prikazanih na seznamu tab $strSetupMaxTableList_name = 'Največ tabel'; $strSetupMemoryLimit_desc = 'Število bajtov, ki jih skript lahko dodeli, npr. [kbd]32M[/kbd] ([kbd]0[/kbd] za neomejeno)'; $strSetupMemoryLimit_name = 'Omejitev spomina'; +$strSetupNavigationBarIconic_name = 'Ikonska navigacijska vrstica'; $strSetupNewServer = 'Nov strežnik'; $strSetupNoServers = 'Ni konfiguriranih strežnikov'; $strSetupOBGzip_desc = 'Uporabi izhod medpomnjenja GZip za povečano hitrost v prenosih HTTP'; @@ -952,8 +1037,10 @@ $strSetupOverview = 'Pregled'; $strSetupPersistentConnections_desc = 'Uporabi vztrajne povezave s podatkovnimi zbirkami MySQL'; $strSetupPersistentConnections_name = 'Vztrajne povezave'; $strSetupPropertiesIconic_desc = 'Uporabi samo ikone, samo besedilo ali oboje'; +$strSetupPropertiesIconic_name = 'Ikonski posegi tabel'; $strSetupProtectBinary_desc = 'Prepeči urejanje polj BLOB in BINARY'; $strSetupProtectBinary_name = 'Zaščiti dvojiška polja'; +$strSetupQueryHistoryDB_desc = 'Omogočite, če želite zgodovino poizvedb temelječo na zbirki podatkov (potrebuje pmadb). Če je onemogočeno, se za prikaz zgodovine poizvedb uporabi rutina JavaScript (ki se izgubi ob zaprtju okna).'; $strSetupQueryHistoryDB_name = 'Trajna zgodovina poizvedb'; $strSetupQueryHistoryMax_desc = 'Koliko poizvedb je hranjenih v zgodovini'; $strSetupQueryHistoryMax_name = 'Dolžina zgodovine poizvedb'; @@ -962,9 +1049,27 @@ $strSetupQueryWindowDefTab_name = 'Privzet zavihek okna za poizvedbe'; $strSetupRecodingEngine_desc = 'Določi katere funkcije bodo uporabljene za pretvorbo nabora znakov'; $strSetupRecodingEngine_name = 'Pogon rekodiranja'; $strSetupRestoreDefaultValue = 'Povrni privzeto vrednost'; +$strSetupRevertErroneousFields = 'Poskusi povrniti zmotna polja na njihove privzete vrednosti'; $strSetupSaveDir_desc = 'Mapa, kamor se lahko na strežnik shranijo izvozi'; $strSetupSaveDir_name = 'Mapa za shranjevanje'; +$strSetupServerAuthConfigMsg = 'Nastavili ste vrsto overovitve [kbd]config[/kbd] in vključili uporabniško ime in geslo za samodejno prijavo, kar ni zaželena možnost za gostitelje aktivnih strani. Vsakdo, ki ve ali ugane vaš URL phpMyAdmina, lahko neposredno dostopa do vaše plošče phpMyAdmin. Nastavite [a@?page=servers&mode=edit&id=%1$d#tab_Server]vrsto overovitve[/a] na [kbd]cookie[/kbd] ali [kbd]http[/kbd].'; +$strSetupServerExtensionMsg = 'Zaradi zmogljivostnih razlogov uporabljajte mysqli'; +$strSetupServerNoPasswordMsg = 'Dovoljujete povezavo s strežnikom brez gesla.'; $strSetupServersAdd = 'Dodaj nov strežnik'; +$strSetupServers_AllowDeny_order_desc = 'Pustite prazno, če se ne uporablja'; +$strSetupServers_AllowDeny_order_name = 'Zaporedje overovitve gostitelja'; +$strSetupServers_AllowDeny_rules_desc = 'Pustite prazno za privzeto'; +$strSetupServers_AllowDeny_rules_name = 'Pravila overovitve gostitelja'; +$strSetupServers_AllowNoPassword_name = 'Dovoli prijave brez gesla'; +$strSetupServers_AllowRoot_name = 'Dovoli prijavo root'; +$strSetupServers_auth_swekey_config_desc = 'Pot konfiguracijske datoteke za [a@http://swekey.com]strojno overovitev SweKey[/a] (se ne nahaja v korenski mapi dokumentov; predlagano: /etc/swekey.conf)'; +$strSetupServers_auth_swekey_config_name = 'Konfiguracijska datoteka SweKey'; +$strSetupServers_auth_type_desc = 'Način overovitve za uporabo'; +$strSetupServers_auth_type_name = 'Vrsta overovitve'; +$strSetupServers_bookmarktable_desc = 'Pustite prazno, če ne želite podpore [a@http://wiki.phpmyadmin.net/pma/bookmark]zaznamkov[/a]; predlagano: [kbd]pma_bookmark[/kbd]'; +$strSetupServers_bookmarktable_name = 'Tabela zaznamkov'; +$strSetupServers_column_info_desc = 'Pustite prazno, če ne želite komentarjev/vrst mime stolpcev; predlagano: [kbd]pma_column_info[/kbd]'; +$strSetupServers_column_info_name = 'Tabela informacij stolpcev'; $strSetupServers_compress_desc = 'Stisni povezavo s strežnikom MySQL'; $strSetupServers_compress_name = 'Stisni povezavo'; $strSetupServers_connect_type_desc = 'Način povezave s strežnikom; pustite [kbd]tcp[/kbd], če niste prepričani'; @@ -972,24 +1077,53 @@ $strSetupServers_connect_type_name = 'Vrsta povezave'; $strSetupServers_controlpass_name = 'Geslo krmilnega uporabnika'; $strSetupServers_controluser_desc = 'Posebni uporabnik MySQL, konfiguriran z omejenimi dovoljenji; več informacij je na voljo na [a@http://wiki.phpmyadmin.net/pma/controluser]wikiji[/a]'; $strSetupServers_controluser_name = 'Krmilni uporabnik'; -$strSetupServers_CountTables_desc = 'Preštej tabele, ko prikazujem seznam podatkovnih zbirk'; +$strSetupServers_CountTables_desc = 'Preštej tabele med prikazovanjem seznama podatkovnih zbirk'; $strSetupServers_CountTables_name = 'Preštej tabele'; -$strSetupServers_designer_coords_desc = 'Pustite prazno, če ne želite podpore Oblikovalnika, predlagano: [kbd]pma_designer_coords[/kbd]'; +$strSetupServers_designer_coords_desc = 'Pustite prazno, če ne želite podpore Oblikovalnika; predlagano: [kbd]pma_designer_coords[/kbd]'; $strSetupServers_designer_coords_name = 'Tabela Oblikovalnika'; +$strSetupServers_DisableIS_desc = 'Več informacij na [a@http://sf.net/support/tracker.php?aid=1849494]sledilniku hroščev PMA[/a] in[a@http://bugs.mysql.com/19588]hroščih MySQL[/a]'; $strSetupServers_DisableIS_name = 'Onemogoči uporabo INFORMATION_SCHEMA'; +$strSetupServerSecurityInfoMsg = 'Če menite, da je to potrebno, uporabite dodatne nastavitve zaščite – nastavitve [a@?page=servers&mode=edit&id=%1$d#tab_Server_config]overovitve gostitelja[/a] in [a@?page=form&formset=features#tab_Security]seznam zaupanih proxyjev[/a]. Kakor koli, zaščita temelječa na IP ni zanesljiva, če vaš IP pripada ISP-ju, na katerega je povezanih tisoče uporabnikov, vključno z vami.'; $strSetupServersEdit = 'Uredi strežnik'; +$strSetupServers_extension_desc = 'Katera razširitev PHP naj se uporablja; uporabite mysqli, če je podprt'; +$strSetupServers_extension_name = 'Razširitev PHP za uporabo'; +$strSetupServers_hide_db_desc = 'Skrije zbirke podatkov, ki se ujemajo z običajnim izrazom (PCRE)'; $strSetupServers_hide_db_name = 'Skrij zbirke podatkov'; +$strSetupServers_history_desc = 'Pustite prazno, če ne želite podpore zgodovine poizvedb SQL; predlagano: [kbd]pma_history[/kbd]'; +$strSetupServers_history_name = 'Tabela zgodovine poizvedb SQL'; $strSetupServers_host_desc = 'Ime gostitelja, kjer teče strežnik MySQL'; $strSetupServers_host_name = 'Ime gostitelja strežnika'; $strSetupServers_LogoutURL_name = 'Odjavni URL'; $strSetupServers_nopassword_desc = 'Poskusi se povezati brez gesla'; $strSetupServers_nopassword_name = 'Poveži se brez gesla'; +$strSetupServers_only_db_name = 'Prikaži samo navedene zbirke podatkov'; +$strSetupServers_password_name = 'Geslo za overovitev config'; +$strSetupServers_pdf_pages_desc = 'Pustite prazno, če ne želite podpore PDF-sheme; predlagano: [kbd]pma_pdf_pages[/kbd]'; +$strSetupServers_pdf_pages_name = 'PDF-shema: tabele strani'; +$strSetupServers_pmadb_desc = 'Zbirka podatkov uporabljena za relacije, zaznamke in funkcije PDF. Oglejte si [a@http://wiki.phpmyadmin.net/pma/pmadb]pmadb[/a] za vse informacije. Pustite prazno, če ne želite podpore. Predlagano: [kbd]phpmyadmin[/kbd]'; $strSetupServers_pmadb_name = 'Podatkovna zbirka PMA'; +$strSetupServers_port_desc = 'Vrata, na katera naj bo strežnik MySQL priključen; pustite prazno za privzeto'; $strSetupServers_port_name = 'Vrata strežnika'; +$strSetupServers_relation_desc = 'Pustite prazno, če ne želite podpore [a@http://wiki.phpmyadmin.net/pma/relation]relacijskih povezav[/a]; priporočeno: [kbd]pma_relation[/kbd]'; $strSetupServers_relation_name = 'Relacijska tabela'; +$strSetupServers_ShowDatabasesCommand_desc = 'Ukaz SQL za pridobitev razpoložljivih zbirk podatkov'; +$strSetupServers_ShowDatabasesCommand_name = 'Ukaz SHOW DATABASES'; +$strSetupServers_SignonSession_desc = 'Oglejte si [a@http://wiki.phpmyadmin.net/pma/auth_types#signon]vrste overovitev[/a] za primer'; +$strSetupServers_SignonSession_name = 'Ime seje signon'; +$strSetupServers_SignonURL_name = 'URL signon'; +$strSetupServerSslMsg = 'Uporabite povezave SSL, če jih vaš spletni strežnik podpira'; +$strSetupServers_socket_desc = 'Vtičnica na katero je povezan strežnik MySQL; pustite prazno za privzeto'; $strSetupServers_socket_name = 'Vtičnica strežnika'; $strSetupServers_ssl_desc = 'Omogoči SSL za povezavo s strežnikom MySQL'; $strSetupServers_ssl_name = 'Uporabi SSL'; +$strSetupServers_table_coords_desc = 'Pustite prazno, če ne želite podpore PDF-sheme; predlagano: [kbd]pma_table_coords[/kbd]'; +$strSetupServers_table_coords_name = 'PDF-shema: koordinate tabel'; +$strSetupServers_user_desc = 'Pustite prazno, če ne uporabljate overovitve config'; +$strSetupServers_user_name = 'Uporabnik za overovitev config'; +$strSetupServers_verbose_desc = 'Uporabniku prijazen opis tega strežnika. Pustite prazno, če se naj namesto tega prikaže ime gostitelja.'; +$strSetupServers_verbose_check_desc = 'Onemogočite, če veste, da so vaše tabele pma_* ažurirane. To prepreči preverjanja združljivosti in tako poveča zmogljivost.'; +$strSetupServers_verbose_check_name = 'Preverjanje razširitve'; +$strSetupServers_verbose_name = 'Razširjeno ime tega strežnika'; $strSetupSetValue = 'Določi vrednost: %s'; $strSetupShowAll_desc = 'Ali se naj uporabniku prikaže gumb "prikaži vse (zapise)"'; $strSetupShowAll_name = 'Dovoli prikaz vseh vrstic'; @@ -998,6 +1132,7 @@ $strSetupShowForm = 'Pokaži obrazec'; $strSetupShowFunctionFields_desc = 'Prikaže polja funkcij v načinu urejanja/vstavljanja'; $strSetupShowFunctionFields_name = 'Prikaži polja funkcij'; $strSetupShowHiddenMessages = 'Prikaži skrita sporočila (#MSG_COUNT)'; +$strSetupShowChgPassword_desc = 'Pomnite, da omogočanje tega nima učinka z načinom overovitve [kbd]config[/kbd], saj je geslo vgrajeno v konfiguracijsko datoteko; to ne omejuje možnosti izvedbe enakega ukaza neposredno'; $strSetupShowChgPassword_name = 'Pokaži obrazec za spremembo gesla'; $strSetupShowPhpInfo_desc = 'Prikaže povezavo do podatkov [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a]'; $strSetupShowPhpInfo_name = 'Prikaži povezavo phpinfo()'; @@ -1008,8 +1143,10 @@ $strSetupShowStats_desc = 'Dovoli prikaz statistike podatkovne zbirke in tabele $strSetupShowStats_name = 'Pokaži statistiko'; $strSetupShowTooltipAliasDB_desc = 'Če so zaslonski namigi omogočeni in ima zbirka podatkov določen komentar, bo to zamenjalo komentar in pravo ime'; $strSetupShowTooltipAliasDB_name = 'Prikaži komentar zbirke podatkov namesto njenega imena'; +$strSetupShowTooltipAliasTB_desc = 'Ko je nastavljeno na [kbd]nested[/kbd], je pridevek imena tabele uporabljen samo za razdružitev/združitev tabel v skladu z določilom $cfg[\'LeftFrameTableSeparator\'], zato je samo mapa imenovana kot pridevek, sama imena tabel pa ostanejo nespremenjena'; $strSetupShowTooltipAliasTB_name = 'Prikaži komentar tabele namesto njenega imena'; $strSetupShowTooltip_name = 'Prikaži komentarje tabel v zaslonskih namigih'; +$strSetupSkipLockedTables_desc = 'Označi uporabljene tabele in omogoči prikaz zbirk podatkov z zaklenjenimi tabelami'; $strSetupSkipLockedTables_name = 'Preskoči zaklenjene tabele'; $strSetupSQLQuery_Edit_name = 'Uredi'; $strSetupSQLQuery_Explain_name = 'Razloži stavek SQL'; @@ -1018,11 +1155,15 @@ $strSetupSQLQuery_ShowAsPHP_name = 'Ustvari kodo PHP'; $strSetupSuggestDBName_desc = 'Predlagaj ime zbirke podatkov v obrazcu "Ustvari zbirko podatkov" (če je le mogoče) ali pusti besedilno polje prazno'; $strSetupSuggestDBName_name = 'Predlagaj novo ime zbirke podatkov'; $strSetupTrue = 'da'; +$strSetupTrustedProxies_desc = 'Vnesite proxyje kot [kbd]IP: zaupana glava HTTP[/kbd]. Sledeči primer navaja, da naj phpMyAdmin zaupa glavi HTTP_X_FORWARDED_FOR (X-Forwarded-For) prihajajoči iz proxyja 1.2.3.4:[br][kbd]1.2.3.4: HTTP_X_FORWARDED_FOR[/kbd]'; $strSetupTrustedProxies_name = 'Seznam zaupanja vrednih proxyjev za sprejetje/zavrnitev IP'; $strSetupUploadDir_desc = 'Mapa na strežniku, kamor lahko naložite datoteke za uvoz'; $strSetupUploadDir_name = 'Mapa za nalaganje'; $strSetupUseDbSearch_desc = 'Dovoli iskanje po celotni zbirki podatkov'; $strSetupUseDbSearch_name = 'Uporabi iskanje po zbirki podatkov'; +$strSetupVerboseMultiSubmit_desc = 'Prikaže spremenjene vrstice vsakega stavka v večstavčni poizvedbi. Oglejte si libraries/import.lib.php za privzete podatke o tem, koliko poizvedb lahko stavek vsebuje.'; +$strSetupVerboseMultiSubmit_name = 'Zgosti večkratne stavke'; +$strSetupVersionCheckDataError = 'Branje različice je spodletelo. Morda niste povezani v internet ali pa se posodobitveni strežnik ne odziva.'; $strSetupVersionCheckInvalid = 'Od strežnika sem dobil neveljavno besedilo različice'; $strSetupVersionCheckLink = 'Preveri za najnovejšo različico'; $strSetupVersionCheckNewAvailable = 'Na voljo je novejša različica phpMyAdmina, zato razmislite o posodobitvi. Najnovejša različica je %s, izdaja %s.'; @@ -1049,9 +1190,13 @@ $strShowingPhp = 'Prikazovanje kot koda PHP'; $strShowingRecords = 'Prikazujem vrstice'; $strShowingSQL = 'Prikazovanje poizvedbe SQL'; $strShowKeys = 'Prikaži samo ključe'; +$strShowMasterStatus = 'Pokaži stanje glavnega strežnika'; $strShowOpenTables = 'Pokaži odprte tabele'; $strShowPHPInfo = 'Pokaži podatke o PHP'; $strShow = 'Pokaži'; +$strShowSlaveHosts = 'Prikaži gostitelje podrejencev'; +$strShowSlaveStatus = 'Prikaži stanje podrejencev'; +$strShowStatusBinlog_cache_useDescr = 'Število transakcij, ki so uporabile začasni predpomnilnik dvojiškega dnevnika.'; $strShowStatusCreated_tmp_filesDescr = 'Koliko začasnih datotek je ustvaril mysqld.'; $strShowStatusDelayed_writesDescr = 'Število zapisanih vrstic INSERT DELAYED.'; $strShowStatusFlush_commandsDescr = 'Število izvedenih izjav FLUSH.'; @@ -1062,14 +1207,29 @@ $strShowStatusHandler_updateDescr = 'Število zahtev za posodobitev vrstice v ta $strShowStatusHandler_writeDescr = 'Število zahtev za vstavitev vrstice v tabelo.'; $strShowStatusInnodb_buffer_pool_pages_dataDescr = 'Število strani, ki vsebujejo podatke (umazane ali čiste)'; $strShowStatusInnodb_buffer_pool_pages_dirtyDescr = 'Število trenutno umazanih strani.'; +$strShowStatusInnodb_buffer_pool_pages_flushedDescr = 'Število strani zaloge medpomnilnika, za katere je bila zaprošena izplaknitev.'; $strShowStatusInnodb_buffer_pool_pages_freeDescr = 'Število prostih strani.'; +$strShowStatusInnodb_buffer_pool_pages_totalDescr = 'Skupna velikost zaloge medpomnilnika, v straneh.'; +$strShowStatusInnodb_buffer_pool_write_requestsDescr = 'Število zapisov storjenih v zalogi medpomnilnika InnoDB.'; $strShowStatusInnodb_data_fsyncsDescr = 'Število dozdajšnjih posegov fsync().'; +$strShowStatusInnodb_data_pending_fsyncsDescr = 'Trenutno število čakajočih posegov fsync().'; +$strShowStatusInnodb_data_pending_readsDescr = 'Trenutno število čakajočih branj.'; +$strShowStatusInnodb_data_pending_writesDescr = 'Trenutno število čakajočih pisanj.'; $strShowStatusInnodb_data_readDescr = 'Količina do zdaj prebranih podatkov, v bajtih.'; $strShowStatusInnodb_data_readsDescr = 'Skupno število branj podatkov.'; $strShowStatusInnodb_data_writesDescr = 'Skupno število zapisovanj podatkov.'; $strShowStatusInnodb_data_writtenDescr = 'Količina do zdaj zapisanih podatkov, v bajtih.'; +$strShowStatusInnodb_dblwr_pages_writtenDescr = 'Število strani, ki so bile zapisane za posege dvojnega pisanja (doublewrite).'; +$strShowStatusInnodb_dblwr_writesDescr = 'Število posegov dvojnega pisanja (doublewrite), ki so bili izvedeni.'; +$strShowStatusInnodb_log_waitsDescr = 'Število čakanj, ki smo jih imeli, ker je bil medpomnilnik dnevnika premajhen in je bilo potrebno počakati, da se pred nadaljevanjem izplakne.'; +$strShowStatusInnodb_log_write_requestsDescr = 'Število zahtev pisanja v dnevnik.'; +$strShowStatusInnodb_log_writesDescr = 'Število fizičnih pisanj v dnevniško datoteko.'; +$strShowStatusInnodb_os_log_fsyncsDescr = 'Število pisanj fsync() storjenih v dnevniško datoteko.'; +$strShowStatusInnodb_os_log_pending_fsyncsDescr = 'Število čakajoče dnevniške datoteke fsyncs.'; +$strShowStatusInnodb_os_log_pending_writesDescr = 'Čakajoča pisanja v dnevniško datoteko.'; $strShowStatusInnodb_os_log_writtenDescr = 'Število bajtov zapisanih v dnevniško datoteko.'; $strShowStatusInnodb_pages_createdDescr = 'Število ustvarjenih strani.'; +$strShowStatusInnodb_page_sizeDescr = 'Vgrajena velikost strani InnoDB (privzeto 16 KB). Veliko vrednosti je štetih v straneh; velikost strani omogoča preprosto pretvorbo v bajte.'; $strShowStatusInnodb_pages_readDescr = 'Število prebranih strani.'; $strShowStatusInnodb_pages_writtenDescr = 'Število zapisanih strani.'; $strShowStatusInnodb_row_lock_current_waitsDescr = 'Število zaklepov vrstic, na katere se trenutno čaka.'; @@ -1095,6 +1255,12 @@ $strShowStatusQcache_not_cachedDescr = 'Število nepredpomnjenih poizvedb (ne pr $strShowStatusQcache_queries_in_cacheDescr = 'Število zabeleženih poizvedb v predpomnilniku.'; $strShowStatusQcache_total_blocksDescr = 'Skupno število blokov v predpomnilniku poizvedb.'; $strShowStatusReset = 'Ponastavi'; +$strShowStatusSlow_launch_threadsDescr = 'Število niti, ki so za svoje ustvarjanje porabile več kot slow_launch_time sekund.'; +$strShowStatusSlow_queriesDescr = 'Število poizvedb, ki so porabile več kot long_query_time sekund.'; +$strShowStatusSort_rangeDescr = 'Število razvrščanj, ki so bila storjena z razponi.'; +$strShowStatusSort_rowsDescr = 'Število razvrščenih vrstic.'; +$strShowStatusSort_scanDescr = 'Število razvrščanj, ki so bila storjena s pregledovanjem tabele.'; +$strShowStatusTable_locks_immediateDescr = 'Koliko krat je bil zaklep tabele pridobljen takoj.'; $strShowStatusThreads_connectedDescr = 'Število trenutno odprtih povezav.'; $strShowStatusThreads_runningDescr = 'Število niti, ki ne spijo.'; $strShowTableDimension = 'Pokaži dimenzije tabel'; @@ -1107,7 +1273,10 @@ $strSkipQueries = 'Število zapisov (poizvedb), ki jih naj preskočim od začetk $strSlaveConfigure = 'Prepričajte se, da imate v vaši konfiguracijski datoteki (my.cnf) edinstven id strežnika. Če nimate, prosimo dodajte naslednjo vrstico v razdelek [mysqld]:'; $strSlovak = 'Slovaško'; $strSlovenian = 'Slovensko'; +$strSmallBigAll = 'Skrči/razširi vse'; $strSnapToGrid = 'Pripni na mrežo'; +$strSocketProblem = '(ali pa lokalna vtičnica strežnika MySQL ni pravilno konfigurirana)'; +$strSocket = 'Vtičnica'; $strSortByKey = 'Uredi po ključu'; $strSorting = 'Razvrščanje'; $strSort = 'Razvrsti'; @@ -1124,6 +1293,7 @@ $strSQL = 'SQL'; $strSQPBugInvalidIdentifer = 'Neveljavni identifikator'; $strSQPBugUnclosedQuote = 'Odprt citat'; $strSQPBugUnknownPunctuation = 'Neznan niz ločil'; +$strStandInStructureForView = 'Nadomestna struktura pogleda'; $strStart = 'Začetek'; $strStatCreateTime = 'Ustvarjeno'; $strStatement = 'Izjave'; @@ -1203,6 +1373,7 @@ $strTime = 'Čas'; $strTimeoutInfo = 'Čas prejšnjega uvoza se je iztekel, po ponovni potrditvi se bo nadaljeval od položaja %d.'; $strTimeoutNothingParsed = 'Kakor koli, ob zadnjem zagonu ni bilo razčlenjenih nič podatkov, kar po navadi pomeni, da phpMyAdmin ne bo mogel dokončati tega uvoza, razen če povečate vaše časovne omejitve PHP.'; $strTimeoutPassed = 'Časovna omejitev skripta je potekla; če želite končati uvoz, prosimo, ponovno pošljite isto datoteko in uvoz se bo nadaljeval.'; +$strToFromPage = 'od/do strani'; $strToggleScratchboard = 'Preklopi odložišče (scratchboard)'; $strToggleSmallBig = 'Preklopi majhno/veliko'; $strToSelectRelation = 'Za izbiro relacije, kliknite:'; @@ -1252,10 +1423,13 @@ $strTrackingUsername = 'Uporabniško ime'; $strTrackingVersionActivated = 'Sledenje %s.%s, različice %s je aktivirano.'; $strTrackingVersionCreated = 'Različica %s je ustvarjena, sledenje %s.%s je aktivirano.'; $strTrackingVersionDeactivated = 'Sledenje %s.%s, različice %s je dezaktivirano.'; +$strTrackingVersionSnapshotSQL = 'Različica posnetka %s (koda SQL)'; $strTrackingVersions = 'Različice'; +$strTrackingYouCanExecute = 'Odložene podatke lahko izvedete z ustvarjanjem in uporabo začasne zbirke podatkov. Prosimo, prepričajte se, da imate privilegije za ta dejanja.'; $strTraditionalChinese = 'Tradicionalno kitajsko'; $strTraditionalSpanish = 'Tradicionalno špansko'; $strTraffic = 'Promet'; +$strTransactionCoordinator = 'Koordinator transakcij'; $strTransformation_application_octetstream__download = 'Prikaži povezavo za prenos dvojiških podatkov polja. Prva možnost je ime dvojiške datoteke. Druga možnost je možno ime polja v vrstici tabele, ki vsebuje to ime datoteke. Če vnesete drugo možnost, mora biti prva možnost prazna.'; $strTransformation_application_octetstream__hex = 'Prikaže šestnajstiško predstavljene podatke. Izbirni prvi parameter določa pogostost dodajanja presledkov (privzeto na 2 polzloga).'; $strTransformation_image_jpeg__inline = 'Prikaže sličico, na katero lahko kliknete. Možnosti sta največja širina in višina v slikovnih pikah. Prvotna razmerja se obdržijo.'; @@ -1274,7 +1448,7 @@ $strType = 'Vrsta'; $strUkrainian = 'Ukrajinsko'; $strUncheckAll = 'Odznači vse'; -$strUnicode = 'Unicode'; +$strUnicode = 'Unikod'; $strUnique = 'Edinstven'; $strUnknown = 'neznano'; $strUnselectAll = 'Prekliči izbor vsega'; @@ -1333,6 +1507,7 @@ $strWiki = 'wiki'; $strWildcard = 'nadomestni znak'; $strWindowNotFound = 'Ciljnega okna ni bilo mogoče osvežiti. Morda ste zaprli nadrejeno okno ali pa vaš brskalnik blokira osveževanje varnostnih parametrov med okni.'; $strWithChecked = 'Z označenim:'; +$strWriteRequests = 'Zahtev pisanja'; $strWrongUser = 'Napačno uporabniško ime/geslo. Dostop zavrnjen.'; $strXMLError = 'Določena datoteka XML je ali skažena ali nepopolna. Prosimo, odpravite težave in poskusite znova.'; @@ -1352,18 +1527,10 @@ $strZip = '"zipano"'; // To translate: $strAndSmall = 'and'; //to translate -$strAngularLinks = 'Angular links'; //to translate $strBLOBRepositoryDisabled = 'Disabled'; //to translate $strBLOBRepositoryEnabled = 'Enabled'; //to translate $strBLOBRepositoryRepair = 'Repair'; //to translate -$strBufferPoolActivity = 'Buffer Pool Activity'; //to translate -$strBufferPool = 'Buffer Pool'; //to translate -$strBufferPoolUsage = 'Buffer Pool Usage'; //to translate -$strBufferReadMissesInPercent = 'Read misses in %'; //to translate -$strBufferReadMisses = 'Read misses'; //to translate -$strBufferWriteWaitsInPercent = 'Write waits in %'; //to translate -$strBufferWriteWaits = 'Write waits'; //to translate $strCompatibleHashing = 'MySQL 4.0 compatible'; //to translate $strConfigDefaultFileError = 'Could not load default configuration from: "%1$s"'; //to translate @@ -1374,184 +1541,44 @@ $strCSV = 'CSV'; //to translate $strDesignerHelpDisplayField = 'The display field is shown in pink. To set/unset a field as the display field, click the "Choose field to display" icon, then click on the appropriate field name.'; //to translate $strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate -$strExportImportToScale = 'Export/Import to scale'; //to translate $strHTMLExcel = 'Microsoft Excel 2000'; //to translate $strIEUnsupported = 'Internet Explorer does not support this function.'; //to translate $strImportFormat = 'Format of imported file'; //to translate $strImportODS = 'Open Document Spreadsheet'; //to translate -$strInnoDBBufferPoolSize = 'Buffer pool size'; //to translate $strInvalidServerIndex = 'Invalid server index: "%s"'; //to translate -$strJoins = 'Joins'; //to translate - -$strLatchedPages = 'Latched pages'; //to translate - -$strMyISAMMaxExtraSortFileSizeDesc = 'If the temporary file used for fast MyISAM index creation would be larger than using the key cache by the amount specified here, prefer the key cache method.'; //to translate -$strMyISAMRepairThreadsDesc = 'If this value is greater than 1, MyISAM table indexes are created in parallel (each index in its own thread) during the Repair by sorting process.'; //to translate - $strNoneDefault = 'None'; //to translate -$strNotPresent = 'not present'; //to translate -$strPacked = 'Packed'; //to translate $strPBXTDataFileGrowSize = 'Data file grow size'; //to translate $strPBXTDataFileGrowSizeDesc = 'The grow size of the handle data (.xtd) files.'; //to translate -$strPBXTDataLogThreshold = 'Data log threshold'; //to translate -$strPBXTDataLogThresholdDesc = 'The maximum size of a data log file. The default value is 64MB. PBXT can create a maximum of 32000 data logs, which are used by all tables. So the value of this variable can be increased to increase the total amount of data that can be stored in the database.'; //to translate -$strPBXTGarbageThresholdDesc = 'The percentage of garbage in a data log file before it is compacted. This is a value between 1 and 99. The default is 50.'; //to translate -$strPBXTGarbageThreshold = 'Garbage threshold'; //to translate -$strPBXTCheckpointFrequencyDesc = 'The amount of data written to the transaction log before a checkpoint is performed. The default value is 24MB.'; //to translate -$strPBXTCheckpointFrequency = 'Checkpoint frequency'; //to translate -$strPBXTIndexCacheSizeDesc = 'This is the amount of memory allocated to the index cache. Default value is 32MB. The memory allocated here is used only for caching index pages.'; //to translate -$strPBXTLogBufferSizeDesc = 'The size of the buffer used when writing a data log. The default is 256MB. The engine allocates one buffer per thread, but only if the thread is required to write a data log.'; //to translate -$strPBXTLogBufferSize = 'Log buffer size'; //to translate -$strPBXTLogCacheSizeDesc = 'The amount of memory allocated to the transaction log cache used to cache on transaction log data. The default is 16MB.'; //to translate -$strPBXTLogCacheSize = 'Log cache size'; //to translate -$strPBXTLogFileCountDesc = 'This is the number of transaction log files (pbxt/system/xlog*.xt) the system will maintain. If the number of logs exceeds this value then old logs will be deleted, otherwise they are renamed and given the next highest number.'; //to translate -$strPBXTLogFileCount = 'Log file count'; //to translate -$strPBXTLogFileThresholdDesc = 'The size of a transaction log before rollover, and a new log is created. The default value is 16MB.'; //to translate -$strPBXTLogFileThreshold = 'Log file threshold'; //to translate -$strPBXTRecordCacheSizeDesc = 'This is the amount of memory allocated to the record cache used to cache table data. The default value is 32MB. This memory is used to cache changes to the handle data (.xtd) and row pointer (.xtr) files.'; //to translate -$strPBXTRecordCacheSize = 'Record cache size'; //to translate $strPBXTRowFileGrowSizeDesc = 'The grow size of the row pointer (.xtr) files.'; //to translate $strPBXTRowFileGrowSize = 'Row file grow size'; //to translate -$strPBXTTransactionBufferSizeDesc = 'The size of the global transaction log buffer (the engine allocates 2 buffers of this size). The default is 1MB.'; //to translate -$strPBXTTransactionBufferSize = 'Transaction buffer size'; //to translate -$strReadRequests = 'Read requests'; //to translate $strRefresh = 'Refresh'; //to translate $strRelationalDisplayField = 'Relational display field'; //to translate $strReloadPrivileges = 'Reload privileges'; //to translate -$strReplicationAddSlaveUser = 'Add slave replication user'; //to translate -$strReplicationConfiguredMaster = 'This server is configured as master in a replication process.'; //to translate -$strReplicationControlSlave = 'Control slave:'; //to translate -$strReplicationErrorGetPosition = 'Unable to read master log position. Possible privilege problem on master.'; //to translate -$strReplicationErrorMasterConnect = 'Unable to connect to master %s.'; //to translate -$strReplicationChangedSuccesfully = 'Master server changed succesfully to %s'; //to translate -$strReplicationMasterConfiguration = 'Master configuration'; //to translate -$strReplicationMasterChooseAll = 'Replicate all databases; Ignore:'; //to translate -$strReplicationMasterChooseIgn = 'Ignore all databases; Replicate:'; //to translate -$strReplicationMasterChooseMode = 'This server is not configured as master server in a replication process. You can choose from either replicating all databases and ignoring certain (useful if you want to replicate majority of databases) or you can choose to ignore all databases by default and allow only certain databases to be replicated. Please select the mode:'; //to translate -$strReplicationMaster = 'Master replication'; //to translate -$strReplicationRestartServer = 'Once you restarted MySQL server, please click on Go button. Afterwards, you should see a message informing you, that this server is configured as master'; //to translate -$strReplicationServernConfiguredMaster = 'This server is not configured as master in a replication process. Would you like to <a href="%s">configure</a> it?'; //to translate -$strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report-host=host_name option are visible in this list.'; //to translate -$strReplicationShowConnectedSlaves = 'Show connected slaves'; //to translate $strReplicationShowMasterStatus = 'Show master status'; //to translate $strReplicationSkippingErrorWarn = 'Skipping error(s) might lead into unsynchronized master and slave!'; //to translate -$strReplicationSlaveConfiguration = 'Slave configuration'; //to translate -$strReplicationSlaveConfigured = 'Server is configured as slave in a replication process. Would you like to:'; //to translate -$strReplicationSlaveErrorManagement = 'Error management:'; //to translate -$strReplicationSlaveChangeMaster = 'Change or reconfigure master server'; //to translate -$strReplicationSlaveIOThread = 'IO Thread %s only'; //to translate -$strReplicationSlaveIOThreadNotRunning = 'Slave IO Thread not running!'; //to translate -$strReplicationSlaveNotConfigured = 'This server is not configured as slave in a replication process. Would you like to <a href="%s">configure</a> it?'; //to translate -$strReplicationSlaveReset = 'Reset slave'; //to translate -$strReplicationSlaveSeeStatus = 'See slave status table'; //to translate -$strReplicationSlave = 'Slave replication'; //to translate -$strReplicationSlaveSQLThreadNotRunning = 'Slave SQL Thread not running!'; //to translate -$strReplicationSlaveSQLThread = 'SQL Thread %s only'; //to translate $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the <a href="#replication">replication section</a>.'; //to translate -$strReplicationStatus_master = 'Master status'; //to translate -$strReplicationStatus = 'Replication status'; //to translate -$strReplicationStatus_slave = 'Slave status'; //to translate -$strReplicationSynchronize = 'Synchronize databases with master'; //to translate -$strReplicationUnableToChange = 'Unable to change master'; //to translate -$strReplicationUnknownError = 'Unknown error'; //to translate $strRowsAffected = '%1$d row(s) affected.'; //to translate $strRowsDeleted = '%1$d row(s) deleted.'; //to translate $strRowsInserted = '%1$d row(s) inserted.'; //to translate $strServers = 'Servers'; //to translate $strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate -$strSetupAllowArbitraryServer_desc = 'If enabled user can enter any MySQL server in login form for cookie auth'; //to translate -$strSetupAllowArbitraryServerMsg = 'This [a@?page=form&formset=features#tab_Security]option[/a] should be disabled as it allows attackers to bruteforce login to any MySQL server. If you feel this is necessary, use [a@?page=form&formset=features#tab_Security]trusted proxies list[/a]. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.'; //to translate -$strSetupForeignKeyDropdownOrder_desc = 'Sort order for items in a foreign-key dropdown box; [kbd]content[/kbd] is the referenced data, [kbd]id[/kbd] is the key value'; //to translate -$strSetupForeignKeyDropdownOrder_name = 'Foreign key dropdown order'; //to translate -$strSetupForeignKeyMaxLimit_desc = 'A dropdown will be used if fewer items are present'; //to translate -$strSetupForeignKeyMaxLimit_name = 'Foreign key limit'; //to translate -$strSetupForm_Server_login_options_desc = 'Enter login options for signon authentication'; //to translate -$strSetupForm_Server_login_options = 'Signon login options'; //to translate -$strSetupForm_Server_pmadb_desc = 'Configure phpMyAdmin database to gain access to additional features, see [a@../Documentation.html#linked-tables]linked-tables infrastructure[/a] in documentation'; //to translate $strSetupForm_Server_pmadb = 'PMA database'; //to translate $strSetupCharEditing_desc = 'Defines which type of editing controls should be used for CHAR and VARCHAR fields; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/kbd] - allows newlines in fields'; //to translate $strSetupImport_skip_queries_desc = 'Number of records (queries) to skip from start'; //to translate -$strSetupLoginCookieDeleteAll_desc = 'If TRUE, logout deletes cookies for all servers; when set to FALSE, logout only occurs for the current server. Setting this to FALSE makes it easy to forget to log out from other servers when connected to multiple servers.'; //to translate -$strSetupLoginCookieRecall_desc = 'Define whether the previous login should be recalled or not in cookie authentication mode'; //to translate -$strSetupLoginCookieRecall_name = 'Recall user name'; //to translate -$strSetupLoginCookieStore_desc = 'Define how long (in seconds) a login cookie should be stored in browser. The default of 0 means that it will be kept for the existing session only, and will be deleted as soon as you close the browser window. This is recommended for non-trusted environments.'; //to translate -$strSetupLoginCookieStore_name = 'Login cookie store'; //to translate -$strSetupLoginCookieValidityMsg = '[a@?page=form&formset=features#tab_Security]Login cookie validity[/a] should be should be set to 1800 seconds (30 minutes) at most. Values larger than 1800 may pose a security risk such as impersonation.'; //to translate $strSetupNavigationBarIconic_desc = 'Use only icons, only text or both'; //to translate -$strSetupNavigationBarIconic_name = 'Iconic navigation bar'; //to translate -$strSetupPropertiesIconic_name = 'Iconic table operations'; //to translate -$strSetupQueryHistoryDB_desc = 'Enable if you want DB-based query history (requires pmadb). If disabled, this utilizes JS-routines to display query history (lost by window close).'; //to translate -$strSetupRevertErroneousFields = 'Try to revert erroneous fields to their default values'; //to translate -$strSetupServerAuthConfigMsg = 'You set the [kbd]config[/kbd] authentication type and included username and password for auto-login, which is not a desirable option for live hosts. Anyone who knows or guesses your phpMyAdmin URL can directly access your phpMyAdmin panel. Set [a@?page=servers&mode=edit&id=%1$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http[/kbd].'; //to translate -$strSetupServerExtensionMsg = 'You should use mysqli for performance reasons'; //to translate -$strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate -$strSetupServers_AllowDeny_order_desc = 'Leave blank if not used'; //to translate -$strSetupServers_AllowDeny_order_name = 'Host authentication order'; //to translate -$strSetupServers_AllowDeny_rules_desc = 'Leave blank for defaults'; //to translate -$strSetupServers_AllowDeny_rules_name = 'Host authentication rules'; //to translate -$strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate -$strSetupServers_AllowRoot_name = 'Allow root login'; //to translate -$strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)'; //to translate -$strSetupServers_auth_swekey_config_name = 'SweKey config file'; //to translate -$strSetupServers_auth_type_desc = 'Authentication method to use'; //to translate -$strSetupServers_auth_type_name = 'Authentication type'; //to translate -$strSetupServers_bookmarktable_desc = 'Leave blank for no [a@http://wiki.phpmyadmin.net/pma/bookmark]bookmark[/a] support, suggested: [kbd]pma_bookmark[/kbd]'; //to translate -$strSetupServers_bookmarktable_name = 'Bookmark table'; //to translate -$strSetupServers_column_info_desc = 'Leave blank for no column comments/mime types, suggested: [kbd]pma_column_info[/kbd]'; //to translate -$strSetupServers_column_info_name = 'Column information table'; //to translate -$strSetupServers_DisableIS_desc = 'More information on [a@http://sf.net/support/tracker.php?aid=1849494]PMA bug tracker[/a] and [a@http://bugs.mysql.com/19588]MySQL Bugs[/a]'; //to translate -$strSetupServerSecurityInfoMsg = 'If you feel this is necessary, use additional protection settings - [a@?page=servers&mode=edit&id=%1$d#tab_Server_config]host authentication[/a] settings and [a@?page=form&formset=features#tab_Security]trusted proxies list[/a]. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.'; //to translate -$strSetupServers_extension_desc = 'What PHP extension to use; you should use mysqli if supported'; //to translate -$strSetupServers_extension_name = 'PHP extension to use'; //to translate -$strSetupServers_hide_db_desc = 'Hide databases matching regular expression (PCRE)'; //to translate -$strSetupServers_history_desc = 'Leave blank for no SQL query history support, suggested: [kbd]pma_history[/kbd]'; //to translate -$strSetupServers_history_name = 'SQL query history table'; //to translate $strSetupServers_only_db_desc = 'You can use MySQL wildcard characters (% and _), escape them if you want to use their literal instances, i.e. use \'my\_db\' and not \'my_db\''; //to translate -$strSetupServers_only_db_name = 'Show only listed databases'; //to translate $strSetupServers_password_desc = 'Leave empty if not using config auth'; //to translate -$strSetupServers_password_name = 'Password for config auth'; //to translate -$strSetupServers_pdf_pages_desc = 'Leave blank for no PDF schema support, suggested: [kbd]pma_pdf_pages[/kbd]'; //to translate -$strSetupServers_pdf_pages_name = 'PDF schema: pages table'; //to translate -$strSetupServers_pmadb_desc = 'Database used for relations, bookmarks, and PDF features. See [a@http://wiki.phpmyadmin.net/pma/pmadb]pmadb[/a] for complete information. Leave blank for no support. Suggested: [kbd]phpmyadmin[/kbd]'; //to translate -$strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default'; //to translate -$strSetupServers_relation_desc = 'Leave blank for no [a@http://wiki.phpmyadmin.net/pma/relation]relation-links[/a] support, suggested: [kbd]pma_relation[/kbd]'; //to translate -$strSetupServers_ShowDatabasesCommand_desc = 'SQL command to fetch available databases'; //to translate -$strSetupServers_ShowDatabasesCommand_name = 'SHOW DATABASES command'; //to translate -$strSetupServers_SignonSession_desc = 'See [a@http://wiki.phpmyadmin.net/pma/auth_types#signon]authentication types[/a] for an example'; //to translate -$strSetupServers_SignonSession_name = 'Signon session name'; //to translate -$strSetupServers_SignonURL_name = 'Signon URL'; //to translate -$strSetupServerSslMsg = 'You should use SSL connections if your web server supports it'; //to translate -$strSetupServers_socket_desc = 'Socket on which MySQL server is listening, leave empty for default'; //to translate -$strSetupServers_table_coords_desc = 'Leave blank for no PDF schema support, suggested: [kbd]pma_table_coords[/kbd]'; //to translate -$strSetupServers_table_coords_name = 'PDF schema: table coordinates'; //to translate $strSetupServers_table_info_desc = 'Table to describe the display fields, leave blank for no support; suggested: [kbd]pma_table_info[/kbd]'; //to translate $strSetupServers_table_info_name = 'Display fields table'; //to translate -$strSetupServers_user_desc = 'Leave empty if not using config auth'; //to translate -$strSetupServers_user_name = 'User for config auth'; //to translate -$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.'; //to translate -$strSetupServers_verbose_check_desc = 'Disable if you know that your pma_* tables are up to date. This prevents compatibility checks and thereby increases performance'; //to translate -$strSetupServers_verbose_check_name = 'Verbose check'; //to translate -$strSetupServers_verbose_name = 'Verbose name of this server'; //to translate -$strSetupShowChgPassword_desc = 'Please note that enabling this has no effect with [kbd]config[/kbd] authentication mode because the password is hard coded in the configuration file; this does not limit the ability to execute the same command directly'; //to translate -$strSetupShowTooltipAliasTB_desc = 'When setting this to [kbd]nested[/kbd], the alias of the table name is only used to split/nest the tables according to the $cfg[\'LeftFrameTableSeparator\'] directive, so only the folder is called like the alias, the table name itself stays unchanged'; //to translate -$strSetupSkipLockedTables_desc = 'Mark used tables and make it possible to show databases with locked tables'; //to translate $strSetupSQLQuery_Validate_name = 'Validate SQL'; //to translate -$strSetupTrustedProxies_desc = 'Input proxies as [kbd]IP: trusted HTTP header[/kbd]. The following example specifies that phpMyAdmin should trust a HTTP_X_FORWARDED_FOR (X-Forwarded-For) header coming from the proxy 1.2.3.4:[br][kbd]1.2.3.4: HTTP_X_FORWARDED_FOR[/kbd]'; //to translate -$strSetupVerboseMultiSubmit_desc = 'Show affected rows of each statement on multiple-statement queries. See libraries/import.lib.php for defaults on how many queries a statement may contain.'; //to translate -$strSetupVerboseMultiSubmit_name = 'Verbose multiple statements'; //to translate -$strSetupVersionCheckDataError = 'Reading of version failed. Maybe you\'re offline or the upgrade server does not respond.'; //to translate $strSetupVersionCheckNewAvailableSvn = 'You are using subversion version, run [kbd]svn update[/kbd] :-)[br]The latest stable version is %s, released on %s.'; //to translate -$strShowMasterStatus = 'Show master status'; //to translate -$strShowSlaveHosts = 'Show slave hosts'; //to translate -$strShowSlaveStatus = 'Show slave status'; //to translate $strShowStatusBinlog_cache_disk_useDescr = 'The number of transactions that used the temporary binary log cache but that exceeded the value of binlog_cache_size and used a temporary file to store statements from the transaction.'; //to translate -$strShowStatusBinlog_cache_useDescr = 'The number of transactions that used the temporary binary log cache.'; //to translate $strShowStatusCreated_tmp_disk_tablesDescr = 'The number of temporary tables on disk created automatically by the server while executing statements. If Created_tmp_disk_tables is big, you may want to increase the tmp_table_size value to cause temporary tables to be memory-based instead of disk-based.'; //to translate $strShowStatusCreated_tmp_tablesDescr = 'The number of in-memory temporary tables created automatically by the server while executing statements.'; //to translate $strShowStatusDelayed_errorsDescr = 'The number of rows written with INSERT DELAYED for which some error occurred (probably duplicate key).'; //to translate @@ -1563,28 +1590,13 @@ $strShowStatusHandler_read_nextDescr = 'The number of requests to read the next $strShowStatusHandler_read_prevDescr = 'The number of requests to read the previous row in key order. This read method is mainly used to optimize ORDER BY ... DESC.'; //to translate $strShowStatusHandler_read_rndDescr = 'The number of requests to read a row based on a fixed position. This is high if you are doing a lot of queries that require sorting of the result. You probably have a lot of queries that require MySQL to scan whole tables or you have joins that don\'t use keys properly.'; //to translate $strShowStatusHandler_read_rnd_nextDescr = 'The number of requests to read the next row in the data file. This is high if you are doing a lot of table scans. Generally this suggests that your tables are not properly indexed or that your queries are not written to take advantage of the indexes you have.'; //to translate -$strShowStatusInnodb_buffer_pool_pages_flushedDescr = 'The number of buffer pool pages that have been requested to be flushed.'; //to translate $strShowStatusInnodb_buffer_pool_pages_latchedDescr = 'The number of latched pages in InnoDB buffer pool. These are pages currently being read or written or that can\'t be flushed or removed for some other reason.'; //to translate $strShowStatusInnodb_buffer_pool_pages_miscDescr = 'The number of pages busy because they have been allocated for administrative overhead such as row locks or the adaptive hash index. This value can also be calculated as Innodb_buffer_pool_pages_total - Innodb_buffer_pool_pages_free - Innodb_buffer_pool_pages_data.'; //to translate -$strShowStatusInnodb_buffer_pool_pages_totalDescr = 'Total size of buffer pool, in pages.'; //to translate $strShowStatusInnodb_buffer_pool_read_ahead_rndDescr = 'The number of "random" read-aheads InnoDB initiated. This happens when a query is to scan a large portion of a table but in random order.'; //to translate $strShowStatusInnodb_buffer_pool_read_ahead_seqDescr = 'The number of sequential read-aheads InnoDB initiated. This happens when InnoDB does a sequential full table scan.'; //to translate $strShowStatusInnodb_buffer_pool_read_requestsDescr = 'The number of logical read requests InnoDB has done.'; //to translate $strShowStatusInnodb_buffer_pool_readsDescr = 'The number of logical reads that InnoDB could not satisfy from buffer pool and had to do a single-page read.'; //to translate $strShowStatusInnodb_buffer_pool_wait_freeDescr = 'Normally, writes to the InnoDB buffer pool happen in the background. However, if it\'s necessary to read or create a page and no clean pages are available, it\'s necessary to wait for pages to be flushed first. This counter counts instances of these waits. If the buffer pool size was set properly, this value should be small.'; //to translate -$strShowStatusInnodb_buffer_pool_write_requestsDescr = 'The number writes done to the InnoDB buffer pool.'; //to translate -$strShowStatusInnodb_data_pending_fsyncsDescr = 'The current number of pending fsync() operations.'; //to translate -$strShowStatusInnodb_data_pending_readsDescr = 'The current number of pending reads.'; //to translate -$strShowStatusInnodb_data_pending_writesDescr = 'The current number of pending writes.'; //to translate -$strShowStatusInnodb_dblwr_pages_writtenDescr = 'The number of doublewrite writes that have been performed and the number of pages that have been written for this purpose.'; //to translate -$strShowStatusInnodb_dblwr_writesDescr = 'The number of doublewrite writes that have been performed and the number of pages that have been written for this purpose.'; //to translate -$strShowStatusInnodb_log_waitsDescr = 'The number of waits we had because log buffer was too small and we had to wait for it to be flushed before continuing.'; //to translate -$strShowStatusInnodb_log_write_requestsDescr = 'The number of log write requests.'; //to translate -$strShowStatusInnodb_log_writesDescr = 'The number of physical writes to the log file.'; //to translate -$strShowStatusInnodb_os_log_fsyncsDescr = 'The number of fsyncs writes done to the log file.'; //to translate -$strShowStatusInnodb_os_log_pending_fsyncsDescr = 'The number of pending log file fsyncs.'; //to translate -$strShowStatusInnodb_os_log_pending_writesDescr = 'Pending log file writes.'; //to translate -$strShowStatusInnodb_page_sizeDescr = 'The compiled-in InnoDB page size (default 16KB). Many values are counted in pages; the page size allows them to be easily converted to bytes.'; //to translate $strShowStatusKey_blocks_not_flushedDescr = 'The number of key blocks in the key cache that have changed but haven\'t yet been flushed to disk. It used to be known as Not_flushed_key_blocks.'; //to translate $strShowStatusKey_blocks_unusedDescr = 'The number of unused blocks in the key cache. You can use this value to determine how much of the key cache is in use.'; //to translate $strShowStatusKey_blocks_usedDescr = 'The number of used blocks in the key cache. This value is a high-water mark that indicates the maximum number of blocks that have ever been in use at one time.'; //to translate @@ -1602,30 +1614,14 @@ $strShowStatusSelect_scanDescr = 'The number of joins that did a full scan of th $strShowStatusSlave_open_temp_tablesDescr = 'The number of temporary tables currently open by the slave SQL thread.'; //to translate $strShowStatusSlave_retried_transactionsDescr = 'Total (since startup) number of times the replication slave SQL thread has retried transactions.'; //to translate $strShowStatusSlave_runningDescr = 'This is ON if this server is a slave that is connected to a master.'; //to translate -$strShowStatusSlow_launch_threadsDescr = 'The number of threads that have taken more than slow_launch_time seconds to create.'; //to translate -$strShowStatusSlow_queriesDescr = 'The number of queries that have taken more than long_query_time seconds.'; //to translate $strShowStatusSort_merge_passesDescr = 'The number of merge passes the sort algorithm has had to do. If this value is large, you should consider increasing the value of the sort_buffer_size system variable.'; //to translate -$strShowStatusSort_rangeDescr = 'The number of sorts that were done with ranges.'; //to translate -$strShowStatusSort_rowsDescr = 'The number of sorted rows.'; //to translate -$strShowStatusSort_scanDescr = 'The number of sorts that were done by scanning the table.'; //to translate -$strShowStatusTable_locks_immediateDescr = 'The number of times that a table lock was acquired immediately.'; //to translate $strShowStatusTable_locks_waitedDescr = 'The number of times that a table lock could not be acquired immediately and a wait was needed. If this is high, and you have performance problems, you should first optimize your queries, and then either split your table or tables or use replication.'; //to translate $strShowStatusThreads_cachedDescr = 'The number of threads in the thread cache. The cache hit rate can be calculated as Threads_created/Connections. If this value is red you should raise your thread_cache_size.'; //to translate $strShowStatusThreads_createdDescr = 'The number of threads created to handle connections. I f Threads_created is big, you may want to increase the thread_cache_size value. (Normally this doesn\'t give a notable performance improvement if you have a good thread implementation.)'; //to translate -$strSmallBigAll = 'Small/Big All'; //to translate -$strSocketProblem = '(or the local MySQL server\'s socket is not correctly configured)'; //to translate -$strSocket = 'Socket'; //to translate -$strStandInStructureForView = 'Stand-in structure for view'; //to translate $strStructureDiff = 'Structure Difference' ; //to translate $strTableAlterIndex = 'Alter index(s)'; //to translate -$strToFromPage = 'to/from page'; //to translate $strTrackingMechanism = 'Tracking Mechanism'; //to translate -$strTrackingVersionSnapshotSQL = 'Version %s snapshot (SQL code)'; //to translate -$strTrackingYouCanExecute = 'You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.'; //to translate -$strTransactionCoordinator = 'Transaction coordinator'; //to translate $strTransformation_text_plain__dateformat = 'Displays a TIME, TIMESTAMP, DATETIME or numeric unix timestamp field as formatted date. The first option is the offset (in hours) which will be added to the timestamp (Default: 0). Use second option to specify a different date/time format string. Third option determines whether you want to see local date or UTC one (use "local" or "utc" strings) for that. According to that, date format has different value - for "local" see the documentation for PHP\'s strftime() function and for "utc" it is done using gmdate() function.'; //to translate -$strWriteRequests = 'Write requests'; //to translate - ?> diff --git a/scripts/update-from-po b/scripts/update-from-po index 82dba52..e39088e 100755 --- a/scripts/update-from-po +++ b/scripts/update-from-po @@ -67,11 +67,9 @@ CODE2LANG = { } if len(sys.argv) != 2: - print 'Usage: update-from-po PATH_TO_PO_FILES' + print 'Usage: update-from-po PO_FILES' sys.exit(1) -pofiles = os.listdir(sys.argv[1]) - f = file('lang/english-utf-8.inc.php', 'r') langmap = {} for line in f: @@ -80,7 +78,8 @@ for line in f: parts = line.split(' = ') langmap[parts[1].strip(';').strip('\'')] = parts[0].strip('$') -for pofile in pofiles: +for pofile_full in sys.argv[1:]: + pofile = os.path.basename(pofile_full) if pofile[-3:] != '.po': print 'Not a po file, skipping: %s' % pofile continue @@ -89,6 +88,7 @@ for pofile in pofiles: lang = CODE2LANG[pofile[:-3]] except KeyError: print 'Language for %s not defined!' % pofile + continue try: langfile = codecs.open('lang/%s-utf-8.inc.php' % lang, 'r', 'utf-8').readlines() @@ -97,7 +97,7 @@ for pofile in pofiles: continue print 'Updating %s from: %s' % (lang, pofile) - po = polib.pofile(os.path.join(sys.argv[1], pofile)) + po = polib.pofile(os.path.join(sys.argv[1], pofile_full)) for translation in po.translated_entries(): if translation.msgctxt is None: @@ -110,7 +110,7 @@ for pofile in pofiles: continue for i in xrange(len(langfile)): if langfile[i][:2 + keylen] == '$%s ' % key: - langfile[i] = '$%s = \'%s\';\n' % (key, msgstr) + langfile[i] = u'$%s = \'%s\';\n' % (key, msgstr) - out = file('lang/%s-utf-8.inc.php' % lang, 'w') - out.writelines([x.encode('utf-8') for x in langfile]) + out = codecs.open('lang/%s-utf-8.inc.php' % lang, 'w', 'utf-8') + out.writelines(langfile) hooks/post-receive -- phpMyAdmin

14 years, 1 month

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-4662-gf1f3b2a

by Michal Čihař

The branch, master has been updated via f1f3b2a54ea1b7f695971f0e4a6a6db239f0121e (commit) from fd7452915c8617e9eecf71dffd0b5293cd754674 (commit) - Log ----------------------------------------------------------------- commit f1f3b2a54ea1b7f695971f0e4a6a6db239f0121e Author: Lorikeet Lee <leelorik(a)gmail.com> Date: Thu Jun 3 14:12:02 2010 +0200 patch #2999595, rfe #2998130 [interface] Cleanup navigation frame. These things do not bring much added value and just take space. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + navigation.php | 14 -------------- 2 files changed, 1 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1c34496..2be237a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -82,6 +82,7 @@ $Id$ + [doc] Incorporate synchronisation docs into main document. + [core] Include Content Security Policy HTTP headers. - bug #3004216 [CSS] Field attributes use inline CSS +- patch #2999595, rfe #2998130 [interface] Cleanup navigation frame. 3.3.4.0 (not yet released) - bug #2996161 [import] properly escape import value diff --git a/navigation.php b/navigation.php index 21ef320..909bc00 100644 --- a/navigation.php +++ b/navigation.php @@ -230,7 +230,6 @@ if (! $GLOBALS['server']) { <div id="databaseList"> <form method="post" action="index.php" target="_parent" id="left"> - <label for="lightm_db"><?php echo __('Database'); ?></label> <?php echo PMA_generate_common_hidden_inputs() . "\n"; echo $GLOBALS['pma']->databases->getHtmlSelectGrouped(true, $_SESSION['tmp_user_values']['navi_limit_offset'], $GLOBALS['cfg']['MaxDbList']) . "\n"; @@ -299,19 +298,6 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) { $db_tooltip = $GLOBALS['db']; } - ?> - <a class="item" - href="<?php echo $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . $common_url_query; ?>" - title="<?php echo htmlspecialchars($db_tooltip); ?>" > - <?php - if ($GLOBALS['text_dir'] === 'rtl') { - echo ' <bdo dir="ltr">(' . $table_count . ')</bdo> '; - } - echo '' . htmlspecialchars($disp_name) . ''; - if ($GLOBALS['text_dir'] === 'ltr') { - echo ' <bdo dir="ltr">(' . $table_count . ')</bdo> '; - } - echo '</a>'; if ($table_count) { ?> hooks/post-receive -- phpMyAdmin

14 years, 1 month

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-4661-gfd74529

by Michal Čihař

The branch, master has been updated via fd7452915c8617e9eecf71dffd0b5293cd754674 (commit) via aec0d63ffe5b45e41f76d483bf88db52e396b835 (commit) via 15c6f93a26d203b51613fc2efcff9dadb3852a0f (commit) via 8d8e0c1da9284577677e04962498a4e0215e8a2c (commit) via 5d90fecafc5f6f96460a57ae7f5173d273a5fe9d (commit) via 8110a07e14dd3c5ee06846e9b569df903534fe95 (commit) via e71ad002115ed4d662202f4ec28626c31bf250cf (commit) via 43a4f8b87797190bbe1900a6627c3d2a2b342dfe (commit) via 88a69aadf3c57a2b7e80f50598c336ab8496dd81 (commit) via b9db5c1c5927a2db7926084fa8fd88d221fe684e (commit) via 7d0371cd5eac825e1b177bbac69f11c371dd2b3c (commit) via 1ea7f28d75bd1b4fee3df4a71e52e0fa490da454 (commit) via be87f6c7f2df7c5566355d2bbf73707e36f44c69 (commit) via 919e7e1f0e614212d3d791e3258be12dd971a5ac (commit) via 2d3574773269527c0dff47037fc2f8adfb81c4ac (commit) via d19159b89d1f6a714be23e7e3e7c1556459a2426 (commit) via 8c0b0da285cbbfca6b9cba368c0563ce49a265a1 (commit) via df0a09ecc882c0abcb4ad90501339fa114dfb201 (commit) via 3575d8aa9e922418bb05c88f6abd3c384158f042 (commit) via 8121fb959728125042a269198487fdbce43ca574 (commit) via d3fbab82b592ff330bc77b08570f2e0a6c99ad6e (commit) via 972b724823114db65144fb031eefce5f010636e6 (commit) via 2d6513a328c5d99c3abe49ca056e8a46613070ae (commit) via deddd8d7c3ee3d6ce1427e2aec222694ae6ef2bb (commit) via 14195f42a070814b1746b60269fbee7b07cb8eed (commit) via df7cd4202e181a7aaf2d7cbdc1e074a1756af0ff (commit) via 83fc95c278a58efd00e1e5f239a4ef0a3c222337 (commit) via c3b578ef5d8c1d6c97c592e5e5d8d0ad17d29bb3 (commit) via 7be4f478437c0c2d2fd4356e7ba4546841988f19 (commit) via 8e254c23852ecff83f9849c7d8d3d7c8611844ad (commit) via 310ea29691d620f21ee7e808c977ff2f4f0c9f1d (commit) via 18d1fc4fa4502b744a27696663a900ffbffa4a04 (commit) via dee866c7ea1ea11fa8d251a395c9df9a23dcc41f (commit) from 5dfe98a3786c7aaf55c9dd677da81bfe509c8612 (commit) - Log ----------------------------------------------------------------- commit fd7452915c8617e9eecf71dffd0b5293cd754674 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:49:59 2010 +0200 Translation update done using Pootle. commit aec0d63ffe5b45e41f76d483bf88db52e396b835 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:49:43 2010 +0200 Translation update done using Pootle. commit 15c6f93a26d203b51613fc2efcff9dadb3852a0f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:49:28 2010 +0200 Translation update done using Pootle. commit 8d8e0c1da9284577677e04962498a4e0215e8a2c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:49:02 2010 +0200 Translation update done using Pootle. commit 5d90fecafc5f6f96460a57ae7f5173d273a5fe9d Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:48:46 2010 +0200 Translation update done using Pootle. commit 8110a07e14dd3c5ee06846e9b569df903534fe95 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:47:37 2010 +0200 Translation update done using Pootle. commit e71ad002115ed4d662202f4ec28626c31bf250cf Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:47:19 2010 +0200 Translation update done using Pootle. commit 43a4f8b87797190bbe1900a6627c3d2a2b342dfe Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:46:43 2010 +0200 Translation update done using Pootle. commit 88a69aadf3c57a2b7e80f50598c336ab8496dd81 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:44:47 2010 +0200 Translation update done using Pootle. commit b9db5c1c5927a2db7926084fa8fd88d221fe684e Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:41:18 2010 +0200 Translation update done using Pootle. commit 7d0371cd5eac825e1b177bbac69f11c371dd2b3c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:40:18 2010 +0200 Translation update done using Pootle. commit 1ea7f28d75bd1b4fee3df4a71e52e0fa490da454 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:39:47 2010 +0200 Translation update done using Pootle. commit be87f6c7f2df7c5566355d2bbf73707e36f44c69 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:39:05 2010 +0200 Translation update done using Pootle. commit 919e7e1f0e614212d3d791e3258be12dd971a5ac Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:39:02 2010 +0200 Translation update done using Pootle. commit 2d3574773269527c0dff47037fc2f8adfb81c4ac Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:37:02 2010 +0200 Translation update done using Pootle. commit d19159b89d1f6a714be23e7e3e7c1556459a2426 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:35:09 2010 +0200 Translation update done using Pootle. commit 8c0b0da285cbbfca6b9cba368c0563ce49a265a1 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:34:43 2010 +0200 Translation update done using Pootle. commit df0a09ecc882c0abcb4ad90501339fa114dfb201 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:33:18 2010 +0200 Translation update done using Pootle. commit 3575d8aa9e922418bb05c88f6abd3c384158f042 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:32:37 2010 +0200 Translation update done using Pootle. commit 8121fb959728125042a269198487fdbce43ca574 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:32:03 2010 +0200 Translation update done using Pootle. commit d3fbab82b592ff330bc77b08570f2e0a6c99ad6e Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:31:41 2010 +0200 Translation update done using Pootle. commit 972b724823114db65144fb031eefce5f010636e6 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:30:12 2010 +0200 Translation update done using Pootle. commit 2d6513a328c5d99c3abe49ca056e8a46613070ae Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:29:38 2010 +0200 Translation update done using Pootle. commit deddd8d7c3ee3d6ce1427e2aec222694ae6ef2bb Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:29:23 2010 +0200 Translation update done using Pootle. commit 14195f42a070814b1746b60269fbee7b07cb8eed Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:28:13 2010 +0200 Translation update done using Pootle. commit df7cd4202e181a7aaf2d7cbdc1e074a1756af0ff Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:27:45 2010 +0200 Translation update done using Pootle. commit 83fc95c278a58efd00e1e5f239a4ef0a3c222337 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:26:14 2010 +0200 Translation update done using Pootle. commit c3b578ef5d8c1d6c97c592e5e5d8d0ad17d29bb3 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:25:45 2010 +0200 Translation update done using Pootle. commit 7be4f478437c0c2d2fd4356e7ba4546841988f19 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:25:23 2010 +0200 Translation update done using Pootle. commit 8e254c23852ecff83f9849c7d8d3d7c8611844ad Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:23:47 2010 +0200 Translation update done using Pootle. commit 310ea29691d620f21ee7e808c977ff2f4f0c9f1d Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:23:34 2010 +0200 Translation update done using Pootle. commit 18d1fc4fa4502b744a27696663a900ffbffa4a04 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:23:10 2010 +0200 Translation update done using Pootle. commit dee866c7ea1ea11fa8d251a395c9df9a23dcc41f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:19:41 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/zh_CN.po | 103 ++++++++++++++++------------------------------------------ 1 files changed, 29 insertions(+), 74 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 742c9bf..68ad257 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-05-31 14:33-0400\n" -"PO-Revision-Date: 2010-05-17 04:57+0200\n" +"PO-Revision-Date: 2010-06-03 03:49+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: chinese_simplified <zh_CN(a)li.org>\n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.1\n" @@ -376,7 +376,7 @@ msgid "Last check" msgstr "最后检查" #: db_printview.php:222 db_structure.php:480 -#, fuzzy, php-format +#, php-format #| msgid "%s table(s)" msgid "%s table" msgid_plural "%s tables" @@ -451,10 +451,9 @@ msgid "Add/Delete criteria rows" msgstr "添加/删除条件行" #: db_qbe.php:596 -#, fuzzy #| msgid "Add/Delete Field Columns" msgid "Add/Delete columns" -msgstr "添加/删除字段列" +msgstr "添加/删除字段" #: db_qbe.php:609 db_qbe.php:634 msgid "Update Query" @@ -988,7 +987,6 @@ msgid "Please select the primary key or a unique key" msgstr "请选择主键或唯一键" #: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 -#, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "选择要显示的字段" @@ -1946,7 +1944,6 @@ msgid "No Privileges" msgstr "无权限" #: libraries/display_create_table.lib.php:41 -#, fuzzy #| msgid "Table must have at least one field." msgid "Table must have at least one column." msgstr "数据表至少要有一个字段。" @@ -1957,7 +1954,6 @@ msgid "Create table on database %s" msgstr "在数据库 %s 中新建一张数据表" #: libraries/display_create_table.lib.php:57 -#, fuzzy #| msgid "Number of fields" msgid "Number of columns" msgstr "字段数" @@ -1967,10 +1963,10 @@ msgid "Could not load export plugins, please check your installation!" msgstr "无法加载导出插件，请检查安装！" #: libraries/display_export.lib.php:107 -#, fuzzy, php-format +#, php-format #| msgid "Dump %s row(s) starting at record # %s" msgid "Dump %s row(s) starting at row # %s" -msgstr "转存 %s 行，从记录 # %s 开始。" +msgstr "从 # %2$s 行开始转储 %1$s 行" #: libraries/display_export.lib.php:115 msgid "Dump all rows" @@ -2118,7 +2114,6 @@ msgstr "" "入大文件时是个很好的方法。" #: libraries/display_import.lib.php:239 setup/lib/messages.inc.php:161 -#, fuzzy #| msgid "Number of records (queries) to skip from start" msgid "Number of queries to skip from start" msgstr "跳过查询的数量" @@ -2238,7 +2233,6 @@ msgid "Relational key" msgstr "关联键" #: libraries/display_tbl.lib.php:588 -#, fuzzy #| msgid "Relational display field" msgid "Relational display column" msgstr "关联显示字段" @@ -2638,24 +2632,21 @@ msgstr "CSV" #: libraries/export/csv.php:21 libraries/import/csv.php:27 #: libraries/import/csv.php:59 libraries/import/ldi.php:40 -#, fuzzy #| msgid "Lines terminated by" msgid "Columns terminated by" -msgstr "换行符" +msgstr "字段分隔符" #: libraries/export/csv.php:22 libraries/import/csv.php:28 #: libraries/import/csv.php:71 libraries/import/ldi.php:41 -#, fuzzy #| msgid "Fields enclosed by" msgid "Columns enclosed by" -msgstr "文字分隔符" +msgstr "内容分隔符" #: libraries/export/csv.php:23 libraries/import/csv.php:29 #: libraries/import/csv.php:75 libraries/import/ldi.php:42 -#, fuzzy #| msgid "Fields escaped by" msgid "Columns escaped by" -msgstr "字段转义符" +msgstr "内容转义符" #: libraries/export/csv.php:24 libraries/import/csv.php:30 #: libraries/import/csv.php:79 libraries/import/ldi.php:43 @@ -2671,20 +2662,18 @@ msgid "Replace NULL by" msgstr "将 NULL 替换为" #: libraries/export/csv.php:26 libraries/export/excel.php:23 -#, fuzzy #| msgid "Remove CRLF characters within fields" msgid "Remove CRLF characters within columns" -msgstr "删除字段中的换行符" +msgstr "删除字段中的回车换行符" #: libraries/export/csv.php:27 libraries/export/excel.php:24 #: libraries/export/htmlword.php:26 libraries/export/latex.php:57 #: libraries/export/ods.php:24 libraries/export/odt.php:50 #: libraries/export/texytext.php:34 libraries/export/xls.php:24 #: libraries/export/xlsx.php:24 -#, fuzzy #| msgid "Put fields names in the first row" msgid "Put columns names in the first row" -msgstr "将字段名放在第一行" +msgstr "首行保存字段名" #: libraries/export/excel.php:18 msgid "CSV for MS Excel" @@ -2819,7 +2808,6 @@ msgid "Database export options" msgstr "数据库导出选项" #: libraries/export/sql.php:80 -#, fuzzy #| msgid "Enclose table and field names with backquotes" msgid "Enclose table and column names with backquotes" msgstr "给数据表名及字段名加上反引号" @@ -3039,7 +3027,7 @@ msgid "Invalid format of CSV input on line %d." msgstr "CSV 输入的第 %d 行格式有错。" #: libraries/import/csv.php:312 -#, fuzzy, php-format +#, php-format #| msgid "Invalid field count in CSV input on line %d." msgid "Invalid column count in CSV input on line %d." msgstr "CSV 输入的第 %d 行字段数有错。" @@ -4358,10 +4346,9 @@ msgid "Run SQL query/queries on database %s" msgstr "在数据库 %s 运行 SQL 查询" #: libraries/sql_query_form.lib.php:317 -#, fuzzy #| msgid "Column names" msgid "Columns" -msgstr "字段名" +msgstr "字段" #: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" @@ -4473,7 +4460,6 @@ msgid "Length/Values" msgstr "长度/值" #: libraries/tbl_properties.inc.php:105 -#, fuzzy #| msgid "" #| "If field type is \"enum\" or \"set\", please enter the values using this " #| "format: 'a','b','c'... If you ever need to put a backslash (\"\\\") " @@ -4485,9 +4471,8 @@ msgid "" "a single quote (\"'\") amongst those values, precede it with a backslash " "(for example '\\\\xyz' or 'a\\'b')." msgstr "" -"如字段类型是“enum”或“set”，请使用以下的格式输入：'a','b','c'... 如果您需" -"要在值中输入反斜线(“\\”)或者单引号(“'”)，请在前面加上反斜线(如 '\\\\xyz' 或 " -"'a\\'b')。" +"如字段类型是“enum”或“set”，请使用以下格式输入：'a','b','c'... 如果需要输入反斜杠(“\\”)或单引号(“'”)，请在前面加上反斜杠(如 '\\\\xyz' 或 'a\\'b')。" #: libraries/tbl_properties.inc.php:106 msgid "" @@ -4560,7 +4545,6 @@ msgid "Add %s column(s)" msgstr "增加字段" #: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 -#, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." msgstr "至少要添加一个字段。" @@ -4570,7 +4554,6 @@ msgid "Event" msgstr "事件" #: libraries/transformations/application_octetstream__download.inc.php:10 -#, fuzzy #| msgid "" #| "Displays a link to download the binary data of the field. You can use the " #| "first option to specify the filename, or use the second option as the " @@ -4582,8 +4565,7 @@ msgid "" "of a column which contains the filename. If you use the second option, you " "need to set the first option to the empty string." msgstr "" -"字段中显示一个二进制数据的下载连接。第一个选项是文件名，或使用第二个选项，用" -"表中的一个字段作为文件名。如果你使用第二个选项那么第一个选项必须留空。" +"字段中显示一个二进制数据的下载连接。第一个选项是文件名，或使用第二个选项，用表中的一个字段值作为文件名。如果想使用字段值作为文件名，第一个选项必须留空。" #: libraries/transformations/application_octetstream__hex.inc.php:10 msgid "" @@ -4631,7 +4613,6 @@ msgstr "" "档)所到的结果是不一样的。" #: libraries/transformations/text_plain__external.inc.php:10 -#, fuzzy #| msgid "" #| "LINUX ONLY: Launches an external application and feeds it the field data " #| "via standard input. Returns the standard output of the application. The " @@ -4655,27 +4636,21 @@ msgid "" "will prevent wrapping and ensure that the output appears all on one line " "(Default 1)." msgstr "" -"仅 LINUX：调用外部程序并通过标准输入填充字段数据。返回此应用程序的标准输出。" -"默认为 Tidy，可以很好的打印 HTML 代码。为了安全起见，您需要手动编辑文件 " -"libraries/transformations/text_plain__external.inc.php 然后插入允许您运行的工" -"具。第一个选项是您想要使用的程序编号，而第二个选项是程序的参数。第三个参数如" -"果设为 1 的话将会用 htmlspecialchars() 转换其输出 (默认为 1)。第四个参数如果" -"设为 1 的话，将禁止换行，确保所有内容显示在一行中 (默认为 1)" +"仅 LINUX：调用外部程序并通过标准输入传入字段数据。返回此应用程序的标准输出。默认为 Tidy，可以很好的打印 HTML " +"代码。为了安全起见，您需要手动编辑 libraries/transformations/text_plain__external.inc.php " +"文件来加入可以运行的工具。第一个选项是您想要使用的程序编号，第二个选项是程序的参数。第三个参数如果设为 1 的话将会用 " +"htmlspecialchars() 处理输出 (默认为 1)。第四个参数如果设为 1 的话，将禁止换行，确保所有内容显示在一行中 (默认为 1)。" #: libraries/transformations/text_plain__formatted.inc.php:10 -#, fuzzy #| msgid "" #| "Displays the contents of the field as-is, without running it through " #| "htmlspecialchars(). That is, the field is assumed to contain valid HTML." msgid "" "Displays the contents of the column as-is, without running it through " "htmlspecialchars(). That is, the column is assumed to contain valid HTML." -msgstr "" -"显示字段的原始内容，不使用 htmlspecialchars() 处理。即假定内容为合法的 HTML " -"代码。" +msgstr "显示字段的原始内容，不使用 htmlspecialchars() 处理。即假定内容为合法的 HTML 代码。" #: libraries/transformations/text_plain__imagelink.inc.php:10 -#, fuzzy #| msgid "" #| "Displays an image and a link; the field contains the filename. The first " #| "option is a URL prefix like \"http://www.example.com/\". The second and " @@ -4685,11 +4660,10 @@ msgid "" "option is a URL prefix like \"http://www.example.com/\". The second and " "third options are the width and the height in pixels." msgstr "" -"显示图像和链接，字段内包含文件名。第一个选项是类似“http://www.example.com/”这" -"样的 URL 前缀，第二和第三个选项是以像素为单位的宽度和高度。" +"显示图像和链接，字段内包含文件名。第一个选项是类似“http://www.example.com/”这样的 URL " +"前缀。第二和第三个选项是以像素为单位的宽度和高度。" #: libraries/transformations/text_plain__link.inc.php:10 -#, fuzzy #| msgid "" #| "Displays a link; the field contains the filename. The first option is a " #| "URL prefix like \"http://www.example.com/\". The second option is a title " @@ -4698,9 +4672,7 @@ msgid "" "Displays a link; the column contains the filename. The first option is a URL " "prefix like \"http://www.example.com/\". The second option is a title for " "the link." -msgstr "" -"显示链接，字段内包含文件名。第一个选项是类似“http://www.example.com/”这样的 " -"URL 前缀，第二个选项是链接的标题 (title)。" +msgstr "显示链接，字段内包含文件名。第一个选项是类似“http://www.example.com/”这样的 URL 前缀。第二个选项是链接的标题。" #: libraries/transformations/text_plain__longToIpv4.inc.php:10 msgid "" @@ -5045,7 +5017,6 @@ msgid "To select relation, click :" msgstr "要选择关系，点击：" #: pmd_help.php:29 -#, fuzzy #| msgid "" #| "The display field is shown in pink. To set/unset a field as the display " #| "field, click the \"Choose field to display\" icon, then click on the " @@ -5054,9 +5025,7 @@ msgid "" "The display column is shown in pink. To set/unset a column as the display " "column, click the \"Choose column to display\" icon, then click on the " "appropriate column name." -msgstr "" -"显示的字段为粉红色。要设置或取消显示的字段，点击“选择显示字段”图标，然后选择" -"需要的字段名字。" +msgstr "显示的字段为粉红色。要设置/取消显示的字段，点击“选择显示字段”图标，然后选择需要的字段名。" #: pmd_pdf.php:63 msgid "Page has been created" @@ -5235,10 +5204,9 @@ msgid "Do not change the password" msgstr "保持原密码" #: server_privileges.php:804 server_privileges.php:2166 -#, fuzzy #| msgid "No user(s) found." msgid "No user found." -msgstr "找不到用户。" +msgstr "未找到用户。" #: server_privileges.php:848 #, php-format @@ -5583,7 +5551,6 @@ msgid "Error management:" msgstr "错误管理:" #: server_replication.php:334 -#, fuzzy #| msgid "Skipping error(s) might lead into unsynchronized master and slave!" msgid "Skipping errors might lead into unsynchronized master and slave!" msgstr "忽略错误可能导致主从服务器间不同步！" @@ -6117,7 +6084,6 @@ msgstr "" "Documentation.html#setup_script]文档[/a]中有说明。否则你只能下载或显示配置。" #: setup/lib/messages.inc.php:35 -#, fuzzy #| msgid "" #| "Defines which type of editing controls should be used for CHAR and " #| "VARCHAR fields; [kbd]input[/kbd] - allows limiting of input length, [kbd]" @@ -6127,11 +6093,10 @@ msgid "" "columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/" "kbd] - allows newlines in columns" msgstr "" -"定义编辑 CHAR 和 VARCHAR 类型字段时应使用何种控件，[kbd]输入框 (input)[/kbd] " -"- 允许限制输入长度，[kbd]文本框 (textarea)[/kbd] - 允许输入多行数据" +"定义编辑 CHAR 和 VARCHAR 类型字段时应使用何种控件，[kbd]输入框 (input)[/kbd] - 可以限制输入长度，[kbd]文本框 " +"(textarea)[/kbd] - 可以输入多行数据" #: setup/lib/messages.inc.php:36 -#, fuzzy #| msgid "CHAR fields editing" msgid "CHAR columns editing" msgstr "编辑 CHAR 类型字段" @@ -6831,16 +6796,13 @@ msgid "GZip output buffering" msgstr "GZip 输出缓冲" #: setup/lib/messages.inc.php:217 -#, fuzzy #| msgid "" #| "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, " #| "DATETIME and TIMESTAMP, ascending order otherwise" msgid "" "[kbd]SMART[/kbd] - i.e. descending order for columns of type TIME, DATE, " "DATETIME and TIMESTAMP, ascending order otherwise" -msgstr "" -"[kbd]SMART[/kbd] - 如：对 TIME、DATE、DATETIME 和 TIMESTAMP 类型的字段递减排" -"序，其他字段递增" +msgstr "[kbd]SMART[/kbd] - 如：对 TIME、DATE、DATETIME 和 TIMESTAMP 类型的字段递减排序，其他字段递增" #: setup/lib/messages.inc.php:218 msgid "Default sorting order" @@ -6859,13 +6821,11 @@ msgid "Iconic table operations" msgstr "数据表操作显示" #: setup/lib/messages.inc.php:224 -#, fuzzy #| msgid "Disallow BLOB and BINARY fields from editing" msgid "Disallow BLOB and BINARY columns from editing" msgstr "禁止编辑 BLOB 和 BINARY 类型字段" #: setup/lib/messages.inc.php:225 -#, fuzzy #| msgid "Protect binary fields" msgid "Protect binary columns" msgstr "保护二进制字段" @@ -8292,8 +8252,3 @@ msgstr "将视图改名为" #~ msgstr "" #~ "无法在发生错误时创建会话，请检查 PHP 或网站服务器日志，并正确配置 PHP 安" #~ "装。" - -#, fuzzy -#~| msgid "Import currencies ($5.00 to 5.00)" -#~ msgid "Import currencies (.00 to 5.00)" -#~ msgstr "转换货币 (如: $5.00 将被转换为 5.00)" hooks/post-receive -- phpMyAdmin

14 years, 1 month

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-4628-g5dfe98a

by Marc Delisle

The branch, master has been updated via 5dfe98a3786c7aaf55c9dd677da81bfe509c8612 (commit) via 5d525e89ebc32eb19fc6266b96988d8df0d22ff4 (commit) from 345f6d21d09c727980630a460251beb86f84170f (commit) - Log ----------------------------------------------------------------- commit 5dfe98a3786c7aaf55c9dd677da81bfe509c8612 Merge: 345f6d21d09c727980630a460251beb86f84170f 5d525e89ebc32eb19fc6266b96988d8df0d22ff4 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jun 2 12:37:19 2010 -0400 bug [privileges] List of tables not shown when the db name has a wildcard ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + server_privileges.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index e186f92..1c34496 100644 --- a/ChangeLog +++ b/ChangeLog @@ -93,6 +93,7 @@ $Id$ - bug #2986383 [parser] Not all data being shown / counted - bug [synchronize] Rows were deleted in target table regardless of the "Would you like to delete..." option +- bug [privileges] List of tables not shown when the db name has a wildcard 3.3.3.0 (2010-05-10) - patch #2982480 [navi] Do not group if there would be one table in group, diff --git a/server_privileges.php b/server_privileges.php index 3340206..87c71b8 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1905,7 +1905,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs } else { echo ' <input type="hidden" name="dbname" value="' . htmlspecialchars($dbname) . '"/>' . "\n" . ' <label for="text_tablename">' . __('Add privileges on the following table') . ':</label>' . "\n"; - if ($res = @PMA_DBI_try_query('SHOW TABLES FROM ' . PMA_backquote($dbname) . ';', null, PMA_DBI_QUERY_STORE)) { + if ($res = @PMA_DBI_try_query('SHOW TABLES FROM ' . PMA_backquote(PMA_unescape_mysql_wildcards($dbname)) . ';', null, PMA_DBI_QUERY_STORE)) { $pred_tbl_array = array(); while ($row = PMA_DBI_fetch_row($res)) { if (!isset($found_rows) || !in_array($row[0], $found_rows)) { hooks/post-receive -- phpMyAdmin

14 years, 1 month

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_3-31-g5d525e8

by Marc Delisle

The branch, QA_3_3 has been updated via 5d525e89ebc32eb19fc6266b96988d8df0d22ff4 (commit) from 432379c87d6cb06a330c1928b3ec676da886a5f4 (commit) - Log ----------------------------------------------------------------- commit 5d525e89ebc32eb19fc6266b96988d8df0d22ff4 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jun 2 12:32:54 2010 -0400 bug [privileges] List of tables not shown when the db name has a wildcard ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + server_privileges.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f4d9fb5..dca8ffe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #2986383 [parser] Not all data being shown / counted - bug [synchronize] Rows were deleted in target table regardless of the "Would you like to delete..." option +- bug [privileges] List of tables not shown when the db name has a wildcard 3.3.3.0 (2010-05-10) - patch #2982480 [navi] Do not group if there would be one table in group, diff --git a/server_privileges.php b/server_privileges.php index 0470ffe..fd2796f 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1883,7 +1883,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs } else { echo ' <input type="hidden" name="dbname" value="' . htmlspecialchars($dbname) . '"/>' . "\n" . ' <label for="text_tablename">' . $GLOBALS['strAddPrivilegesOnTbl'] . ':</label>' . "\n"; - if ($res = @PMA_DBI_try_query('SHOW TABLES FROM ' . PMA_backquote($dbname) . ';', null, PMA_DBI_QUERY_STORE)) { + if ($res = @PMA_DBI_try_query('SHOW TABLES FROM ' . PMA_backquote(PMA_unescape_mysql_wildcards($dbname)) . ';', null, PMA_DBI_QUERY_STORE)) { $pred_tbl_array = array(); while ($row = PMA_DBI_fetch_row($res)) { if (!isset($found_rows) || !in_array($row[0], $found_rows)) { hooks/post-receive -- phpMyAdmin

14 years, 1 month

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-4626-g345f6d2

by Michal Čihař

The branch, master has been updated via 345f6d21d09c727980630a460251beb86f84170f (commit) via 146aaa8e73e4477c7963f99922aff4f224a9f980 (commit) via b5e6c9f8aac6a2ed8a502e06c1ff5d39db706260 (commit) via 69a99d86712fdc515bc31e40080b20586e05ff36 (commit) via 41da184967ef7d99703642fce4e62bd32300ca9e (commit) via e5aa9b36731e30bde59fc630570634dde75e32ef (commit) via 22626e8499521921fc5aed1e8930f55ace7b4c0a (commit) from 39c73a94ee45790fd39190e412d7a007fcca1c2a (commit) - Log ----------------------------------------------------------------- commit 345f6d21d09c727980630a460251beb86f84170f Merge: 146aaa8e73e4477c7963f99922aff4f224a9f980 39c73a94ee45790fd39190e412d7a007fcca1c2a Author: Pootle server <pootle(a)cihar.com> Date: Tue Jun 1 20:40:14 2010 +0200 Merge remote branch 'origin/master' commit 146aaa8e73e4477c7963f99922aff4f224a9f980 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 18:58:09 2010 +0200 Translation update done using Pootle. commit b5e6c9f8aac6a2ed8a502e06c1ff5d39db706260 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 18:58:03 2010 +0200 Translation update done using Pootle. commit 69a99d86712fdc515bc31e40080b20586e05ff36 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 18:57:53 2010 +0200 Translation update done using Pootle. commit 41da184967ef7d99703642fce4e62bd32300ca9e Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 18:57:42 2010 +0200 Translation update done using Pootle. commit e5aa9b36731e30bde59fc630570634dde75e32ef Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 18:57:17 2010 +0200 Translation update done using Pootle. commit 22626e8499521921fc5aed1e8930f55ace7b4c0a Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 18:57:00 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/sl.po | 21 ++++++++------------- 1 files changed, 8 insertions(+), 13 deletions(-) diff --git a/po/sl.po b/po/sl.po index 6fb2b53..5f2e589 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-05-31 14:33-0400\n" -"PO-Revision-Date: 2010-06-01 01:03+0200\n" +"PO-Revision-Date: 2010-06-01 18:58+0200\n" "Last-Translator: Domen <dbc334(a)gmail.com>\n" "Language-Team: slovenian <sl(a)li.org>\n" "Language: sl\n" @@ -7492,10 +7492,9 @@ msgstr "" "podpore; predlagano: [kbd]pma_table_info[/kbd]" #: setup/lib/messages.inc.php:321 -#, fuzzy #| msgid "Display fields table" msgid "Display columns table" -msgstr "Tabela prikaznih polj" +msgstr "Tabela prikaznih stolpcev" #: setup/lib/messages.inc.php:323 msgid "User for config auth" @@ -7526,11 +7525,10 @@ msgid "Verbose name of this server" msgstr "Razširjeno ime tega strežnika" #: setup/lib/messages.inc.php:329 -#, fuzzy #| msgid "" #| "Whether a user should be displayed a "show all (records)" button" msgid "Whether a user should be displayed a "show all (rows)" button" -msgstr "Ali se naj uporabniku prikaže gumb "prikaži vse (zapise)"" +msgstr "Ali se naj uporabniku prikaže gumb "prikaži vse (vrstice)"" #: setup/lib/messages.inc.php:330 msgid "Allow to display all the rows" @@ -7821,10 +7819,9 @@ msgid "Ignore" msgstr "Prezri" #: tbl_change.php:728 -#, fuzzy #| msgid " Because of its length, this field might not be editable " msgid " Because of its length, this column might not be editable " -msgstr " Zaradi njegove dolžine polja morda ne bo mogoče urejati " +msgstr " Zaradi njegove dolžine stolpca morda ne bo mogoče urejati " #: tbl_change.php:888 msgid "Remove BLOB Repository Reference" @@ -8111,10 +8108,9 @@ msgid "Operator" msgstr "Operator" #: tbl_select.php:270 -#, fuzzy #| msgid "Select fields (at least one):" msgid "Select columns (at least one):" -msgstr "Izberite polja (vsaj eno):" +msgstr "Izberite stolpce (vsaj enega):" #: tbl_select.php:288 msgid "Add search conditions (body of the \"where\" clause):" @@ -8138,10 +8134,10 @@ msgid "None" msgstr "Brez" #: tbl_structure.php:374 -#, fuzzy, php-format +#, php-format #| msgid "Table %s has been dropped" msgid "Column %s has been dropped" -msgstr "Tabela %s je zavržena" +msgstr "Stolpec %s je zavržen" #: tbl_structure.php:385 #, php-format @@ -8162,10 +8158,9 @@ msgid "Propose table structure" msgstr "Predlagaj strukturo tabele" #: tbl_structure.php:540 -#, fuzzy #| msgid "Add new field" msgid "Add field" -msgstr "Dodaj novo polje" +msgstr "Dodaj polje" #: tbl_structure.php:554 msgid "At End of Table" hooks/post-receive -- phpMyAdmin

14 years, 1 month

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-4619-g39c73a9

by Marc Delisle

The branch, master has been updated via 39c73a94ee45790fd39190e412d7a007fcca1c2a (commit) via 432379c87d6cb06a330c1928b3ec676da886a5f4 (commit) via 153515c7f56f45bd21e2dd4081ba18efe19b991b (commit) from 1e155e3a32e976c0294d522a255ad2a9bea7ea65 (commit) - Log ----------------------------------------------------------------- commit 39c73a94ee45790fd39190e412d7a007fcca1c2a Merge: 1e155e3a32e976c0294d522a255ad2a9bea7ea65 432379c87d6cb06a330c1928b3ec676da886a5f4 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 12:43:46 2010 -0400 bug [synchronize] Rows were deleted in target table regardless of the "Would you like to delete..." option ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ server_synchronize.php | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 832f8ad..e186f92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -91,6 +91,8 @@ $Id$ + [lang] Updated lot of translation based on work done in master branch. - bug #3008411 [databases] Last dropped database remains active in navi - bug #2986383 [parser] Not all data being shown / counted +- bug [synchronize] Rows were deleted in target table regardless of the + "Would you like to delete..." option 3.3.3.0 (2010-05-10) - patch #2982480 [navi] Do not group if there would be one table in group, diff --git a/server_synchronize.php b/server_synchronize.php index b609d34..c5d8077 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -1023,9 +1023,9 @@ if (isset($_REQUEST['synchronize_db'])) { if (isset($alter_str_array[$p])) { PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, $source_columns, $alter_str_array, $matching_tables_fields, $criteria, $matching_tables_keys, $target_tables_keys, $p, true); - unset($alter_str_array[$p]); - } - if (isset($add_column_array[$p])) { + unset($alter_str_array[$p]); + } + if (! empty($add_column_array[$p])) { PMA_findDeleteRowsFromTargetTables($delete_array, $matching_tables, $p, $target_tables_keys, $matching_tables_keys, $trg_db, $trg_link, $src_db, $src_link); hooks/post-receive -- phpMyAdmin

14 years, 1 month

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_3-30-g432379c

by Marc Delisle

The branch, QA_3_3 has been updated via 432379c87d6cb06a330c1928b3ec676da886a5f4 (commit) from 153515c7f56f45bd21e2dd4081ba18efe19b991b (commit) - Log ----------------------------------------------------------------- commit 432379c87d6cb06a330c1928b3ec676da886a5f4 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 12:34:57 2010 -0400 bug [synchronize] Rows were deleted in target table regardless of the "Would you like to delete..." option ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ server_synchronize.php | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 23a8c38..f4d9fb5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA + [lang] Updated lot of translation based on work done in master branch. - bug #3008411 [databases] Last dropped database remains active in navi - bug #2986383 [parser] Not all data being shown / counted +- bug [synchronize] Rows were deleted in target table regardless of the + "Would you like to delete..." option 3.3.3.0 (2010-05-10) - patch #2982480 [navi] Do not group if there would be one table in group, diff --git a/server_synchronize.php b/server_synchronize.php index 7d84ce7..8e4a701 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -1037,7 +1037,7 @@ if (isset($_REQUEST['synchronize_db'])) { $criteria, $matching_tables_keys, $target_tables_keys, $p, true); unset($alter_str_array[$p]); } - if (isset($add_column_array[$p])) { + if (! empty($add_column_array[$p])) { PMA_findDeleteRowsFromTargetTables($delete_array, $matching_tables, $p, $target_tables_keys, $matching_tables_keys, $trg_db, $trg_link, $src_db, $src_link); hooks/post-receive -- phpMyAdmin

14 years, 1 month

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-4616-g1e155e3

by Michal Čihař

The branch, master has been updated via 1e155e3a32e976c0294d522a255ad2a9bea7ea65 (commit) via 06fa40807796324b6e13fc4d54a043f65dd4c4aa (commit) via 73e60cd44b350c66bec39ca4d24cf4c9dc3210b6 (commit) via c830e16199aad253443f2130854b14b278f8b2fb (commit) via 159dcb7b27e5e14a6fe65978d5e86e03acfb0a2d (commit) via 0998e8a865fdfdf01f8574bc01da1d007838a348 (commit) via 80594018b474c20f6340e11e476e90ed3ef5837d (commit) via 0b13e0e9aaa9012bec34a2e8c09fddec861fd79d (commit) via edc3e6bb684a9b7b3958fd4c78b5ec97fb2c41db (commit) via a22d0bbc468df6741aa04590c4c36eefc7bccd50 (commit) via 1aa54ff904af1f61efdd6fb093116d5d24b9b6b4 (commit) via 9703228158e50bcdd4adbd2e30b1f2431d7c0fc2 (commit) via 1a31dc40b29f5cc05b6bb041bf7df6d1abcdea0b (commit) via a0f854508f31886ab149d7b522f50d82393a4010 (commit) via 66dd74336e5d86e316370a2cea2d8ada5e1426ea (commit) via 26a17f5751e6112958603d3eff344849b91421bf (commit) via db6d3123a32d43ca083f450309ba13ff5bba4b60 (commit) via c1d780045266bd753c3d87d6aa281b38b0e83960 (commit) via 013f8af2b465a3e9e8b9b631d3eee6136876f58e (commit) via dd04b6fa0d351e2087c58697d171e0d14ad43461 (commit) via c83f187958680fc43fa89ba335c221293e961db3 (commit) via 738ff728ccb80fff079282acc8a78e92116c19e9 (commit) via 04acaef4acf22cd658faab503f7a40d129e4d292 (commit) via ed55f34d9ff884ed298914c576851741d36f2015 (commit) via 6eba260cc7949cc6c041f255b303ff30521aff76 (commit) from 858d4308349dfd49afbd4b58a7ce2ad160e5f5c7 (commit) - Log ----------------------------------------------------------------- commit 1e155e3a32e976c0294d522a255ad2a9bea7ea65 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:27:21 2010 +0200 Translation update done using Pootle. commit 06fa40807796324b6e13fc4d54a043f65dd4c4aa Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:27:11 2010 +0200 Translation update done using Pootle. commit 73e60cd44b350c66bec39ca4d24cf4c9dc3210b6 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:26:56 2010 +0200 Translation update done using Pootle. commit c830e16199aad253443f2130854b14b278f8b2fb Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:26:35 2010 +0200 Translation update done using Pootle. commit 159dcb7b27e5e14a6fe65978d5e86e03acfb0a2d Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:26:20 2010 +0200 Translation update done using Pootle. commit 0998e8a865fdfdf01f8574bc01da1d007838a348 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:25:26 2010 +0200 Translation update done using Pootle. commit 80594018b474c20f6340e11e476e90ed3ef5837d Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:25:11 2010 +0200 Translation update done using Pootle. commit 0b13e0e9aaa9012bec34a2e8c09fddec861fd79d Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:24:52 2010 +0200 Translation update done using Pootle. commit edc3e6bb684a9b7b3958fd4c78b5ec97fb2c41db Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:24:36 2010 +0200 Translation update done using Pootle. commit a22d0bbc468df6741aa04590c4c36eefc7bccd50 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:24:25 2010 +0200 Translation update done using Pootle. commit 1aa54ff904af1f61efdd6fb093116d5d24b9b6b4 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:24:13 2010 +0200 Translation update done using Pootle. commit 9703228158e50bcdd4adbd2e30b1f2431d7c0fc2 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:24:07 2010 +0200 Translation update done using Pootle. commit 1a31dc40b29f5cc05b6bb041bf7df6d1abcdea0b Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:23:53 2010 +0200 Translation update done using Pootle. commit a0f854508f31886ab149d7b522f50d82393a4010 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:22:45 2010 +0200 Translation update done using Pootle. commit 66dd74336e5d86e316370a2cea2d8ada5e1426ea Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:22:37 2010 +0200 Translation update done using Pootle. commit 26a17f5751e6112958603d3eff344849b91421bf Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:22:19 2010 +0200 Translation update done using Pootle. commit db6d3123a32d43ca083f450309ba13ff5bba4b60 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:22:04 2010 +0200 Translation update done using Pootle. commit c1d780045266bd753c3d87d6aa281b38b0e83960 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:21:44 2010 +0200 Translation update done using Pootle. commit 013f8af2b465a3e9e8b9b631d3eee6136876f58e Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:21:19 2010 +0200 Translation update done using Pootle. commit dd04b6fa0d351e2087c58697d171e0d14ad43461 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:20:41 2010 +0200 Translation update done using Pootle. commit c83f187958680fc43fa89ba335c221293e961db3 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:19:59 2010 +0200 Translation update done using Pootle. commit 738ff728ccb80fff079282acc8a78e92116c19e9 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:17:18 2010 +0200 Translation update done using Pootle. commit 04acaef4acf22cd658faab503f7a40d129e4d292 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:17:04 2010 +0200 Translation update done using Pootle. commit ed55f34d9ff884ed298914c576851741d36f2015 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:16:43 2010 +0200 Translation update done using Pootle. commit 6eba260cc7949cc6c041f255b303ff30521aff76 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:16:18 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/fr.po | 122 +++++++++++++++++++++++++------------------------------------ 1 files changed, 50 insertions(+), 72 deletions(-) diff --git a/po/fr.po b/po/fr.po index 2942d70..db0a838 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-05-31 14:33-0400\n" -"PO-Revision-Date: 2010-06-01 16:16+0200\n" +"PO-Revision-Date: 2010-06-01 16:27+0200\n" "Last-Translator: Marc <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" "Language: fr\n" @@ -4538,10 +4538,9 @@ msgid "Run SQL query/queries on database %s" msgstr "Exécuter une ou des requêtes sur la base %s" #: libraries/sql_query_form.lib.php:317 -#, fuzzy #| msgid "Column names" msgid "Columns" -msgstr "Nom des colonnes" +msgstr "Colonnes" #: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" @@ -4657,7 +4656,6 @@ msgid "Length/Values" msgstr "Taille/Valeurs*" #: libraries/tbl_properties.inc.php:105 -#, fuzzy #| msgid "" #| "If field type is \"enum\" or \"set\", please enter the values using this " #| "format: 'a','b','c'... If you ever need to put a backslash (\"\\\") " @@ -4669,8 +4667,8 @@ msgid "" "a single quote (\"'\") amongst those values, precede it with a backslash " "(for example '\\\\xyz' or 'a\\'b')." msgstr "" -"Les différentes valeurs des champs de type enum/set sont à spécifier sous la " -"forme 'a','b','c'... Pour utiliser un antislash(\"\\\") ou une " +"Les différentes valeurs des colonnes de type enum/set sont à spécifier sous " +"la forme 'a','b','c'... Pour utiliser un antislash(\"\\\") ou une " "apostrophe (\"'\") dans l'une de ces valeurs, faites-le précéder d'un " "antislash (par exemple '\\\\xyz' ou 'a\\'b')." @@ -4747,23 +4745,21 @@ msgid "Save" msgstr "Sauvegarder" #: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 -#, fuzzy, php-format +#, php-format #| msgid "Add column(s)" msgid "Add %s column(s)" -msgstr "Ajouter des colonnes" +msgstr "Ajouter %s colonne(s)" #: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 -#, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." -msgstr "Vous devez ajouter au moins un champ" +msgstr "Vous devez ajouter au moins une colonne." #: libraries/tbl_triggers.lib.php:29 msgid "Event" msgstr "Événement" #: libraries/transformations/application_octetstream__download.inc.php:10 -#, fuzzy #| msgid "" #| "Displays a link to download the binary data of the field. You can use the " #| "first option to specify the filename, or use the second option as the " @@ -4803,7 +4799,6 @@ msgid "Displays a link to download this image." msgstr "Affiche un lien vers cette image" #: libraries/transformations/text_plain__dateformat.inc.php:10 -#, fuzzy #| msgid "" #| "Displays a TIME, TIMESTAMP, DATETIME or numeric unix timestamp field as " #| "formatted date. The first option is the offset (in hours) which will be " @@ -4823,16 +4818,15 @@ msgid "" "documentation for PHP's strftime() function and for \"utc\" it is done using " "gmdate() function." msgstr "" -"Affiche un champ TIME, TIMESTAMP, DATETIME ou un champ numérique contenant " -"une valeur TIMESTAMP UNIX en tant que date formatée. La première option est " -"le décalage (en heures) à ajouter (par défaut, 0). La seconde option sert à " -"indiquer le format de date ou d'heure. La troisième option détermine si vous " -"voulez la date locale («local») ou UTC («utc»). Pour le format «local», le " -"second paramètre utilise le format de la fonction PHP strftime() et pour le " -"format «utc», il utilise la fonction gmdate()." +"Affiche une colonne TIME, TIMESTAMP, DATETIME ou une colonne numérique " +"contenant une valeur TIMESTAMP UNIX en tant que date formatée. La première " +"option est le décalage (en heures) à ajouter (par défaut, 0). La seconde " +"option sert à indiquer le format de date ou d'heure. La troisième option " +"détermine si vous voulez la date locale («local») ou UTC («utc»). Pour le " +"format «local», le second paramètre utilise le format de la fonction PHP " +"strftime() et pour le format «utc», il utilise la fonction gmdate()." #: libraries/transformations/text_plain__external.inc.php:10 -#, fuzzy #| msgid "" #| "LINUX ONLY: Launches an external application and feeds it the field data " #| "via standard input. Returns the standard output of the application. The " @@ -4856,19 +4850,19 @@ msgid "" "will prevent wrapping and ensure that the output appears all on one line " "(Default 1)." msgstr "" -"(Linux seulement) Exécute un programme externe et lui envoie le contenu du " -"champ via l'entrée standard. Puis capture la sortie standard de ce programme " -"externe. Le programme par défaut est tidy, pour un affichage embelli du code " -"HTML. Pour des raisons de sécurité, vous devez éditer le script libraries/" -"transformations/text_plain__external.inc.php et y insérer les noms de " -"programme externe possibles. La première option est le numéro du programme " -"que vous voulez utiliser, la seconde option contient les paramètres pour ce " -"programme. En troisième option, une valeur de 1 va convertir le résultat " -"avec la fonction htmlspecialchars() (par défaut, 1). En option 4, une valeur " -"de 1 va ajouter NOWRAP à la cellule affichée (par défaut, 1)." +"(Linux seulement) Exécute un programme externe et lui envoie le contenu de " +"la colonne via l'entrée standard. Puis capture la sortie standard de ce " +"programme externe. Le programme par défaut est Tidy, pour un affichage " +"embelli du code HTML. Pour des raisons de sécurité, vous devez éditer le " +"script libraries/transformations/text_plain__external.inc.php et y insérer " +"les noms de programme externe possibles. La première option est le numéro du " +"programme que vous voulez utiliser, la seconde option contient les " +"paramètres pour ce programme. En troisième option, une valeur de 1 va " +"convertir le résultat avec la fonction htmlspecialchars() (par défaut, 1). " +"En option 4, une valeur de 1 va ajouter NOWRAP à la cellule affichée (par " +"défaut, 1)." #: libraries/transformations/text_plain__formatted.inc.php:10 -#, fuzzy #| msgid "" #| "Displays the contents of the field as-is, without running it through " #| "htmlspecialchars(). That is, the field is assumed to contain valid HTML." @@ -4876,12 +4870,11 @@ msgid "" "Displays the contents of the column as-is, without running it through " "htmlspecialchars(). That is, the column is assumed to contain valid HTML." msgstr "" -"Préserve le contenu original du champ, sans ajout de caractères " -"d'échappement avec la fonction htmlspecialchars(). Donc il est assumé que le " -"champ contient du HTML valide." +"Préserve le contenu original de la colonne, sans ajout de caractères " +"d'échappement avec la fonction htmlspecialchars(). Donc il est assumé que la " +"colonne contient du HTML valide." #: libraries/transformations/text_plain__imagelink.inc.php:10 -#, fuzzy #| msgid "" #| "Displays an image and a link; the field contains the filename. The first " #| "option is a URL prefix like \"http://www.example.com/\". The second and " @@ -4891,13 +4884,12 @@ msgid "" "option is a URL prefix like \"http://www.example.com/\". The second and " "third options are the width and the height in pixels." msgstr "" -"Affiche une image et un lien, le champ contient le nom du fichier. La " +"Affiche une image et un lien, la colonne contient le nom du fichier. La " "première option est un préfixe URL tel que «http://www.example.com/». La " "seconde option est la largeur en pixels et la troisième option est la " "hauteur en pixels." #: libraries/transformations/text_plain__link.inc.php:10 -#, fuzzy #| msgid "" #| "Displays a link; the field contains the filename. The first option is a " #| "URL prefix like \"http://www.example.com/\". The second option is a title " @@ -4907,9 +4899,9 @@ msgid "" "prefix like \"http://www.example.com/\". The second option is a title for " "the link." msgstr "" -"Affiche un lien, le champ contient le nom du fichier; en première option, un " -"préfixe comme «http://www.example.com/», en seconde option, un titre pour le " -"lien." +"Affiche un lien, la colonne contient le nom du fichier; en première option, " +"un préfixe comme «http://www.example.com/», en seconde option, un titre pour " +"le lien." #: libraries/transformations/text_plain__longToIpv4.inc.php:10 msgid "" @@ -5134,13 +5126,11 @@ msgid "Create a page" msgstr "Créer une page" #: pdf_pages.php:310 -#, fuzzy #| msgid "Page number:" msgid "Page name" -msgstr "Page n°:" +msgstr "Nom de la page" #: pdf_pages.php:314 -#, fuzzy #| msgid "Automatic layout" msgid "Automatic layout based on" msgstr "Mise en page automatique" @@ -5270,7 +5260,6 @@ msgid "To select relation, click :" msgstr "Pour sélectionner un lien, cliquez :" #: pmd_help.php:29 -#, fuzzy #| msgid "" #| "The display field is shown in pink. To set/unset a field as the display " #| "field, click the \"Choose field to display\" icon, then click on the " @@ -5280,9 +5269,9 @@ msgid "" "column, click the \"Choose column to display\" icon, then click on the " "appropriate column name." msgstr "" -"Le champ à afficher est montré en rose. Pour indiquer qu'un champ est ou " -"n'est plus le champ à afficher, cliquer l'icône «Champ à afficher», puis " -"cliquer sur le nom de champ approprié." +"La colonne descriptive est montrée en rose. Pour indiquer qu'une colonne est " +"ou n'est plus la colonne descriptive, cliquer l'icône «Colonne " +"descriptive», puis cliquer sur le nom de colonne approprié." #: pmd_pdf.php:63 msgid "Page has been created" @@ -6384,7 +6373,6 @@ msgstr "" "vous ne pourrez que télécharger ou afficher la configuration." #: setup/lib/messages.inc.php:35 -#, fuzzy #| msgid "" #| "Defines which type of editing controls should be used for CHAR and " #| "VARCHAR fields; [kbd]input[/kbd] - allows limiting of input length, [kbd]" @@ -6394,12 +6382,11 @@ msgid "" "columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/" "kbd] - allows newlines in columns" msgstr "" -"Déterminer la méthode d'édition pour les colonnes CHAR et VARCHAR; [kbd]input" -"[/kbd] - permet de limiter la taille, [kbd]textarea[/kbd] - permet la saisie " -"de sauts de lignes" +"Déterminer la méthode d'édition pour les colonnes CHAR et VARCHAR; " +"[kbd]input[/kbd] - permet de limiter la taille, [kbd]textarea[/kbd] - permet " +"la saisie de sauts de lignes" #: setup/lib/messages.inc.php:36 -#, fuzzy #| msgid "CHAR fields editing" msgid "CHAR columns editing" msgstr "Édition des colonnes CHAR" @@ -7132,7 +7119,6 @@ msgid "GZip output buffering" msgstr "Tampon de sortie GZip" #: setup/lib/messages.inc.php:217 -#, fuzzy #| msgid "" #| "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, " #| "DATETIME and TIMESTAMP, ascending order otherwise" @@ -7160,16 +7146,14 @@ msgid "Iconic table operations" msgstr "Icônes pour les actions sur les tables" #: setup/lib/messages.inc.php:224 -#, fuzzy #| msgid "Disallow BLOB and BINARY fields from editing" msgid "Disallow BLOB and BINARY columns from editing" -msgstr "Empêche l'édition des champs BLOB et BINARY" +msgstr "Empêche l'édition des colonnes BLOB et BINARY" #: setup/lib/messages.inc.php:225 -#, fuzzy #| msgid "Protect binary fields" msgid "Protect binary columns" -msgstr "Protéger les champs binaires" +msgstr "Protéger les colonnes avec contenu binaire" #: setup/lib/messages.inc.php:226 msgid "" @@ -7640,7 +7624,6 @@ msgid "PDF schema: table coordinates" msgstr "Table pour coordonnées du schéma en PDF" #: setup/lib/messages.inc.php:320 -#, fuzzy #| msgid "" #| "Table to describe the display fields, leave blank for no support; " #| "suggested: [kbd]pma_table_info[/kbd]" @@ -7648,14 +7631,13 @@ msgid "" "Table to describe the display columns, leave blank for no support; " "suggested: [kbd]pma_table_info[/kbd]" msgstr "" -"Sert à définir les champs descriptifs, laisser vide pour désactiver; " +"Sert à définir les colonnes descriptives, laisser vide pour désactiver; " "suggéré : [kbd]pma_table_info[/kbd]" #: setup/lib/messages.inc.php:321 -#, fuzzy #| msgid "Display fields table" msgid "Display columns table" -msgstr "Table pour champs descriptifs" +msgstr "Table pour colonnes descriptives" #: setup/lib/messages.inc.php:323 msgid "User for config auth" @@ -7686,11 +7668,10 @@ msgid "Verbose name of this server" msgstr "Nom à afficher pour ce serveur" #: setup/lib/messages.inc.php:329 -#, fuzzy #| msgid "" #| "Whether a user should be displayed a "show all (records)" button" msgid "Whether a user should be displayed a "show all (rows)" button" -msgstr "...via le bouton Tout afficher" +msgstr "Devrait-on afficher un bouton "Tout afficher"" #: setup/lib/messages.inc.php:330 msgid "Allow to display all the rows" @@ -7981,12 +7962,11 @@ msgid "Ignore" msgstr "Ignorer" #: tbl_change.php:728 -#, fuzzy #| msgid " Because of its length, this field might not be editable " msgid " Because of its length, this column might not be editable " msgstr "" -"Il est possible que ce champ ne soit pas éditable en raison de sa " -"longueur" +"Il est possible que cette colonne ne soit pas éditable en raison " +"de sa longueur" #: tbl_change.php:888 msgid "Remove BLOB Repository Reference" @@ -8276,10 +8256,9 @@ msgid "Operator" msgstr "Opérateur" #: tbl_select.php:270 -#, fuzzy #| msgid "Select fields (at least one):" msgid "Select columns (at least one):" -msgstr "Choisir les champs à afficher (au moins un)" +msgstr "Choisir les colonnes (au moins une)" #: tbl_select.php:288 msgid "Add search conditions (body of the \"where\" clause):" @@ -8303,10 +8282,10 @@ msgid "None" msgstr "aucune" #: tbl_structure.php:374 -#, fuzzy, php-format +#, php-format #| msgid "Table %s has been dropped" msgid "Column %s has been dropped" -msgstr "La table %s a été effacée" +msgstr "La colonne %s a été effacée" #: tbl_structure.php:385 #, php-format @@ -8327,10 +8306,9 @@ msgid "Propose table structure" msgstr "Suggérer des optimisations quant à la structure de la table" #: tbl_structure.php:540 -#, fuzzy #| msgid "Add new field" msgid "Add field" -msgstr "Ajouter un champ" +msgstr "Ajouter une colonne" #: tbl_structure.php:554 msgid "At End of Table" hooks/post-receive -- phpMyAdmin

14 years, 1 month

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-4591-g858d430

by Michal Čihař

The branch, master has been updated via 858d4308349dfd49afbd4b58a7ce2ad160e5f5c7 (commit) via 783412e8fd46c499999bf631984d5d4954919f6f (commit) via be0fd3ea430811d0b818a372aa3c72737f9b798c (commit) via 9296cab69c918f8e836a2adfcaa84faedbfb564f (commit) via 0ebf58ce10f9281c21e1d902c223bb8df2245f09 (commit) via 09616c68e597d6e1b68a7b3d23891e7d2467edbe (commit) via 3892c2df1218068b2d341f72e0068188c5930dcd (commit) via 2749ee9f2114f4df11c0554d7d17db1f1b8d5fc7 (commit) via 2c8253f9fa97effeb52c2d54813e9da8b141983f (commit) via 0a3eb8994c0c1b1e5ac7d0c898f0845c71863dd6 (commit) via d9f1c9da8c1e574dd5d7455fd8b787982f69adbb (commit) via b918fc0d3fac0e3945db9d9f3e62dfc89b12ceef (commit) via 33605050fa63db1bd8180a1404464490469c1d2b (commit) via 8dad71368c2b2b996b6e8b58e2f144e8afa1cacb (commit) via 928e880d80487c7f4c3be1b86a86be8b5f4dcb03 (commit) via b45abad30fd866640eae09be7ccbfd382b7ffac6 (commit) via c398b45e60eedbb68139848cb6fdb29df9a16362 (commit) via ee8284bf16e188eee967817bcbe033c80bdefaa9 (commit) from 17ace8e4bfb10c9ebf104382ef9344151d3f930c (commit) - Log ----------------------------------------------------------------- commit 858d4308349dfd49afbd4b58a7ce2ad160e5f5c7 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:16:08 2010 +0200 Translation update done using Pootle. commit 783412e8fd46c499999bf631984d5d4954919f6f Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:15:45 2010 +0200 Translation update done using Pootle. commit be0fd3ea430811d0b818a372aa3c72737f9b798c Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:15:27 2010 +0200 Translation update done using Pootle. commit 9296cab69c918f8e836a2adfcaa84faedbfb564f Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:15:13 2010 +0200 Translation update done using Pootle. commit 0ebf58ce10f9281c21e1d902c223bb8df2245f09 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:14:55 2010 +0200 Translation update done using Pootle. commit 09616c68e597d6e1b68a7b3d23891e7d2467edbe Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:14:35 2010 +0200 Translation update done using Pootle. commit 3892c2df1218068b2d341f72e0068188c5930dcd Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:14:20 2010 +0200 Translation update done using Pootle. commit 2749ee9f2114f4df11c0554d7d17db1f1b8d5fc7 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:14:03 2010 +0200 Translation update done using Pootle. commit 2c8253f9fa97effeb52c2d54813e9da8b141983f Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:13:51 2010 +0200 Translation update done using Pootle. commit 0a3eb8994c0c1b1e5ac7d0c898f0845c71863dd6 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:13:25 2010 +0200 Translation update done using Pootle. commit d9f1c9da8c1e574dd5d7455fd8b787982f69adbb Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:12:24 2010 +0200 Translation update done using Pootle. commit b918fc0d3fac0e3945db9d9f3e62dfc89b12ceef Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:12:06 2010 +0200 Translation update done using Pootle. commit 33605050fa63db1bd8180a1404464490469c1d2b Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:11:56 2010 +0200 Translation update done using Pootle. commit 8dad71368c2b2b996b6e8b58e2f144e8afa1cacb Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:11:46 2010 +0200 Translation update done using Pootle. commit 928e880d80487c7f4c3be1b86a86be8b5f4dcb03 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:11:28 2010 +0200 Translation update done using Pootle. commit b45abad30fd866640eae09be7ccbfd382b7ffac6 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:11:20 2010 +0200 Translation update done using Pootle. commit c398b45e60eedbb68139848cb6fdb29df9a16362 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:11:11 2010 +0200 Translation update done using Pootle. commit ee8284bf16e188eee967817bcbe033c80bdefaa9 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:10:49 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/fr.po | 59 +++++++++++++++++++++-------------------------------------- 1 files changed, 21 insertions(+), 38 deletions(-) diff --git a/po/fr.po b/po/fr.po index 2b38747..2942d70 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-05-31 14:33-0400\n" -"PO-Revision-Date: 2010-05-26 16:52+0200\n" +"PO-Revision-Date: 2010-06-01 16:16+0200\n" "Last-Translator: Marc <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -111,10 +111,9 @@ msgstr "Commentaires sur la table" #: tbl_indexes.php:189 tbl_printview.php:142 tbl_relation.php:402 #: tbl_select.php:135 tbl_structure.php:177 tbl_tracking.php:273 #: tbl_tracking.php:324 -#, fuzzy #| msgid "Column names" msgid "Column" -msgstr "Nom des colonnes" +msgstr "Colonne" #: db_datadict.php:175 db_printview.php:106 libraries/Index.class.php:443 #: libraries/db_events.inc.php:31 libraries/db_routines.inc.php:42 @@ -448,16 +447,14 @@ msgid "Modify" msgstr "Modifier" #: db_qbe.php:584 -#, fuzzy #| msgid "Add/Delete Criteria Row" msgid "Add/Delete criteria rows" -msgstr "Ajouter/effacer x lignes" +msgstr "Ajouter/effacer des lignes" #: db_qbe.php:596 -#, fuzzy #| msgid "Add/Delete Field Columns" msgid "Add/Delete columns" -msgstr "Ajouter/effacer x colonnes" +msgstr "Ajouter/effacer des colonnes" #: db_qbe.php:609 db_qbe.php:634 msgid "Update Query" @@ -551,7 +548,6 @@ msgid "Inside table(s):" msgstr "Dans la(les) table(s) :" #: db_search.php:355 -#, fuzzy #| msgid "Inside field:" msgid "Inside column:" msgstr "Dans la colonne:" @@ -1012,10 +1008,9 @@ msgid "Please select the primary key or a unique key" msgstr "Veuillez choisir la clé primaire ou un index unique" #: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 -#, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" -msgstr "Champ descriptif" +msgstr "Colonne descriptive" #. l10n: Display text for calendar close link #: js/messages.php:73 @@ -2002,10 +1997,9 @@ msgid "No Privileges" msgstr "aucun privilège" #: libraries/display_create_table.lib.php:41 -#, fuzzy #| msgid "Table must have at least one field." msgid "Table must have at least one column." -msgstr "La table doit comporter au moins un champ" +msgstr "La table doit comporter au moins une colonne" #: libraries/display_create_table.lib.php:48 #, php-format @@ -2013,20 +2007,19 @@ msgid "Create table on database %s" msgstr "Créer une nouvelle table sur la base %s" #: libraries/display_create_table.lib.php:57 -#, fuzzy #| msgid "Number of fields" msgid "Number of columns" -msgstr "Nombre de champs" +msgstr "Nombre de colonnes" #: libraries/display_export.lib.php:42 msgid "Could not load export plugins, please check your installation!" msgstr "Erreur lors du chargement des modules d'exportation!" #: libraries/display_export.lib.php:107 -#, fuzzy, php-format +#, php-format #| msgid "Dump %s row(s) starting at record # %s" msgid "Dump %s row(s) starting at row # %s" -msgstr "Exporter %s enregistrement(s) à partir du rang n° %s" +msgstr "Exporter %s ligne(s) à partir du rang n° %s" #: libraries/display_export.lib.php:115 msgid "Dump all rows" @@ -2181,10 +2174,9 @@ msgstr "" "volumineux, au détriment du respect des transactions." #: libraries/display_import.lib.php:239 setup/lib/messages.inc.php:161 -#, fuzzy #| msgid "Number of records (queries) to skip from start" msgid "Number of queries to skip from start" -msgstr "... relatif au début du fichier" +msgstr "Nombre de requêtes à sauter à partir du début" #: libraries/display_import.lib.php:255 setup/lib/messages.inc.php:160 msgid "Format of imported file" @@ -2241,10 +2233,9 @@ msgid "%d is not valid row number." msgstr "%d n'est pas un numéro d'enregistrement valable." #: libraries/display_tbl.lib.php:310 -#, fuzzy #| msgid "row(s) starting from record #" msgid "row(s) starting from row #" -msgstr "enregistrement(s) à partir de l'enregistrement n°" +msgstr "ligne(s) à partir de la ligne n°" #: libraries/display_tbl.lib.php:316 msgid "horizontal" @@ -2301,10 +2292,9 @@ msgid "Relational key" msgstr "Relations : clés" #: libraries/display_tbl.lib.php:588 -#, fuzzy #| msgid "Relational display field" msgid "Relational display column" -msgstr "Relations : champs descriptifs" +msgstr "Relations : colonnes descriptives" #: libraries/display_tbl.lib.php:595 msgid "Show binary contents" @@ -2734,24 +2724,21 @@ msgstr "CSV" #: libraries/export/csv.php:21 libraries/import/csv.php:27 #: libraries/import/csv.php:59 libraries/import/ldi.php:40 -#, fuzzy #| msgid "Lines terminated by" msgid "Columns terminated by" -msgstr "Lignes terminées par" +msgstr "Colonnes terminées par" #: libraries/export/csv.php:22 libraries/import/csv.php:28 #: libraries/import/csv.php:71 libraries/import/ldi.php:41 -#, fuzzy #| msgid "Fields enclosed by" msgid "Columns enclosed by" -msgstr "Champs entourés par" +msgstr "Colonnes entourées par" #: libraries/export/csv.php:23 libraries/import/csv.php:29 #: libraries/import/csv.php:75 libraries/import/ldi.php:42 -#, fuzzy #| msgid "Fields escaped by" msgid "Columns escaped by" -msgstr "Caractère spécial" +msgstr "Caractère d'échappement" #: libraries/export/csv.php:24 libraries/import/csv.php:30 #: libraries/import/csv.php:79 libraries/import/ldi.php:43 @@ -2767,21 +2754,18 @@ msgid "Replace NULL by" msgstr "Remplacer NULL par" #: libraries/export/csv.php:26 libraries/export/excel.php:23 -#, fuzzy #| msgid "Remove CRLF characters within fields" msgid "Remove CRLF characters within columns" -msgstr "" -"Enlève les caractères de fin de ligne (CRLF) à l'intérieur des colonnes" +msgstr "Enlève les caractères de fin de ligne à l'intérieur des colonnes" #: libraries/export/csv.php:27 libraries/export/excel.php:24 #: libraries/export/htmlword.php:26 libraries/export/latex.php:57 #: libraries/export/ods.php:24 libraries/export/odt.php:50 #: libraries/export/texytext.php:34 libraries/export/xls.php:24 #: libraries/export/xlsx.php:24 -#, fuzzy #| msgid "Put fields names in the first row" msgid "Put columns names in the first row" -msgstr "Afficher les noms de champ en première ligne" +msgstr "Afficher les noms de colonnes en première ligne" #: libraries/export/excel.php:18 msgid "CSV for MS Excel" @@ -2916,11 +2900,10 @@ msgid "Database export options" msgstr "Options d'exportation" #: libraries/export/sql.php:80 -#, fuzzy #| msgid "Enclose table and field names with backquotes" msgid "Enclose table and column names with backquotes" msgstr "" -"Protéger les noms des tables et des champs par des guillemets obliques (`)" +"Protéger les noms des tables et des colonnes par des guillemets obliques (`)" #: libraries/export/sql.php:86 msgid "Add into comments" @@ -3139,10 +3122,10 @@ msgid "Invalid format of CSV input on line %d." msgstr "Format invalide pour les données CSV à la ligne %d." #: libraries/import/csv.php:312 -#, fuzzy, php-format +#, php-format #| msgid "Invalid field count in CSV input on line %d." msgid "Invalid column count in CSV input on line %d." -msgstr "Nombre de champs invalide dans les données CSV à la ligne %d" +msgstr "Nombre de colonnes invalide dans les données CSV à la ligne %d" #: libraries/import/docsql.php:29 msgid "DocSQL" hooks/post-receive -- phpMyAdmin

14 years, 1 month

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git June 2010