[meld] Updated Catalan translation by David Planella

[David Planella <dplanella src gnome org>]

commit f4360dd29b03e0424c646854e965717c2fef5a5c
Author: David Planella <david planella gmail com>
Date:   Sun May 3 23:33:37 2009 +0200

    Updated Catalan translation by David Planella
---
 po/ca.po |  630 ++++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 391 insertions(+), 239 deletions(-)

diff --git a/po/ca.po b/po/ca.po
index 1b11c41..f6d1075 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: Stephen Kennedy <stevek gnome org>\n"
-"POT-Creation-Date: 2009-02-13 14:47+0100\n"
-"PO-Revision-Date: 2009-02-07 11:55+0100\n"
+"POT-Creation-Date: 2009-05-03 23:32+0200\n"
+"PO-Revision-Date: 2009-05-02 15:07+0200\n"
 "Last-Translator: David Planella <david planella gmail com>\n"
 "Language-Team: Catalan <tradgnome softcatala org>\n"
 "MIME-Version: 1.0\n"
@@ -18,79 +18,87 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../dirdiff.py:189 ../vcview.py:119
+#: ../dirdiff.py:173 ../vcview.py:125
 msgid "_Compare"
 msgstr "_Compara"
 
-#: ../dirdiff.py:189 ../vcview.py:119
+#: ../dirdiff.py:173 ../vcview.py:125
 msgid "Compare selected"
 msgstr "Compara el text seleccionat"
 
-#: ../dirdiff.py:190
+#: ../dirdiff.py:174
 msgid "Left"
 msgstr "Esquerra"
 
-#: ../dirdiff.py:190 ../filediff.py:146
+#: ../dirdiff.py:174 ../filediff.py:120
 msgid "Copy To Left"
 msgstr "Copia a l'esquerra"
 
-#: ../dirdiff.py:191
+#: ../dirdiff.py:175
 msgid "Right"
 msgstr "Dreta"
 
-#: ../dirdiff.py:191 ../filediff.py:147
+#: ../dirdiff.py:175 ../filediff.py:121
 msgid "Copy To Right"
 msgstr "Copia a la dreta"
 
-#: ../dirdiff.py:192
+#: ../dirdiff.py:176
 msgid "Delete selected"
 msgstr "Suprimeix el text seleccionat"
 
-#: ../dirdiff.py:193
+#: ../dirdiff.py:177
 msgid "Hide"
 msgstr "Oculta"
 
-#: ../dirdiff.py:193
+#: ../dirdiff.py:177
 msgid "Hide selected"
 msgstr "Oculta la selecció"
 
-#: ../dirdiff.py:195 ../filediff.py:144 ../vcview.py:120
+#: ../dirdiff.py:179 ../filediff.py:118 ../vcview.py:126
 msgid "Open selected"
 msgstr "Obre la selecció"
 
-#: ../dirdiff.py:199
+#: ../dirdiff.py:183
 msgid "Case"
 msgstr "Distingeix entre majúscules i minúscules"
 
-#: ../dirdiff.py:199
+#: ../dirdiff.py:183
 msgid "Ignore case of entries"
 msgstr "Ignora majúscules/minúscules de les entrades"
 
-#: ../dirdiff.py:200
+#: ../dirdiff.py:184
 msgid "Same"
 msgstr "Igual"
 
-#: ../dirdiff.py:200
+#: ../dirdiff.py:184
 msgid "Show identical"
 msgstr "Mostra el text idèntic"
 
-#: ../dirdiff.py:201
+#: ../dirdiff.py:185
 msgid "New"
 msgstr "Nou"
 
-#: ../dirdiff.py:201
+#: ../dirdiff.py:185
 msgid "Show new"
 msgstr "Mostra el text nou"
 
-#: ../dirdiff.py:202
+#: ../dirdiff.py:186
 msgid "Modified"
 msgstr "Modificat"
 
-#: ../dirdiff.py:202 ../vcview.py:132
+#: ../dirdiff.py:186 ../vcview.py:139
 msgid "Show modified"
 msgstr "Mostra el text modificat"
 
-#: ../dirdiff.py:255 ../dirdiff.py:287
+#: ../dirdiff.py:188
+msgid "Filters"
+msgstr "Filtres"
+
+#: ../dirdiff.py:188
+msgid "Set active filters"
+msgstr "Estableix els filtres actius"
+
+#: ../dirdiff.py:241 ../dirdiff.py:287
 #, python-format
 msgid "Error converting pattern '%s' to regular expression"
 msgstr "S'ha produït un error en convertir el patró «%s» en expressió regular"
@@ -100,17 +108,17 @@ msgstr "S'ha produït un error en convertir el patró «%s» en expressió regul
 msgid "Hide %s"
 msgstr "Amaga %s"
 
-#: ../dirdiff.py:382 ../dirdiff.py:392 ../vcview.py:217 ../vcview.py:245
+#: ../dirdiff.py:383 ../dirdiff.py:393 ../vcview.py:272 ../vcview.py:300
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] S'està escanejant %s"
 
-#: ../dirdiff.py:425
+#: ../dirdiff.py:422
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "«%s» amagat per «%s»"
 
-#: ../dirdiff.py:431
+#: ../dirdiff.py:428
 #, python-format
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
@@ -122,12 +130,12 @@ msgstr ""
 "són visibles:\n"
 "%s"
 
-#: ../dirdiff.py:505
+#: ../dirdiff.py:501
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Fet"
 
-#: ../dirdiff.py:551
+#: ../dirdiff.py:547
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -136,7 +144,7 @@ msgstr ""
 "«%s» ja existeix.\n"
 "Voleu sobreescriure'l?"
 
