Skip to content
This repository has been archived by the owner on Sep 15, 2022. It is now read-only.

Commit

Permalink
Automatic merge using stringmerge script.
Browse files Browse the repository at this point in the history 
git-svn-id: svn://svn.pgadmin.org/trunk@3567 a7884b65-44f6-0310-8a51-81a127f17b15
  • Loading branch information
@dpage
dpage committed Aug 12, 2004
1 parent f9a2cca commit 0cf6adb
Show file tree
Hide file tree
Showing 89 changed files with 4,509 additions and 4,377 deletions.
Binary file modified src/ui/af_ZA/pgadmin3.mo
View file
Binary file not shown.
24 changes: 12 additions & 12 deletions src/ui/af_ZA/pgadmin3.po
View file
Expand Up @@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: pgAdmin3\n"
"POT-Creation-Date: 2004-08-11 22:54+0200\n"
"POT-Creation-Date: 2004-08-12 15:31+0100\n"
"PO-Revision-Date: 2003-09-15 17:25+0100\n"
"Last-Translator: Jean-Michel POURE <jm.poure@freesurf.fr>\n"
"Language-Team: Petri Jooste <rkwjpj@puknet.puk.ac.za>\n"
Expand Down Expand Up @@ -727,7 +727,7 @@ msgstr "Terug "
msgid "Backup %s %s"
msgstr ""

#: src/ui/frmBackup.cpp:104 src/ui/frmRestore.cpp:127
#: src/ui/frmBackup.cpp:104 src/ui/frmRestore.cpp:130
#, fuzzy
msgid "Backup files (*.backup)|*.backup|All files (*.*)|*.*"
msgstr "SQL lêers (*.sql)|*.sql|Alle lêers (*.*)|*.*"
Expand Down Expand Up @@ -1137,7 +1137,7 @@ msgstr "Voeg 'n bedienerkoppeling by."

# standard input:5
#: src/schema/pgIndex.cpp:211 src/schema/pgIndexConstraint.cpp:107
#: src/ui/frmRestore.cpp:378 standard input:187
#: src/ui/frmRestore.cpp:426 standard input:187
msgid "Constraint"
msgstr "Beperking"

Expand Down Expand Up @@ -1627,7 +1627,7 @@ msgid "Domains"
msgstr "Domeine"

#: src/ui/dlgClasses.cpp:248 src/ui/dlgClasses.cpp:408
#: src/ui/frmRestore.cpp:325
#: src/ui/frmRestore.cpp:369
msgid "Done"
msgstr "Klaar "

Expand Down Expand Up @@ -2014,8 +2014,8 @@ msgstr "Van "
# standard input:8
#: src/schema/pgCast.cpp:67 src/schema/pgCast.cpp:69
#: src/schema/pgConversion.cpp:67 src/schema/pgObject.cpp:53
#: src/schema/pgTrigger.cpp:144 src/ui/frmRestore.cpp:182 standard input:19
#: input:60
#: src/schema/pgTrigger.cpp:144 src/ui/frmRestore.cpp:219
#: src/ui/frmRestore.cpp:319 standard input:19 input:60
msgid "Function"
msgstr "Funksie "

Expand Down Expand Up @@ -2590,7 +2590,7 @@ msgstr "Veelvuldige kolomverbindings"
#: src/schema/pgTablespace.cpp:45 src/schema/pgTablespace.cpp:130
#: src/schema/pgTrigger.cpp:139 src/schema/pgType.cpp:122
#: src/schema/pgUser.cpp:94 src/schema/pgUser.cpp:206 src/schema/pgView.cpp:82
#: src/ui/dlgFunction.cpp:115 src/ui/frmRestore.cpp:343 standard input:2
#: src/ui/dlgFunction.cpp:115 src/ui/frmRestore.cpp:387 standard input:2
#: input:15 input:26 input:35 input:54 input:66 input:82 input:117 input:144
#: input:182 input:196 input:208 input:231 input:242 input:264 input:279
#: input:303 input:312 input:340 input:357 input:377 input:385 input:402
Expand Down Expand Up @@ -2884,7 +2884,7 @@ msgstr "OID"
# standard input:35
# standard input:19
# standard input:7
#: src/ui/frmRestore.cpp:309 standard input:12 input:23 input:32 input:45
#: src/ui/frmRestore.cpp:353 standard input:12 input:23 input:32 input:45
#: input:63 input:79 input:93 input:98 input:141 input:168 input:179 input:193
#: input:205 input:228 input:239 input:261 input:276 input:300 input:309
#: input:324 input:337 input:354 input:374 input:382 input:399 input:437
Expand Down Expand Up @@ -3610,7 +3610,7 @@ msgstr "Verfris die gekose objek."
msgid "Restore"
msgstr "Verwyder "

