diff --git a/po/bg.po b/po/bg.po index c1c68d439e..2d200305fa 100644 --- a/po/bg.po +++ b/po/bg.po @@ -3,17 +3,10 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 5.0.4-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -<<<<<<< HEAD "POT-Creation-Date: 2020-10-10 13:41-0300\n" "PO-Revision-Date: 2020-10-11 17:09+0000\n" "Last-Translator: P \n" "Language-Team: Bulgarian \n" -"Language-Team: Bulgarian >>>>>> QA_4_9 "bg/>\n" "Language: bg\n" "MIME-Version: 1.0\n" @@ -6982,18 +6975,12 @@ msgstr "" msgid "The number of free pages." msgstr "" -<<<<<<< HEAD #: libraries/classes/Controllers/Server/Status/VariablesController.php:320 msgid "" "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." msgstr "" -======= -#: libraries/classes/Database/Designer/Common.php:726 -msgid "Error: Internal relationship could not be removed!" -msgstr "Грешка: Вътрешната релация не можа да бъде премахната!" ->>>>>>> QA_4_9 #: libraries/classes/Controllers/Server/Status/VariablesController.php:325 msgid "" @@ -7134,15 +7121,9 @@ msgstr "" msgid "The number of row locks currently being waited for." msgstr "" -<<<<<<< HEAD #: libraries/classes/Controllers/Server/Status/VariablesController.php:432 msgid "The average time to acquire a row lock, in milliseconds." msgstr "" -======= -#: libraries/classes/DatabaseInterface.php:1550 -msgid "Failed to set configured collation connection!" -msgstr "Неуспешно установяване на конфигурираната връзка за колация!" ->>>>>>> QA_4_9 #: libraries/classes/Controllers/Server/Status/VariablesController.php:435 msgid "The total time spent in acquiring row locks, in milliseconds." @@ -7413,9 +7394,6 @@ msgstr "" #: libraries/classes/Controllers/Server/Status/VariablesController.php:632 msgid "Thread cache hit rate (calculated value)" msgstr "" -"Ако временният файл, използван за бързо създаване на индекс MyISAM, ще бъде " -"по-голям от използването на 'key cache' с посочена тук стойност, то методът " -"'key cache' ще бъде предпочетен." #: libraries/classes/Controllers/Server/Status/VariablesController.php:635 msgid "The number of threads that are not sleeping." @@ -8483,17 +8461,9 @@ msgstr "Web сървърът няма права за писане върху ф msgid "Dump has been saved to file %s." msgstr "Схемата беше запазена във файл %s." -<<<<<<< HEAD #: libraries/classes/File.php:263 msgid "File was not an uploaded file." msgstr "Файлът не е бил качен." -======= -#: libraries/classes/Normalization.php:545 -#: libraries/classes/Normalization.php:695 -#: libraries/classes/Normalization.php:767 -msgid "Error in processing!" -msgstr "Грешка при обработка!" ->>>>>>> QA_4_9 #: libraries/classes/File.php:305 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." @@ -8640,23 +8610,10 @@ msgstr "" msgid "Options" msgstr "Настройки" -<<<<<<< HEAD #: libraries/classes/Import.php:1276 #, php-format msgid "Go to database: %s" msgstr "Към БД: %s" -======= -#: libraries/classes/Operations.php:120 libraries/classes/Operations.php:259 -#: libraries/classes/Operations.php:878 libraries/classes/Operations.php:965 -#: libraries/classes/Operations.php:1324 -#: templates/columns_definitions/column_adjust_privileges.twig:15 -msgid "" -"You don't have sufficient privileges to perform this operation; Please refer " -"to the documentation for more details" -msgstr "" -"Нямате достатъчно права за извършване на тази операция; Моля, вижте " -"документацията за повече подробности" ->>>>>>> QA_4_9 #: libraries/classes/Import.php:1282 libraries/classes/Import.php:1325 #, php-format @@ -9048,15 +9005,9 @@ msgstr "Репликация" msgid "Variables" msgstr "Променливи" -<<<<<<< HEAD #: libraries/classes/Menu.php:655 libraries/classes/Util.php:4206 msgid "Charsets" msgstr "Знакови набори" -======= -#: libraries/classes/Plugins/Auth/AuthenticationCookie.php:344 -msgid "You are not allowed to log in to this MySQL server!" -msgstr "Нямате право да влизате в този MySQL сървър!" ->>>>>>> QA_4_9 #: libraries/classes/Menu.php:659 libraries/classes/Util.php:4208 msgid "Engines" @@ -9586,7 +9537,6 @@ msgid "" "primary key columns" msgstr "" -<<<<<<< HEAD #: libraries/classes/Normalization.php:890 msgid "Table is already in Third normal form!" msgstr "" @@ -9596,11 +9546,6 @@ msgstr "" #| msgid "Hide table structure actions" msgid "Improve table structure (Normalization):" msgstr "Скриване на действията за промяна на структурата" -======= -#: libraries/classes/Plugins/Import/ImportOds.php:163 -msgid "Could not parse OpenDocument Spreadsheet!" -msgstr "Не може да се анализира електронна таблица на OpenDocument!" ->>>>>>> QA_4_9 #: libraries/classes/Normalization.php:916 msgid "Select up to what step you want to normalize" @@ -9620,17 +9565,11 @@ msgid "" "normalization" msgstr "" -<<<<<<< HEAD #: libraries/classes/Normalization.php:998 msgid "" "This list is based on a subset of the table's data and is not necessarily " "accurate. " msgstr "" -======= -#: libraries/classes/Plugins/Import/ImportShp.php:238 -msgid "The imported file does not contain any data!" -msgstr "Импортираният файл не съдържа никаква информация!" ->>>>>>> QA_4_9 #: libraries/classes/Normalization.php:1014 msgid "No partial dependencies found!" @@ -9988,7 +9927,6 @@ msgstr "Грешно име/парола. Достъп отказан." msgid "Can not find signon authentication script:" msgstr "" -<<<<<<< HEAD #: libraries/classes/Plugins/AuthenticationPlugin.php:191 msgid "" "Login without a password is forbidden by configuration (see AllowNoPassword)" @@ -9998,16 +9936,6 @@ msgstr "Входът без парола е забранен от конфигу #, php-format msgid "No activity within %s seconds; please log in again." msgstr "Няма активност през последните %s секунди; моля влезте отново." -======= -#: libraries/classes/Plugins/TwoFactorPlugin.php:70 -#, php-format -msgid "Two-factor authentication failed: %s" -msgstr "Неуспешно двуфакторно удостоверяване: %s" - -#: libraries/classes/Plugins/TwoFactorPlugin.php:74 -msgid "Two-factor authentication failed." -msgstr "Неуспешно двуфакторно удостоверяване." ->>>>>>> QA_4_9 #: libraries/classes/Plugins/AuthenticationPlugin.php:208 #: libraries/classes/Plugins/AuthenticationPlugin.php:211 @@ -10591,15 +10519,9 @@ msgstr "" msgid "Structure for view %s exported as a table" msgstr "" -<<<<<<< HEAD #: libraries/classes/Plugins/Export/ExportSql.php:2175 msgid "(See below for the actual view)" msgstr "" -======= -#: libraries/classes/ReplicationGui.php:1025 -msgid "Unable to change master!" -msgstr "Главният не може да бъде сменен!" ->>>>>>> QA_4_9 #: libraries/classes/Plugins/Export/ExportSql.php:2255 #, fuzzy, php-format @@ -10699,17 +10621,11 @@ msgstr "" msgid "MediaWiki Table" msgstr "" -<<<<<<< HEAD #: libraries/classes/Plugins/Import/ImportMediawiki.php:279 #, fuzzy, php-format #| msgid "Invalid rule declaration on line %s." msgid "Invalid format of mediawiki input on line:
%s." msgstr "Невалидна декларация на правило на ред %s." -======= -#: libraries/classes/Rte/Events.php:562 -msgid "You must provide an event name!" -msgstr "Трябва да дадете име на събитието!" ->>>>>>> QA_4_9 #: libraries/classes/Plugins/Import/ImportOds.php:81 msgid "Import percentages as proper decimals (ex. 12.00% to .12)" @@ -10868,17 +10784,11 @@ msgstr "Речник на данните" msgid "Order of the tables" msgstr "никое от горните" -<<<<<<< HEAD #: libraries/classes/Plugins/Schema/SchemaPdf.php:106 #, fuzzy #| msgid "Ascending" msgid "Name (Ascending)" msgstr "Възходящо" -======= -#: libraries/classes/Rte/Routines.php:1143 -msgid "You must provide a routine name!" -msgstr "Трябва да дадете име на процедурата!" ->>>>>>> QA_4_9 #: libraries/classes/Plugins/Schema/SchemaPdf.php:107 #, fuzzy @@ -11471,7 +11381,6 @@ msgstr "Събитието %1$s беше променено." msgid "Event %1$s has been created." msgstr "Събитието %1$s беше създадено." -<<<<<<< HEAD #: libraries/classes/Rte/Events.php:234 libraries/classes/Rte/Routines.php:341 #: libraries/classes/Rte/Triggers.php:206 #, fuzzy @@ -11496,19 +11405,6 @@ msgstr "Име на събитие" #: libraries/classes/Rte/Events.php:480 templates/server/binlog/index.twig:86 msgid "Event type" msgstr "Тип на събитието" -======= -#: libraries/classes/Rte/Triggers.php:445 -msgid "You must provide a trigger name!" -msgstr "Трябва да дадете име на тригера!" - -#: libraries/classes/Rte/Triggers.php:452 -msgid "You must provide a valid timing for the trigger!" -msgstr "Трябва да дадете график на тригера!" - -#: libraries/classes/Rte/Triggers.php:459 -msgid "You must provide a valid event for the trigger!" -msgstr "Трябва да дадете събитие на тригера!" ->>>>>>> QA_4_9 #: libraries/classes/Rte/Events.php:501 libraries/classes/Rte/Routines.php:944 #, php-format diff --git a/po/ja.po b/po/ja.po index 60e126f81a..226210a443 100644 --- a/po/ja.po +++ b/po/ja.po @@ -3,17 +3,10 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 5.0.4-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -<<<<<<< HEAD "POT-Creation-Date: 2020-10-10 13:41-0300\n" "PO-Revision-Date: 2020-10-11 17:09+0000\n" "Last-Translator: Kyotaro Iijima \n" "Language-Team: Japanese \n" -"Language-Team: Japanese >>>>>> QA_4_9 "ja/>\n" "Language: ja\n" "MIME-Version: 1.0\n" @@ -9451,7 +9444,6 @@ msgstr "確認" msgid "Optimize" msgstr "最適化" -<<<<<<< HEAD #: libraries/classes/Operations.php:1677 #: templates/table/structure/display_structure.twig:464 msgid "Rebuild" @@ -9461,15 +9453,6 @@ msgstr "再構築" #: templates/table/structure/display_structure.twig:464 msgid "Repair" msgstr "修復" -======= -#: libraries/classes/Plugins/Export/ExportSql.php:1789 -msgid "AUTO_INCREMENT for dumped tables" -msgstr "ダンプしたテーブルの AUTO_INCREMENT" - -#: libraries/classes/Plugins/Export/ExportSql.php:1790 -msgid "AUTO_INCREMENT for table" -msgstr "テーブルの AUTO_INCREMENT" ->>>>>>> QA_4_9 #: libraries/classes/Operations.php:1679 #: templates/table/structure/display_structure.twig:464 @@ -9829,7 +9812,6 @@ msgstr "テーブル @TABLE@ の構造" msgid "Object creation options" msgstr "生成オプション" -<<<<<<< HEAD #: libraries/classes/Plugins/Export/ExportLatex.php:125 #: libraries/classes/Plugins/Export/ExportLatex.php:178 msgid "Table caption:" @@ -9839,38 +9821,6 @@ msgstr "テーブルのキャプション:" #: libraries/classes/Plugins/Export/ExportLatex.php:184 msgid "Table caption (continued):" msgstr "テーブルのキャプション (続き):" -======= -#: libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php:28 -msgid "" -"LINUX ONLY: Launches an external application and feeds it the column data " -"via standard input. Returns the standard output of the application. The " -"default is Tidy, to pretty-print HTML code. For security reasons, you have " -"to manually edit the file libraries/classes/Plugins/Transformations/Abs/" -"ExternalTransformationsPlugin.php and list the tools you want to make " -"available. The first option is then the number of the program you want to " -"use. The second option should be blank for historical reasons. The third " -"option, if set to 1, will convert the output using htmlspecialchars() " -"(Default 1). The fourth option, if set to 1, will prevent wrapping and " -"ensure that the output appears all on one line (Default 1)." -msgstr "" -"LINUX のみ: 外部アプリケーションを起動して標準入力経由でカラムデータを渡します。アプリケーションの標準出力が返ります。デフォルトは Tidy " -"です (これは HTML コードを綺麗にするためのものです)。セキュリティ上の理由から libraries/classes/Plugins/" -"Transformations/Abs/ExternalTransformationsPlugin.php " -"を自分で編集して利用したいツールを明記しておく必要があります。最初のオプションは利用したいプログラムの数です。2 " -"つ目のオプションは歴史的な理由のため、空白のままにしてください。3 つ目のオプションが 1 に設定されている場合は htmlspecialchars() " -"を用いて出力を変換します (デフォルトは 1 です)。4 つ目のオプションが 1 に設定されている場合は禁則処理をせず出力全体が 1 " -"行に収まるようにします (デフォルトは 1 です)。" - -#: libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php:114 -#, php-format -msgid "" -"You are using the external transformation command line options field, which " -"has been deprecated for security reasons. Add all command line options " -"directly to the definition in %s." -msgstr "" -"セキュリティ上の問題のため廃止した外部変換コマンド ライン オプション フィールドを使用しようとしています。コマンド ライン オプションを %s " -"の中の定義に直接に追加してください。" ->>>>>>> QA_4_9 #: libraries/classes/Plugins/Export/ExportLatex.php:137 #: libraries/classes/Plugins/Export/ExportLatex.php:190 @@ -14316,26 +14266,8 @@ msgstr "現在のサーバへのインポート" #: templates/display/import/import.twig:42 #, php-format -<<<<<<< HEAD msgid "Importing into the database \"%s\"" msgstr "データベース \"%s\" へのインポート" -======= -msgid "Table %s already exists!" -msgstr "テーブル %s は既に存在します!" - -#: tbl_export.php:45 -msgid "View dump (schema) of table" -msgstr "テーブルのダンプ (スキーマ) 表示" - -#: tbl_get_field.php:38 -msgid "Invalid table name" -msgstr "テーブル名が不正です" - -#. l10n: In case a SQL query did not pass a security check -#: tbl_get_field.php:46 transformation_wrapper.php:69 -msgid "There is an issue with your request." -msgstr "リクエストに問題があります。" ->>>>>>> QA_4_9 #: templates/display/import/import.twig:44 #, php-format