-#: ../dirdiff.py:558
+#: ../dirdiff.py:554
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -147,16 +155,16 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../dirdiff.py:576 ../vcview.py:405
+#: ../dirdiff.py:572 ../vcview.py:464
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
-"Remove recusively?"
+"Remove recursively?"
 msgstr ""
 "«%s» és un directori.\n"
 "Voleu suprimir-lo recursivament?"
 
-#: ../dirdiff.py:583 ../vcview.py:410
+#: ../dirdiff.py:579 ../vcview.py:469
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -167,85 +175,85 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../dirdiff.py:594
+#: ../dirdiff.py:590
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] "%i segon"
 msgstr[1] "%i segons"
 
-#: ../dirdiff.py:595
+#: ../dirdiff.py:591
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minut"
 msgstr[1] "%i minuts"
 
-#: ../dirdiff.py:596
+#: ../dirdiff.py:592
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
 msgstr[0] "%i hora"
 msgstr[1] "%i hores"
 
-#: ../dirdiff.py:597
+#: ../dirdiff.py:593
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i dia"
 msgstr[1] "%i dies"
 
-#: ../dirdiff.py:598
+#: ../dirdiff.py:594
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
 msgstr[0] "%i setmana"
 msgstr[1] "%i setmanes"
 
-#: ../dirdiff.py:599
+#: ../dirdiff.py:595
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
 msgstr[0] "%i mes"
 msgstr[1] "%i mesos"
 
-#: ../dirdiff.py:600
+#: ../dirdiff.py:596
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
 msgstr[0] "%i any"
 msgstr[1] "%i anys"
 
-#: ../filediff.py:145 ../glade2/filediff.glade.h:4
+#: ../filediff.py:119 ../glade2/filediff.glade.h:4
 msgid "Create Patch"
 msgstr "Crea un pedaç"
 
-#: ../filediff.py:145
+#: ../filediff.py:119
 msgid "Create a patch"
 msgstr "Crea un pedaç"
 
-#: ../filediff.py:146
+#: ../filediff.py:120
 msgid "Copy all changes from right pane to left pane"
 msgstr ""
 "Copia tots els canvis de la subfinestra dreta a la subfinestra esquerra"
 
-#: ../filediff.py:147
+#: ../filediff.py:121
 msgid "Copy all changes from left pane to right pane"
 msgstr ""
 "Copia tots els canvis de la subfinestra esquerra a la subfinestra dreta"
 
 #. Abbreviation for insert,overwrite so that it will fit in the status bar
-#: ../filediff.py:196
+#: ../filediff.py:174
 msgid "INS,OVR"
 msgstr "INS,SOB"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../filediff.py:198
+#: ../filediff.py:176
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Ln %i, Col %i"
 
-#: ../filediff.py:252
+#: ../filediff.py:234
 #, python-format
 msgid ""
 "Regular expression '%s' changed the number of lines in the file. Comparison "
@@ -254,50 +262,31 @@ msgstr ""
 "L'expressió regular «%s» ha canviat el nombre de línies del fitxer. La "
 "comparació serà incorrecta. Vegeu el manual d'usuari per a més detalls."
 
-#: ../filediff.py:493
-#, python-format
-msgid ""
-"Regular expression error\n"
-"'%s'"
-msgstr ""
-"S'ha produït un error en l'expressió regular\n"
-"«%s»"
-
-#: ../filediff.py:505
-#, python-format
-msgid "The regular expression '%s' was not found."
-msgstr "No s'ha trobat l'expressió regular «%s»."
-
-#: ../filediff.py:507
-#, python-format
-msgid "The text '%s' was not found."
-msgstr "No s'ha trobat el text «%s»."
-
-#: ../filediff.py:559
+#: ../filediff.py:503
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Estableix el nombre de subfinestres"
 
-#: ../filediff.py:565
+#: ../filediff.py:509
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] S'estan obrint els fitxers"
 
-#: ../filediff.py:583 ../filediff.py:597 ../filediff.py:613 ../filediff.py:620
+#: ../filediff.py:527 ../filediff.py:541 ../filediff.py:557 ../filediff.py:564
 #, python-format
 msgid "Could not read from '%s'"
 msgstr "No s'ha pogut llegir de «%s»"
 
-#: ../filediff.py:584 ../filediff.py:621
+#: ../filediff.py:528 ../filediff.py:565
 msgid "The error was:"
 msgstr "L'error ha estat:"
 
-#: ../filediff.py:589
+#: ../filediff.py:533
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] S'estan llegint els fitxers"
 
-#: ../filediff.py:598
+#: ../filediff.py:542
 msgid ""
 "It contains ascii nulls.\n"
 "Perhaps it is a binary file."
@@ -305,17 +294,17 @@ msgstr ""
 "Conté el carà cter nul de l'ASCII.\n"
 "Potser és un fitxer binari."
 
-#: ../filediff.py:614
+#: ../filediff.py:558
 #, python-format
 msgid "I tried encodings %s."
 msgstr "S'han provat les codificacions %s."
 
-#: ../filediff.py:643
+#: ../filediff.py:585
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] S'estan calculant les diferències"
 
-#: ../filediff.py:770
+#: ../filediff.py:712
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -324,7 +313,7 @@ msgstr ""
 "«%s» ja existeix.\n"
 "Voleu sobreescriure'l?"
 
-#: ../filediff.py:783
+#: ../filediff.py:725
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -335,12 +324,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../filediff.py:792
+#: ../filediff.py:734
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Escolliu un nom per a la memòria intermèdia %i."
 