#: src/ui/frmRestore.cpp:74
#: src/ui/frmRestore.cpp:77
#, c-format
msgid "Restore %s %s"
msgstr ""
Expand Down Expand Up @@ -3850,7 +3850,7 @@ msgstr "Kies &Alle"
msgid "Select a column to add to the sort list."
msgstr ""

#: src/ui/frmBackup.cpp:103 src/ui/frmRestore.cpp:126
#: src/ui/frmBackup.cpp:103 src/ui/frmRestore.cpp:129
#, fuzzy
msgid "Select backup filename"
msgstr "Kies die lêernaam vir eksportering"
Expand Down Expand Up @@ -4220,7 +4220,7 @@ msgid "TX"
msgstr ""

#: src/schema/pgObject.cpp:63 src/schema/pgTable.cpp:526
#: src/ui/frmRestore.cpp:183
#: src/ui/frmRestore.cpp:220 src/ui/frmRestore.cpp:321
msgid "Table"
msgstr "Tabel "

Expand Down Expand Up @@ -4487,7 +4487,7 @@ msgstr "By opdatering"
#: src/schema/pgObject.cpp:65 src/schema/pgObject.cpp:168
#: src/schema/pgTablespace.cpp:43 src/schema/pgUser.cpp:92
#: src/ui/dlgFunction.cpp:115 src/ui/dlgFunction.cpp:117
#: src/ui/frmRestore.cpp:343 standard input:405
#: src/ui/frmRestore.cpp:387 standard input:405
msgid "Type"
msgstr "Tipe "

Expand Down
24 changes: 12 additions & 12 deletions src/ui/ar_SA/pgadmin3.po
View file
Expand Up @@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: pgadmin3\n"
"POT-Creation-Date: 2004-08-11 22:54+0200\n"
"POT-Creation-Date: 2004-08-12 15:31+0100\n"
"PO-Revision-Date: 2003-12-03 09:54+0100\n"
"Last-Translator: Jean-Michel Pouré <jm@poure.com>\n"
"Language-Team: Arabic <support@arabeyes.org>\n"
Expand Down Expand Up @@ -763,7 +763,7 @@ msgstr "ارجع"
msgid "Backup %s %s"
msgstr ""

#: src/ui/frmBackup.cpp:104 src/ui/frmRestore.cpp:127
#: src/ui/frmBackup.cpp:104 src/ui/frmRestore.cpp:130
#, fuzzy
msgid "Backup files (*.backup)|*.backup|All files (*.*)|*.*"
msgstr "Query files (*.sql)|*.sql|All files (*.*)|*.*"
Expand Down Expand Up @@ -1204,7 +1204,7 @@ msgstr "أضف اتصال إلى خادم."
# standard input:5
# standard
#: src/schema/pgIndex.cpp:211 src/schema/pgIndexConstraint.cpp:107
#: src/ui/frmRestore.cpp:378 standard input:187
#: src/ui/frmRestore.cpp:426 standard input:187
msgid "Constraint"
msgstr "قيْد"

Expand Down Expand Up @@ -1711,7 +1711,7 @@ msgid "Domains"
msgstr "مجالات"

#: src/ui/dlgClasses.cpp:248 src/ui/dlgClasses.cpp:408
#: src/ui/frmRestore.cpp:325
#: src/ui/frmRestore.cpp:369
msgid "Done"
msgstr "تمّ"

Expand Down Expand Up @@ -2123,8 +2123,8 @@ msgstr "من"
# standard
#: src/schema/pgCast.cpp:67 src/schema/pgCast.cpp:69
#: src/schema/pgConversion.cpp:67 src/schema/pgObject.cpp:53
#: src/schema/pgTrigger.cpp:144 src/ui/frmRestore.cpp:182 standard input:19
#: input:60
#: src/schema/pgTrigger.cpp:144 src/ui/frmRestore.cpp:219
#: src/ui/frmRestore.cpp:319 standard input:19 input:60
msgid "Function"
msgstr "دالّة"

