gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix problematic strings introduced in previous conflicts fixing

Browse Source
This commit is contained in:
Marc Delisle 2013-05-08 13:33:12 -04:00
parent fa16a717bc
commit 288b01132c
5 changed files with 0 additions and 2714 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2687
po/es.po
View File

File diff suppressed because it is too large Load Diff

8
po/fr.po
View File

@ -12535,15 +12535,7 @@ msgstr "Colonne descriptive : "
#: tbl_structure.php:125
#| msgid "No rows selected"
msgid "No column selected."
<<<<<<< HEAD
<<<<<<< HEAD
msgstr "Aucune colonne n'a été sélectionnée."
=======
msgstr "Aucune colonne n'a été sélectionnée"
>>>>>>> QA_4_0
=======
msgstr "Aucune colonne n'a été sélectionnée."
>>>>>>> QA_4_0
#: tbl_structure.php:149
#, php-format

6
po/ms.po
View File

@ -137,14 +137,8 @@ msgstr "Komen jadual"
#: libraries/plugins/export/ExportTexytext.class.php:432
#: libraries/schema/Pdf_Relation_Schema.class.php:1358
#: libraries/schema/Pdf_Relation_Schema.class.php:1381
<<<<<<< HEAD
#: libraries/tbl_columns_definition_form.inc.php:353 tbl_printview.php:130
#: tbl_relation.php:378 tbl_tracking.php:324 tbl_tracking.php:386
=======
#: libraries/tbl_columns_definition_form.inc.php:353 tbl_indexes.php:263
#: tbl_printview.php:130 tbl_relation.php:378 tbl_tracking.php:323
#: tbl_tracking.php:385
>>>>>>> QA_4_0
#, fuzzy
msgid "Column"
msgstr "Pangkalan data %1$s telah dijana."

10
po/th.po
View File

@ -724,12 +724,8 @@ msgid "Server:"
msgstr "เซิร์ฟเวอร์"
#: index.php:240
<<<<<<< HEAD
#, fuzzy
msgid "Server type:"
=======
msgid "Server type"
>>>>>>> QA_4_0
msgstr "ตัวเลือกเซิร์ฟเวอร์"
#: index.php:244 libraries/plugins/export/ExportLatex.class.php:225
@ -778,16 +774,10 @@ msgstr "ส่วนขยาย PHP"
msgid "Show PHP information"
msgstr "แสดงข้อมูลของ PHP"
<<<<<<< HEAD
#: index.php:323
#, fuzzy
msgid "Version information:"
msgstr "ข้อมูลล็อกอิน"
=======
#: index.php:323 libraries/engines/bdb.lib.php:25
msgid "Version information"
msgstr "ข้อมูลเวอร์ชัน"
>>>>>>> QA_4_0
#: index.php:332 libraries/Util.class.php:430 libraries/Util.class.php:516
#: libraries/config/FormDisplay.tpl.php:145

3
po/zh_TW.po
View File

@ -8631,14 +8631,11 @@ msgid ""
"When Host table is used, this field is ignored and values stored in Host "
"table are used instead."
msgstr "使用主機表時，此處的資料會被主機資料表中的資料所替換。"
<<<<<<< HEAD
#: libraries/replication_gui.lib.php:382
#: libraries/server_privileges.lib.php:1230
msgid "Re-type"
msgstr "重新輸入"
=======
>>>>>>> QA_4_0
#: libraries/replication_gui.lib.php:386
#, fuzzy