-#: ../filediff.py:805
+#: ../filediff.py:748
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -351,7 +340,7 @@ msgstr ""
 "\n"
 "Quin format voleu emprar?"
 
-#: ../filediff.py:821
+#: ../filediff.py:764
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -361,11 +350,11 @@ msgstr ""
 "Voleu desar-lo com a UTF-8?"
 
 #. save as
-#: ../filediff.py:871
+#: ../filediff.py:804
 msgid "Save patch as..."
 msgstr "Anomena i desa el pedaç..."
 
-#: ../filediff.py:929
+#: ../filediff.py:871
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -378,6 +367,15 @@ msgstr ""
 "\n"
 "No podreu desfer aquesta operació."
 
+#: ../findbar.py:120
+#, python-format
+msgid ""
+"Regular expression error\n"
+"'%s'"
+msgstr ""
+"S'ha produït un error en l'expressió regular\n"
+"«%s»"
+
 #: ../glade2/filediff.glade.h:1
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Some files have been modified.\n"
@@ -391,192 +389,200 @@ msgid "Copy to Clipboard"
 msgstr "Copia al porta-retalls"
 
 #: ../glade2/filediff.glade.h:5
-msgid "Find"
-msgstr "Cerca"
+msgid "Save modified files?"
+msgstr "Voleu desar els fitxers modificats?"
 
 #: ../glade2/filediff.glade.h:6
-msgid "Match _entire word only"
-msgstr "Només coincideixen paraules s_enceres"
+msgid "_Discard Changes"
+msgstr "_Descarta els canvis"
 
 #: ../glade2/filediff.glade.h:7
-msgid "Regular e_xpression"
+msgid "_Save Selected"
+msgstr "_Desa la selecció"
+
+#: ../glade2/findbar.glade.h:1
+msgid "Regular E_xpression"
 msgstr "E_xpressió regular"
 
-#: ../glade2/filediff.glade.h:8
-msgid "Save modified files?"
-msgstr "Voleu desar els fitxers modificats?"
+#: ../glade2/findbar.glade.h:2
+msgid "Replace _All"
+msgstr "Reemplaça-ho _tot"
 
-#: ../glade2/filediff.glade.h:9
-msgid "Search for:"
-msgstr "Cerca:"
+#: ../glade2/findbar.glade.h:3
+msgid "Replace _With"
+msgstr "Reemplaça _per"
 
-#: ../glade2/filediff.glade.h:10
-msgid "_Discard Changes"
-msgstr "_Descarta els canvis"
+#: ../glade2/findbar.glade.h:4
+msgid "Who_le word"
+msgstr "Paraula _sencera"
 
-#: ../glade2/filediff.glade.h:11
-msgid "_Match case"
+#: ../glade2/findbar.glade.h:5
+msgid "_Match Case"
 msgstr "Coincidència de _majúscules i minúscules"
 
-#: ../glade2/filediff.glade.h:12
-msgid "_Save Selected"
-msgstr "_Desa la selecció"
+#: ../glade2/findbar.glade.h:6
+msgid "_Next"
+msgstr "_Següent"
 
-#: ../glade2/filediff.glade.h:13
-msgid "_Wrap around"
-msgstr "_Torna al principi en arribar al final de fitxer"
+#: ../glade2/findbar.glade.h:7
+msgid "_Previous"
+msgstr "_Anterior"
 
-#: ../glade2/meldapp.glade.h:1
-msgid "(gnome-default-editor)"
-msgstr "(editor-predeterminat-gnome)"
+#: ../glade2/findbar.glade.h:8 ../meldapp.py:522
+msgid "_Replace"
+msgstr "_Reemplaça"
 
-#: ../glade2/meldapp.glade.h:2
+#: ../glade2/findbar.glade.h:9
+msgid "_Search for"
+msgstr "_Cerca"
+
+#: ../glade2/meldapp.glade.h:1
 msgid "<b>Edit Menu</b>"
 msgstr "<b>Menú d'edició</b>"
 
-#: ../glade2/meldapp.glade.h:3
+#: ../glade2/meldapp.glade.h:2
 msgid "<b>Font</b>"
 msgstr "<b>Tipus de lletra</b>"
 
-#: ../glade2/meldapp.glade.h:4
+#: ../glade2/meldapp.glade.h:3
 msgid "<b>Loading</b>"
 msgstr "<b>CÃ rrega</b>"
 
-#: ../glade2/meldapp.glade.h:5
+#: ../glade2/meldapp.glade.h:4
 msgid "<b>Misc</b>"
 msgstr "<b>Miscel·là nia</b>"
 
-#: ../glade2/meldapp.glade.h:6
+#: ../glade2/meldapp.glade.h:5
 msgid "Automatically supply missing newline at end of file"
 msgstr "Afegeix automà ticament el carà cter de línia nova al final del fitxer"
 
-#: ../glade2/meldapp.glade.h:7
+#: ../glade2/meldapp.glade.h:6
 msgid "Choose Files"
 msgstr "Escolliu els fitxers"
 
-#: ../glade2/meldapp.glade.h:8
-msgid "Copyright © 2002-2008 Stephen Kennedy"
-msgstr "Copyright © 2002-2008 Stephen Kennedy"
+#: ../glade2/meldapp.glade.h:7
+msgid "Copyright © 2002-2009 Stephen Kennedy"
+msgstr "Copyright © 2002-2009 Stephen Kennedy"
 