Expand Down Expand Up @@ -2754,7 +2754,7 @@ msgstr "ضمّ أعمدة متعددة"
#: src/schema/pgTablespace.cpp:45 src/schema/pgTablespace.cpp:130
#: src/schema/pgTrigger.cpp:139 src/schema/pgType.cpp:122
#: src/schema/pgUser.cpp:94 src/schema/pgUser.cpp:206 src/schema/pgView.cpp:82
#: src/ui/dlgFunction.cpp:115 src/ui/frmRestore.cpp:343 standard input:2
#: src/ui/dlgFunction.cpp:115 src/ui/frmRestore.cpp:387 standard input:2
#: input:15 input:26 input:35 input:54 input:66 input:82 input:117 input:144
#: input:182 input:196 input:208 input:231 input:242 input:264 input:279
#: input:303 input:312 input:340 input:357 input:377 input:385 input:402
Expand Down Expand Up @@ -3052,7 +3052,7 @@ msgstr "OID"
# standard input:19
# standard input:7
# standard
#: src/ui/frmRestore.cpp:309 standard input:12 input:23 input:32 input:45
#: src/ui/frmRestore.cpp:353 standard input:12 input:23 input:32 input:45
#: input:63 input:79 input:93 input:98 input:141 input:168 input:179 input:193
#: input:205 input:228 input:239 input:261 input:276 input:300 input:309
#: input:324 input:337 input:354 input:374 input:382 input:399 input:437
Expand Down Expand Up @@ -3813,7 +3813,7 @@ msgstr "أنعش الكائن المحدّد."
msgid "Restore"
msgstr "أزل"

#: src/ui/frmRestore.cpp:74
#: src/ui/frmRestore.cpp:77
#, c-format
msgid "Restore %s %s"
msgstr ""
Expand Down Expand Up @@ -4077,7 +4077,7 @@ msgstr "حدّد ال&كلّ؟"
msgid "Select a column to add to the sort list."
msgstr ""

#: src/ui/frmBackup.cpp:103 src/ui/frmRestore.cpp:126
#: src/ui/frmBackup.cpp:103 src/ui/frmRestore.cpp:129
#, fuzzy
msgid "Select backup filename"
msgstr "حدّد اسم ملف الّتصدير"
Expand Down Expand Up @@ -4468,7 +4468,7 @@ msgid "TX"
msgstr ""

#: src/schema/pgObject.cpp:63 src/schema/pgTable.cpp:526
#: src/ui/frmRestore.cpp:183
#: src/ui/frmRestore.cpp:220 src/ui/frmRestore.cpp:321
msgid "Table"
msgstr "جدول"

Expand Down Expand Up @@ -4750,7 +4750,7 @@ msgstr "عند التحديث"
#: src/schema/pgObject.cpp:65 src/schema/pgObject.cpp:168
#: src/schema/pgTablespace.cpp:43 src/schema/pgUser.cpp:92
#: src/ui/dlgFunction.cpp:115 src/ui/dlgFunction.cpp:117
#: src/ui/frmRestore.cpp:343 standard input:405
#: src/ui/frmRestore.cpp:387 standard input:405
msgid "Type"
msgstr "النوع"

Expand Down
Binary file modified src/ui/bg_BG/pgadmin3.mo
View file
Binary file not shown.
24 changes: 12 additions & 12 deletions src/ui/bg_BG/pgadmin3.po
View file
Expand Up @@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: pgAdmin3\n"
"POT-Creation-Date: 2004-08-11 22:54+0200\n"
"POT-Creation-Date: 2004-08-12 15:31+0100\n"
"PO-Revision-Date: 2003-09-18 16:42+0100\n"
"Last-Translator: Jean-Michel POURE <jm.poure@freesurf.fr>\n"
"Language-Team: pgAdmin Developers <pgadmin-hackers@postgresql.org>\n"
Expand Down Expand Up @@ -700,7 +700,7 @@ msgstr "Назад"
msgid "Backup %s %s"
msgstr ""

#: src/ui/frmBackup.cpp:104 src/ui/frmRestore.cpp:127
#: src/ui/frmBackup.cpp:104 src/ui/frmRestore.cpp:130
#, fuzzy
msgid "Backup files (*.backup)|*.backup|All files (*.*)|*.*"
msgstr "Файл за заявки (*.sql)|*.sql|Всички файлове (*.*)|*.*"
Expand Down Expand Up @@ -1065,7 +1065,7 @@ msgstr "Добавяне на връзка към сървър."

