Log Message:
-----------
Automatic merge using stringmerge script.
Modified Files:
--------------
pgadmin3/src/ui/hr_HR:
pgadmin3.po (r1.13 -> r1.14)
Index: pgadmin3.po
===================================================================
RCS file: /projects/pgadmin3/src/ui/hr_HR/pgadmin3.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -Lsrc/ui/hr_HR/pgadmin3.po -Lsrc/ui/hr_HR/pgadmin3.po -u -w -r1.13 -r1.14
--- src/ui/hr_HR/pgadmin3.po
+++ src/ui/hr_HR/pgadmin3.po
@@ -4,7 +4,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-08-18 15:55+0100\n"
"Last-Translator: Andreas Pflug <[EMAIL PROTECTED]>\n"
"Language-Team: Boris Pran & Darko Prenosil <[EMAIL PROTECTED]>\n"
@@ -906,7 +906,7 @@
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 "Datoteke upita (*.sql)|*.sql|Sve datoteke (*.*)|*.*"
@@ -1531,7 +1531,7 @@
# standard
# 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 "Ograničenje"
@@ -2125,7 +2125,7 @@
msgstr "Domene"
#: src/ui/dlgClasses.cpp:248 src/ui/dlgClasses.cpp:408
-#: src/ui/frmRestore.cpp:325
+#: src/ui/frmRestore.cpp:369
msgid "Done"
msgstr "Gotovo"
@@ -2615,8 +2615,8 @@
# 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 "Funkcija"
@@ -3405,7 +3405,7 @@
#: 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
@@ -3802,7 +3802,7 @@
# standard input:6
# standard
# 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
@@ -4762,7 +4762,7 @@
msgid "Restore"
msgstr "Ukloni"
-#: src/ui/frmRestore.cpp:74
+#: src/ui/frmRestore.cpp:77
#, c-format
msgid "Restore %s %s"
msgstr ""
@@ -5058,7 +5058,7 @@
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 "Izaberite ime izlazne datoteke"
@@ -5520,7 +5520,7 @@
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 "Tablica"
@@ -5865,7 +5865,7 @@
#: 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 "Tip"
---------------------------(end of broadcast)---------------------------
TIP 4: Don't 'kill -9' the postmaster