-#: ../glade2/meldapp.glade.h:9
+#: ../glade2/meldapp.glade.h:8
 msgid "Custom command"
 msgstr "Ordre personalitzada"
 
-#: ../glade2/meldapp.glade.h:10
+#: ../glade2/meldapp.glade.h:9
 msgid "Directory"
 msgstr "Directori"
 
-#: ../glade2/meldapp.glade.h:11
+#: ../glade2/meldapp.glade.h:10
 msgid "Edit files with:"
 msgstr "Edita els fitxers amb:"
 
-#: ../glade2/meldapp.glade.h:12
+#: ../glade2/meldapp.glade.h:11
 msgid "Editor"
 msgstr "Editor"
 
-#: ../glade2/meldapp.glade.h:13
+#: ../glade2/meldapp.glade.h:12
 msgid "Encoding"
 msgstr "Codificació"
 
-#: ../glade2/meldapp.glade.h:14
+#: ../glade2/meldapp.glade.h:13
 msgid "File Filters"
 msgstr "Filtres de fitxer"
 
-#: ../glade2/meldapp.glade.h:15
+#: ../glade2/meldapp.glade.h:14
 msgid "Gnome default editor"
 msgstr "Editor predeterminat del GNOME"
 
-#: ../glade2/meldapp.glade.h:16
+#: ../glade2/meldapp.glade.h:15
 msgid "Ignore changes which insert or delete blank lines"
 msgstr "Ignora els canvis que insereixin o suprimeixin línies en blanc"
 
-#: ../glade2/meldapp.glade.h:17
+#: ../glade2/meldapp.glade.h:16
 msgid "Ignore symbolic links"
 msgstr "Ignora els enllaços simbòlics"
 
-#: ../glade2/meldapp.glade.h:18
+#: ../glade2/meldapp.glade.h:17
 msgid "Insert spaces instead of tabs"
 msgstr "Insereix espais en lloc de tabulacions"
 
-#: ../glade2/meldapp.glade.h:19
+#: ../glade2/meldapp.glade.h:18
 msgid "Internal editor"
 msgstr "Editor intern"
 
-#: ../glade2/meldapp.glade.h:20
+#: ../glade2/meldapp.glade.h:19
 msgid "Line Wrapping "
 msgstr "Ajustament de línia "
 
-#: ../glade2/meldapp.glade.h:21
+#: ../glade2/meldapp.glade.h:20
 msgid "Meld"
 msgstr "Meld"
 
-#: ../glade2/meldapp.glade.h:22
+#: ../glade2/meldapp.glade.h:21
 msgid "Mine"
 msgstr "Meu"
 
-#: ../glade2/meldapp.glade.h:23
+#: ../glade2/meldapp.glade.h:22
 msgid "Original"
 msgstr "Original"
 
-#: ../glade2/meldapp.glade.h:24
+#: ../glade2/meldapp.glade.h:23
 msgid "Other"
 msgstr "Un altre"
 
-#: ../glade2/meldapp.glade.h:25
+#: ../glade2/meldapp.glade.h:24
 msgid "Preferences : Meld"
 msgstr "Preferències : Meld"
 
-#: ../glade2/meldapp.glade.h:26
+#: ../glade2/meldapp.glade.h:25
 msgid "Show line numbers"
 msgstr "Mostra els números de línia"
 
-#: ../glade2/meldapp.glade.h:27
+#: ../glade2/meldapp.glade.h:26
 msgid "Tab width"
 msgstr "Amplada de la pestanya"
 
-#: ../glade2/meldapp.glade.h:28
+#: ../glade2/meldapp.glade.h:27
 msgid "Text Filters"
 msgstr "Filtres de text"
 
-#: ../glade2/meldapp.glade.h:29
+#: ../glade2/meldapp.glade.h:28
 msgid "Three way directory"
 msgstr "Entre tres directoris"
 
-#: ../glade2/meldapp.glade.h:30
+#: ../glade2/meldapp.glade.h:29
 msgid "Three way file"
 msgstr "Entre tres fitxers"
 
-#: ../glade2/meldapp.glade.h:31
+#: ../glade2/meldapp.glade.h:30
 msgid "Two way directory"
 msgstr "Entre dos directoris"
 
-#: ../glade2/meldapp.glade.h:32
+#: ../glade2/meldapp.glade.h:31
 msgid "Two way file"
 msgstr "Entre dos fitxers"
 
-#: ../glade2/meldapp.glade.h:33
+#: ../glade2/meldapp.glade.h:32
 msgid "Use GNOME monospace font"
 msgstr "Utilitza el tipus de lletra d'amplada fixa del GNOME"
 
-#: ../glade2/meldapp.glade.h:34
+#: ../glade2/meldapp.glade.h:33
 msgid "Use custom font"
 msgstr "Utilitza un tipus de lletra personalitzat"
 
-#: ../glade2/meldapp.glade.h:35
+#: ../glade2/meldapp.glade.h:34
 msgid "Use syntax highlighting"
 msgstr "Utilitza acoloriment de sintaxi"
 
-#: ../glade2/meldapp.glade.h:36
+#: ../glade2/meldapp.glade.h:35
 msgid "Version control view"
 msgstr "Visualització del control de versions"
 
 # Suposo que "codecs" volia dir "encodings"
-#: ../glade2/meldapp.glade.h:37
+#: ../glade2/meldapp.glade.h:36
 msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
 msgstr ""
 "En carregar, prova les codificacions en aquest ordre. (p.ex. utf8, iso8859)"
 
-#: ../glade2/meldapp.glade.h:38
+#: ../glade2/meldapp.glade.h:37
 msgid ""
 "When performing directory comparisons, you may filter out files and "
 "directories by name. Each pattern is a list of shell style wildcards "