# standard
#: src/schema/pgIndex.cpp:211 src/schema/pgIndexConstraint.cpp:107
#: src/ui/frmRestore.cpp:378 standard input:187
#: src/ui/frmRestore.cpp:426 standard input:187
msgid "Constraint"
msgstr "Constraint"

Expand Down Expand Up @@ -1540,7 +1540,7 @@ msgid "Domains"
msgstr "Домейни"

#: src/ui/dlgClasses.cpp:248 src/ui/dlgClasses.cpp:408
#: src/ui/frmRestore.cpp:325
#: src/ui/frmRestore.cpp:369
msgid "Done"
msgstr "Край"

Expand Down Expand Up @@ -1926,8 +1926,8 @@ msgstr "От"
# standard
#: src/schema/pgCast.cpp:67 src/schema/pgCast.cpp:69
#: src/schema/pgConversion.cpp:67 src/schema/pgObject.cpp:53
#: src/schema/pgTrigger.cpp:144 src/ui/frmRestore.cpp:182 standard input:19
#: input:60
#: src/schema/pgTrigger.cpp:144 src/ui/frmRestore.cpp:219
#: src/ui/frmRestore.cpp:319 standard input:19 input:60
msgid "Function"
msgstr "Функция"

Expand Down Expand Up @@ -2461,7 +2461,7 @@ msgstr "Множествено обединение по колони"
#: src/schema/pgTablespace.cpp:45 src/schema/pgTablespace.cpp:130
#: src/schema/pgTrigger.cpp:139 src/schema/pgType.cpp:122
#: src/schema/pgUser.cpp:94 src/schema/pgUser.cpp:206 src/schema/pgView.cpp:82
#: src/ui/dlgFunction.cpp:115 src/ui/frmRestore.cpp:343 standard input:2
#: src/ui/dlgFunction.cpp:115 src/ui/frmRestore.cpp:387 standard input:2
#: input:15 input:26 input:35 input:54 input:66 input:82 input:117 input:144
#: input:182 input:196 input:208 input:231 input:242 input:264 input:279
#: input:303 input:312 input:340 input:357 input:377 input:385 input:402
Expand Down Expand Up @@ -2716,7 +2716,7 @@ msgid "OID"
msgstr "OID"

# standard
#: src/ui/frmRestore.cpp:309 standard input:12 input:23 input:32 input:45
#: src/ui/frmRestore.cpp:353 standard input:12 input:23 input:32 input:45
#: input:63 input:79 input:93 input:98 input:141 input:168 input:179 input:193
#: input:205 input:228 input:239 input:261 input:276 input:300 input:309
#: input:324 input:337 input:354 input:374 input:382 input:399 input:437
Expand Down Expand Up @@ -3393,7 +3393,7 @@ msgstr "Обнови избрания обект."
msgid "Restore"
msgstr "Премахни"

#: src/ui/frmRestore.cpp:74
#: src/ui/frmRestore.cpp:77
#, c-format
msgid "Restore %s %s"
msgstr ""
Expand Down Expand Up @@ -3638,7 +3638,7 @@ msgstr "Избери всичко"
msgid "Select a column to add to the sort list."
msgstr ""

#: src/ui/frmBackup.cpp:103 src/ui/frmRestore.cpp:126
#: src/ui/frmBackup.cpp:103 src/ui/frmRestore.cpp:129
#, fuzzy
msgid "Select backup filename"
msgstr "Избери име на файла за експортиране"
Expand Down Expand Up @@ -4003,7 +4003,7 @@ msgid "TX"
msgstr ""

#: src/schema/pgObject.cpp:63 src/schema/pgTable.cpp:526
#: src/ui/frmRestore.cpp:183
#: src/ui/frmRestore.cpp:220 src/ui/frmRestore.cpp:321
msgid "Table"
msgstr "Таблица"

Expand Down Expand Up @@ -4263,7 +4263,7 @@ msgstr "При обновяване"
#: src/schema/pgObject.cpp:65 src/schema/pgObject.cpp:168
#: src/schema/pgTablespace.cpp:43 src/schema/pgUser.cpp:92
#: src/ui/dlgFunction.cpp:115 src/ui/dlgFunction.cpp:117
#: src/ui/frmRestore.cpp:343 standard input:405
#: src/ui/frmRestore.cpp:387 standard input:405
msgid "Type"
msgstr "Тип"

Expand Down
Binary file modified src/ui/ca_ES/pgadmin3.mo
View file
Binary file not shown.

0 comments on commit 0cf6adb

Please sign in to comment.