msgid "Copy fro&m Right"
msgstr ""
+msgid "Copy Selected Line(s) to Right"
+msgstr ""
+
+msgid "Copy Selected Line(s) to Left"
+msgstr ""
+
+msgid "Copy Selected Line(s) from Left"
+msgstr ""
+
+msgid "Copy Selected Line(s) from Right"
+msgstr ""
+
msgid "&Select Line Difference\tF4"
msgstr "&Seleccionar dif. de línea\tF4"
-msgid "Add this change to &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
msgstr ""
msgid "&Undo"
msgid "&With..."
msgstr "&Con..."
+msgid "Open &Parent Folder..."
+msgstr ""
+
msgid "S&hell Menu"
msgstr ""
msgid "Ri&ght Read-only"
msgstr "Lado derec&ho sólo lectura"
-msgid "File En&coding..."
-msgstr "&Codificación de archivo..."
+msgid "&File Encoding..."
+msgstr "Codi&ficación de archivo..."
msgid "Select &All\tCtrl+A"
msgstr "Seleccion&ar todo\tCtrl+A"
msgid "Com&pare Statistics..."
msgstr "Estadísticas de &comparación..."
-msgid "Refre&sh\tF5"
+msgid "Refresh\tF5"
msgstr "Ac&tualizar\tF5"
msgid "&Refresh Selected\tCtrl+F5"
msgid "Re&load\tCtrl+F5"
msgstr ""
-msgid "&File Encoding..."
-msgstr "Codi&ficación de archivo..."
-
msgid "Reco&mpare As"
msgstr "Recomparar como"
msgid "&Open Left"
msgstr "Abrir archivo &Izquierdo"
-msgid "with &External Editor"
-msgstr "con un Editor &Externo"
-
-msgid "Open &Parent Folder..."
-msgstr ""
+msgid "With &External Editor"
+msgstr "Con un Editor &Externo"
msgid "Open Midd&le"
msgstr "Abrir archivo &Medio"
msgid "Ig&nore all"
msgstr "Ig&norar todos"
+msgid "Ignore blan&k lines"
+msgstr "Ignorar diferencias de líneas &vacías"
+
msgid "Ignore &case"
msgstr "Ignorar MAYÚSCULAS/minús&culas"
msgid "Ignore codepage &differences"
msgstr "Ignorar &diferencias en página de códigos"
+msgid "Ignore c&omment differences"
+msgstr ""
+
msgid "&Include Subfolders"
msgstr "&Incluir subcarpetas"
msgid "&Automatically verify paths in Open-dialog"
msgstr "Comprobar rutas &automáticamente en la ventana de apertura"
-msgid "All&ow only one instance to run"
-msgstr "Permitir s&olo una instancia en ejecución"
+msgid "Single instance mode:"
+msgstr ""
msgid "As&k when closing multiple windows"
msgstr "Preguntar al cerrar &múltiples ventanas"
msgid "Close \"Select Files or Folders\" Dialog on clicking OK button"
msgstr "Cerrar \"Seleccione Archivos o Carpetas\" al hacer clic en Comparar"
-msgid "O&pen-dialog Auto-Completion:"
+msgid "Op&en-dialog Auto-Completion:"
msgstr "A&uto-completar en diálogos de apertura:"
msgid "Language:"
msgid "Find &Prev"
msgstr "&Anterior"
-msgid "&OK"
+msgid "&Ok"
msgstr "&Aceptar"
msgid "Replace"
msgid "&Background color:"
msgstr ""
-msgid "&Ok"
-msgstr "&Aceptar"
-
msgid "&Apply"
msgstr "&Aplicar"
msgid "Remove"
msgstr "Eliminar"
-msgid "Ignored Substitutions"
+msgid "Substitution Filters"
msgstr ""
msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
msgid "I&gnore all"
msgstr "I&gnorar todos"
-msgid "Ignore blan&k lines"
-msgstr "Ignorar diferencias de líneas &vacías"
-
-msgid "Ignore c&omment differences"
-msgstr ""
-
msgid "E&nable moved block detection"
msgstr "Habilitar detecció&n de bloques movidos"
msgid "Enable indent &heuristic"
msgstr "Habilitar indentación &heuristica"
-msgid "Completely unhighlight the ignored changes"
+msgid "Completely unhighlight the ignored differences"
msgstr ""
msgid "Editor"
"Seleccione la página de códigos predeterminada a utilizar cuando se carguen "
"archivos no Unicode:"
-msgid "Detect codepage info for these files: .html, .rc, .xml\nNeed to restart session."
+msgid "Detect codepage info for these type of files: .html, .rc, .xml\nNeed to restart session."
msgstr ""
"Detectar página de códigos para éstos archivos : .html, .rc, .xml\n"
"Se necesita reiniciar."
-msgid "Detect codepage for text files using mlang.dll\nNeed to restart session."
+msgid "Detect codepage for text files with mlang.dll\nNeed to restart session."
msgstr ""
"Detectar página de códigos para archivos de texto usando mlang.dll\n"
"Necesita reiniciar sesión."
msgid "Ign&ore time differences less than 3 seconds"
msgstr "Ign&orar diferencias de tiempo menores de 3 segundos"
-msgid "&Include unique subfolders contents"
+msgid "Include &unique subfolders contents"
msgstr "&Incluir contenidos únicos de subcarpetas"
msgid "&Automatically expand all subfolders"
"Comparar Carpeta de WinMerge"
msgid ""
-"Developers:\n"
-"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi "
-"Sawanaka, Gal Hammer, Alexander Skinner"
-msgstr ""
-"Desarrolladores:\n"
-"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi "
-"Sawanaka, Gal Hammer, Alexander Skinner"
-
-msgid ""
"WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you "
"are welcome to redistribute it under certain circumstances; see the GNU "
"General Public License in the Help menu for details."
"Para volver a hacer visible este cuadro de dialogo, presione el botón "
"Restablecer en la página General del cuadro de diálogo Opciones."
-msgid "Color Schemes"
-msgstr ""
-
msgid "Syntax"
msgstr "Sintaxis"
+msgid "Color Schemes"
+msgstr ""
+
msgid "Folder Compare"
msgstr "Comparar de carpetas"
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "Archivos XML (*.xml)|*.xml|Todos los archivos (*.*)|*.*||"
+msgid "File Type"
+msgstr ""
+
+msgid "Extension"
+msgstr "Extensión"
+
msgid "Name"
msgstr "Nombre"
msgid "Mine File"
msgstr "Archivo interno"
+msgid "Original File"
+msgstr ""
+
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr ""
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr ""
+#, c-format
+msgid " Sel: %d | %d"
+msgstr ""
+
msgid "Merge"
msgstr "Combinar"
msgid "Middle Date"
msgstr "Fecha Media"
-msgid "Extension"
-msgstr "Extensión"
-
msgid "Left Size"
msgstr "Tamaño izq."
msgid "Do you want to move to the previous page?"
msgstr "¿Quieres pasar a la página anterior?"
+msgid "Do you want to move to the first file?"
+msgstr ""
+
+msgid "Do you want to move to the last file?"
+msgstr ""
+
#, c-format
msgid ""
"Different codepages found in left (cp%d) and right (cp%d) files.\n"
msgid "\nFirst File"
msgstr ""
-msgid "\nNext File"
+msgid "\nNext File (Ctrl+F8)"
msgstr ""
msgid "\nLast File"
msgstr ""
-msgid "\nPrevious File"
+msgid "\nPrevious File (Ctrl+F7)"
msgstr ""
msgid "The adapted unpacker is applied to both files (one file only needs the extension)."
msgid "Rc: (%d, %d) "
msgstr ""
-msgid "Find what"
+msgid "<Edit here>"
msgstr ""
-msgid "Replace with"
+msgid "No differences to select found"
msgstr ""
-msgid "<Edit here>"
+msgid "No differences found to add as substitution filter"
msgstr ""
-msgid "No differences to select found"
+msgid "The pair is already present in the list of Substitution Filters"
msgstr ""
-msgid "No differences found to add as ignored substitution"
+msgid "Add this change to Substitution Filters?"
msgstr ""
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "Text only"
msgstr ""
-msgid "Add this change to Ignored Substitutions?"
+msgid "Line-by-line position and text"
msgstr ""
+msgid "Word-by-word position and text"
+msgstr ""
+
+msgid "Allow only one instance to run"
+msgstr "Permitir solo una instancia en ejecución"
+
+msgid "Allow only one instance to run and wait for the instance to terminate"
+msgstr ""