@@ -586,7 +592,7 @@ msgstr ""
 "directoris pel nom. Cada patró és una llista de comodins a l'estil de "
 "l'intèrpret d'ordres, separats per espais."
 
-#: ../glade2/meldapp.glade.h:39
+#: ../glade2/meldapp.glade.h:38
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -600,31 +606,31 @@ msgstr ""
 "comparació. Si l'expressió conté grups, només es reemplacen els grups. Vegeu "
 "el manual d'usuari per a obtenir-ne més detalls."
 
-#: ../glade2/meldapp.glade.h:40
+#: ../glade2/meldapp.glade.h:39
 msgid "_Character"
 msgstr "_Carà cter"
 
-#: ../glade2/meldapp.glade.h:41
+#: ../glade2/meldapp.glade.h:40
 msgid "_Directory Comparison"
 msgstr "Comparació de _directoris"
 
-#: ../glade2/meldapp.glade.h:42
+#: ../glade2/meldapp.glade.h:41
 msgid "_File Comparison"
 msgstr "Comparació de _fitxers"
 
-#: ../glade2/meldapp.glade.h:43
+#: ../glade2/meldapp.glade.h:42
 msgid "_None"
 msgstr "_Cap"
 
-#: ../glade2/meldapp.glade.h:44
+#: ../glade2/meldapp.glade.h:43
 msgid "_Three Way Compare"
 msgstr "Comparació entre _tres"
 
-#: ../glade2/meldapp.glade.h:45
+#: ../glade2/meldapp.glade.h:44
 msgid "_Version Control Browser"
 msgstr "Navegador del control de _versions"
 
-#: ../glade2/meldapp.glade.h:46
+#: ../glade2/meldapp.glade.h:45
 msgid "_Word"
 msgstr "_Paraula"
 
@@ -656,7 +662,7 @@ msgstr "Missatge del registre"
 msgid "Previous Logs"
 msgstr "Registres anteriors"
 
-#: ../glade2/vcview.glade.h:8 ../vcview.py:176
+#: ../glade2/vcview.glade.h:8 ../vcview.py:183
 msgid "Tag"
 msgstr "Etiqueta"
 
@@ -664,11 +670,39 @@ msgstr "Etiqueta"
 msgid "VC Log"
 msgstr "Registre del control de versions"
 
+#: ../historyentry.py:247
+msgid "_Browse..."
+msgstr "_Navega..."
+
+#: ../historyentry.py:255
+msgid "Path"
+msgstr "Camí"
+
+#: ../historyentry.py:256
+msgid "Path to file"
+msgstr "Camí al fitxer"
+
+#: ../historyentry.py:257
+msgid "Pop up a file selector to choose a file"
+msgstr "Mostra un selector de fitxers per a escollir un fitxer"
+
+#: ../historyentry.py:378
+msgid "Select directory"
+msgstr "Seleccioneu el directori"
+
+#: ../historyentry.py:382
+msgid "Select file"
+msgstr "Seleccioneu el fitxer"
+
 #: ../meld:47
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "El Meld necessita el %s o superior."
 
+#: ../meld:64 ../meld:71
+msgid "Cannot import: "
+msgstr "No es pot importar: "
+
 #: ../meld.desktop.in.h:1
 msgid "Compare and merge your files"
 msgstr "Compareu i fusioneu fitxers."
@@ -677,144 +711,147 @@ msgstr "Compareu i fusioneu fitxers."
 msgid "Meld Diff Viewer"
 msgstr "Visualitzador de diferències Meld"
 
-#: ../meldapp.py:161
+#: ../meldapp.py:153
 msgid "label"
 msgstr "etiqueta"
 
-#: ../meldapp.py:161
+#: ../meldapp.py:153
 msgid "pattern"
 msgstr "patró"
 
-#: ../meldapp.py:229
+#: ../meldapp.py:221
 msgid "Only available if you have gnome-python-desktop installed"
 msgstr "Només està disponible si teniu el gnome-python-desktop instal·lat"
 
 #. file filters
 #. text filters
-#: ../meldapp.py:239 ../meldapp.py:244 ../vcview.py:156
+#: ../meldapp.py:231 ../meldapp.py:236 ../vcview.py:163
 msgid "Name"
 msgstr "Nom"
 
-#: ../meldapp.py:239 ../meldapp.py:244
+#: ../meldapp.py:231 ../meldapp.py:236
 msgid "Active"
 msgstr "Actiu"
 
-#: ../meldapp.py:239
+#: ../meldapp.py:231
 msgid "Pattern"
 msgstr "Patró"
 
-#: ../meldapp.py:244
+#: ../meldapp.py:236
 msgid "Regex"
 msgstr "Expressió regular"
 
-#: ../meldapp.py:348
+#: ../meldapp.py:340
 msgid "Close tab"
 msgstr "Tanca la pestanya"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:420
+#: ../meldapp.py:412
 msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
 msgstr "Còpies de seguretat\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:422
-msgid ""
-"Version Control\t1\tCVS .svn MT [{]arch[}] .arch-ids .arch-inventory RCS\n"
-msgstr ""
-"Control de versió\t1\tCVS .svn MT [{]arch[}] .arch-ids .arch-inventory RCS\n"
+#: ../meldapp.py:414
+#, python-format
+msgid "Version Control\t1\t%s\n"
+msgstr "Control de versions\t1\t%s\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:424
+#: ../meldapp.py:416
 msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
 msgstr "Binaris\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:426
+#: ../meldapp.py:418
 msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
 msgstr "Multimèdia\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:428
+#: ../meldapp.py:420
 msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
 msgstr "Paraules clau del CVS\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:430
+#: ../meldapp.py:422
 msgid "C++ comment\t0\t//.*\n"
 msgstr "Comentari de C++\t0\t//.*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:432
+#: ../meldapp.py:424
 msgid "C comment\t0\t/\\*.*?\\*/\n"
 msgstr "Comentari de C\t0\t/\\*.*?\\*/\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:434
+#: ../meldapp.py:426
 msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
 msgstr "Tot els espais blancs\t0\t[ \\t\\r\\f\\v]*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:436
+#: ../meldapp.py:428
 msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
 msgstr "Espais en blanc a l'inici\t0\t^[ \\t\\r\\f\\v]*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:438
+#: ../meldapp.py:430
 msgid "Script comment\t0\t#.*"
 msgstr "Comentari d'script\t0\t#.*"
 
-#: ../meldapp.py:509
+#: ../meldapp.py:508
 msgid "_New..."
 msgstr "_Nova..."
 
-#: ../meldapp.py:509
+#: ../meldapp.py:508
 msgid "Start a new comparison"
 msgstr "Inicia una comparació nova"
 
-#: ../meldapp.py:510
+#: ../meldapp.py:509
 msgid "Save the current file"
 msgstr "Desa el fitxer actual"
 
-#: ../meldapp.py:512
+#: ../meldapp.py:511
 msgid "Close the current file"
 msgstr "Tanca el fitxer actual"
 
-#: ../meldapp.py:513
+#: ../meldapp.py:512
 msgid "Quit the program"
 msgstr "Surt del programa"
 
-#: ../meldapp.py:516
+#: ../meldapp.py:515
 msgid "Undo the last action"
 msgstr "Desfés la darrera acció"
 
-#: ../meldapp.py:517
+#: ../meldapp.py:516
 msgid "Redo the last undone action"
 msgstr "Refés la darrera acció desfeta"
 
-#: ../meldapp.py:518
+#: ../meldapp.py:517
 msgid "Cut the selection"
 msgstr "Retalla la selecció"
 
-#: ../meldapp.py:519
+#: ../meldapp.py:518
 msgid "Copy the selection"
 msgstr "Copia la selecció"
 
-#: ../meldapp.py:520
+#: ../meldapp.py:519
 msgid "Paste the clipboard"
 msgstr "Enganxa el porta-retalls"
 
-#: ../meldapp.py:521
+#: ../meldapp.py:520
 msgid "Search for text"
 msgstr "Cerca text"
 
-#: ../meldapp.py:522
+#: ../meldapp.py:521
 msgid "Find Ne_xt"
 msgstr "Cerca el _següent"
 
-#: ../meldapp.py:522
+#: ../meldapp.py:521
 msgid "Search forwards for the same text"
 msgstr "Cerca el mateix text cap endavant"
 
+#: ../meldapp.py:522
+msgid "Find and replace text"
+msgstr "Cerca i reemplaça text"
+
 #: ../meldapp.py:523
 msgid "Go to the next difference"
 msgstr "Vés a la diferència següent"
@@ -867,32 +904,69 @@ msgstr "Informeu d'un error en el Meld"
 msgid "About this program"
 msgstr "Quant a aquest programa"
 
-#: ../meldapp.py:862
+#: ../meldapp.py:866
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "No es pot comparar una mescla de fitxers i directoris.\n"
 
+#: ../meldapp.py:909 ../meldapp.py:917
+msgid "file"
+msgstr "fitxer"
+
+#: ../meldapp.py:910 ../meldapp.py:916
+msgid "dir"
+msgstr "directori"
+
 #: ../meldapp.py:915
+msgid "Start with no window open"
+msgstr "Inicia sense obrir cap finestra"
+
+#: ../meldapp.py:916
+#, python-format
+msgid "Start with Version Control browser in '%s'"
+msgstr "Inicia amb el navegador del control de versions a «%s»"
+
+#: ../meldapp.py:917
+#, python-format
+msgid "Start with Version Control diff of '%s'"
+msgstr ""
+"Inicia amb el navegador del control de versions mostrant les diferències de «%"
+"s»"
+
+#: ../meldapp.py:918
+msgid "Start with 2 or 3 way file comparison"
+msgstr "Inicia amb una comparació de 2 o 3 fitxers"
+
+#: ../meldapp.py:919
+msgid "Start with 2 or 3 way directory comparison"
+msgstr "Inicia una comparació de 2 o 3 directoris"
+
+#: ../meldapp.py:926
+msgid "Meld is a file and directory comparison tool."
+msgstr "El Meld és una eina de comparació de fitxers i directoris."
+
+#: ../meldapp.py:929
 msgid "Set label to use instead of file name"
 msgstr "Estableix l'etiqueta a emprar en lloc del nom del fitxer"
 
-#: ../meldapp.py:916
+#: ../meldapp.py:931
 msgid "Automatically compare all differing files on startup"
 msgstr "Compara tots els fitxers diferents en iniciar el programa"
 
-#: ../meldapp.py:917 ../meldapp.py:918 ../meldapp.py:919 ../meldapp.py:920
+#: ../meldapp.py:932 ../meldapp.py:933 ../meldapp.py:934 ../meldapp.py:935
 msgid "Ignored for compatibility"
 msgstr "Ignorat per compatibilitat"
 
-#: ../meldapp.py:923
-msgid "Creates a diff tab for up to 3 supplied files."
+#: ../meldapp.py:938
+msgid "Creates a diff tab for up to 3 supplied files or directories."
 msgstr ""
-"Crea una pestanya de diferències per a un mà xim de 3 fitxers especificats."
+"Crea una pestanya de diferències per a un mà xim de 3 fitxers o directoris "
+"especificats."
 
-#: ../meldapp.py:927
+#: ../meldapp.py:942
 msgid "Invalid number of arguments supplied for --diff."
 msgstr "S'ha especificat un nombre d'arguments incorrecte per a --diff."
 
-#: ../meldapp.py:955
+#: ../meldapp.py:945
 #, python-format
 msgid "Wrong number of arguments (Got %i)"
 msgstr "Nombre d'arguments incorrecte (se n'han rebut %i)"
@@ -902,143 +976,197 @@ msgid "untitled"
 msgstr "sense títol"
 
 #. no common path. empty names get changed to "[None]"
-#: ../misc.py:132
+#: ../misc.py:191
 msgid "[None]"
 msgstr "[Cap]"
 
-#: ../vcview.py:121
+#: ../vcview.py:127
 msgid "_Commit"
 msgstr "_Confirma els canvis"
 
-#: ../vcview.py:121
+#: ../vcview.py:127
 msgid "Commit"
 msgstr "Confirma els canvis"
 
 #. FIXME: popup used to use gtk.STOCK_GO_BACK
-#: ../vcview.py:122
+#: ../vcview.py:128
 msgid "_Update"
 msgstr "Act_ualitza"
 
-#: ../vcview.py:122
+#: ../vcview.py:128
 msgid "Update"
 msgstr "Actualitza"
 
 #. FIXME: popup used to use gtk.STOCK_GO_FORWARD
-#: ../vcview.py:123
+#: ../vcview.py:129
 msgid "_Add"
 msgstr "_Afegeix"
 
-#: ../vcview.py:123
+#: ../vcview.py:129
 msgid "Add to VC"
 msgstr "Afegeix al control de versions"
 
 #. FIXME: popup used to use gtk.STOCK_ADD
-#: ../vcview.py:124
+#: ../vcview.py:130
 msgid "Add _Binary"
 msgstr "Afegeix com a fitxer _binari"
 
-#: ../vcview.py:124
+#: ../vcview.py:130
 msgid "Add binary to VC"
 msgstr "Afegeix com a fitxer binari al control de versions"
 
 #. FIXME: stock is inconsistent with other VC actions
-#: ../vcview.py:125
+#: ../vcview.py:131
 msgid "_Remove"
 msgstr "Sup_rimeix"
 
-#: ../vcview.py:125
+#: ../vcview.py:131
 msgid "Remove from VC"
 msgstr "Suprimeix del control de versions"
 
 #. FIXME: popup used to use gtk.STOCK_REMOVE
-#: ../vcview.py:126
+#: ../vcview.py:132
+msgid "_Resolved"
+msgstr "_Resolt"
+
+#: ../vcview.py:132
+msgid "Mark as resolved for VC"
+msgstr "Marca-ho com a resolt per al control de versions"
+
+#: ../vcview.py:133
 msgid "Revert to original"
 msgstr "Reverteix a l'original"
 
-#: ../vcview.py:127
+#: ../vcview.py:134
 msgid "Delete locally"
 msgstr "Suprimeix localment"
 
-#: ../vcview.py:131
+#: ../vcview.py:138
 msgid "_Flatten"
 msgstr "_Aplanar"
 
-#: ../vcview.py:131
+#: ../vcview.py:138
 msgid "Flatten directories"
 msgstr "Directoris aplanats"
 
-#: ../vcview.py:132
+#: ../vcview.py:139
 msgid "_Modified"
 msgstr "_Modificat"
 
-#: ../vcview.py:133
+#: ../vcview.py:140
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../vcview.py:133
+#: ../vcview.py:140
 msgid "Show normal"
 msgstr "Mostra el normal"
 
-#: ../vcview.py:134
+#: ../vcview.py:141
 msgid "Non _VC"
 msgstr "No controlat pel control de _versions"
 
-#: ../vcview.py:134
+#: ../vcview.py:141
 msgid "Show unversioned files"
 msgstr "Mostra els fitxers sense versionat"
 
-#: ../vcview.py:135
+#: ../vcview.py:142
 msgid "Ignored"
 msgstr "Ignorat"
 
-#: ../vcview.py:135
+#: ../vcview.py:142
 msgid "Show ignored files"
 msgstr "Mostra els fitxers ignorats"
 
-#: ../vcview.py:173
+#: ../vcview.py:180
 msgid "Location"
 msgstr "Ubicació"
 
-#: ../vcview.py:174
+#: ../vcview.py:181
 msgid "Status"
 msgstr "Estat"
 
-#: ../vcview.py:175
+#: ../vcview.py:182
 msgid "Rev"
 msgstr "Revisió"
 
-#: ../vcview.py:177
+#: ../vcview.py:184
 msgid "Options"
 msgstr "Opcions"
 
-#: ../vcview.py:261
+#: ../vcview.py:230
+msgid "Choose one Version Control"
+msgstr "Trieu un control de versions"
+
+#: ../vcview.py:231
+msgid "Only one Version Control in this directory"
+msgstr "Només hi ha un control de versions en aquest directori"
+
+#: ../vcview.py:316
 msgid "(Empty)"
 msgstr "(Buit)"
 
-#: ../vcview.py:294
+#: ../vcview.py:349
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] S'estan obtenint les diferències"
 
-#: ../vcview.py:301
+#: ../vcview.py:356
 #, python-format
 msgid "[%s] Applying patch"
 msgstr "[%s] S'està aplicant el pedaç"
 
-#: ../vcview.py:305
+#: ../vcview.py:360
 msgid "No differences found."
 msgstr "No s'ha trobat cap diferència."
 
-#: ../vcview.py:382
+#: ../vcview.py:439
 msgid "Select some files first."
 msgstr "Primer seleccioneu alguns fitxers."
 
-#: ../vcview.py:449
-msgid "Invoking patch failed, you need GNU patch."
-msgstr "No s'ha trobat l'ordre «patch», necessiteu el patch del GNU."
+#: ../vcview.py:505
+#, python-format
+msgid ""
+"\n"
+"                    Invoking 'patch' failed.\n"
+"                    \n"
+"                    Maybe you don't have 'GNU patch' installed,\n"
+"                    or you use an untested version of %s.\n"
+"                    \n"
+"                    Please send email bug report to:\n"
+"                    meld-list gnome org\n"
+"                    \n"
+"                    Containing the following information:\n"
+"                    \n"
+"                    - meld version: '%s'\n"
+"                    - source control software type: '%s'\n"
+"                    - source control software version: 'X.Y.Z'\n"
+"                    - the output of '%s somefile.txt'\n"
+"                    - patch command: '%s'\n"
+"                    "
+msgstr ""
+"\n"
+"                    Ha fallat la invocació de l'ordre «patch».\n"
+"                    \n"
+"                    �s possible que no tingueu instal·lat el \n"
+"                    programa «GNU patch», o que estigueu \n"
+"                    utilitzant una versió de proves de %s.\n"
+"                    \n"
+"                    Hauríeu d'enviar un correu electrònic \n"
+"                    d'informe d'error a:\n"
+"                    meld-list gnome org\n"
+"                    \n"
+"                    I que contingui la informació següent:\n"
+"                    \n"
+"                    - versió del Meld: «%s»\n"
+"                    - tipus de control de versions: «%s»\n"
+"                    - versió del control de versions: «X.Y.Z»\n"
+"                    - el que mostri l'intèrpret d'ordres \n"
+"                      per a «%s fitxer.txt»\n"
+"                    - ordre patch: «%s»\n"
+"                    "
 
 #. These are the possible states of files. Be sure to get the colons correct.
-#: ../vc/_vc.py:40
+#: ../vc/_vc.py:39
 msgid ""
 "Ignored:Unversioned:::Error::Newly added:Modified:<b>Conflict</b>:Removed:"
 "Missing"
@@ -1046,7 +1174,7 @@ msgstr ""
 "Ignorat:No versionat:::Error::Afegit de nou:Modificat:<b>Conflicte</b>:"
 "Suprimit:Falta"
 
-#: ../vc/cvs.py:155
+#: ../vc/cvs.py:151
 #, python-format
 msgid ""
 "Error converting to a regular expression\n"
@@ -1057,6 +1185,39 @@ msgstr ""
 "El patró era «%s»\n"
 "L'error foufoufoufoufoufoufoufou «%s»"
 
+#~ msgid "The regular expression '%s' was not found."
+#~ msgstr "No s'ha trobat l'expressió regular «%s»."
+
+#~ msgid "The text '%s' was not found."
+#~ msgstr "No s'ha trobat el text «%s»."
+
+#~ msgid "Find"
+#~ msgstr "Cerca"
+
+#~ msgid "Match _entire word only"
+#~ msgstr "Només coincideixen paraules s_enceres"
+
+#~ msgid "_Wrap around"
+#~ msgstr "_Torna al principi en arribar al final de fitxer"
+
+#~ msgid ""
+#~ "Version Control\t1\tCVS .svn MT [{]arch[}] .arch-ids .arch-inventory RCS\n"
+#~ msgstr ""
+#~ "Control de versió\t1\tCVS .svn MT [{]arch[}] .arch-ids .arch-inventory "
+#~ "RCS\n"
+
+#~ msgid "VC chooser"
+#~ msgstr "Seleccionador de control de versions"
+
+#~ msgid "Pick one source control plugin"
+#~ msgstr "Escolliu un connector de control de versions"
+
+#~ msgid "Invoking patch failed, you need GNU patch."
+#~ msgstr "No s'ha trobat l'ordre «patch», necessiteu el patch del GNU."
+
+#~ msgid "(gnome-default-editor)"
+#~ msgstr "(editor-predeterminat-gnome)"
+
 #~ msgid "Save the current file with a different name"
 #~ msgstr "Desa el fitxer actual amb un nom diferent"
 
@@ -1259,9 +1420,6 @@ msgstr ""
 #~ msgid "CVS"
 #~ msgstr "CVS"
 
-#~ msgid "CVS Directory"
-#~ msgstr "Directori del CVS"
-
 #~ msgid "CVS binary"
 #~ msgstr "Fitxer binari del CVS"
 
@@ -1332,9 +1490,6 @@ msgstr ""
 #~ msgid "folder"
 #~ msgstr "carpeta"
 
-#~ msgid "file"
-#~ msgstr "fitxer"
-
 #~ msgid "nonexistant"
 #~ msgstr "inexistent"
 
@@ -1400,9 +1555,6 @@ msgstr ""
 #~ msgid "CVS view"
 #~ msgstr "Visualització CVS"
 
-#~ msgid "C_VS Browser"
-#~ msgstr "Navegador C_VS"
-
 #~ msgid "Edit menu popup invokes"
 #~ msgstr "El menú emergent d'edició invoca"