Synced up to 440; ruby.syntax fixed

This commit is contained in:
Andrey Grozin 2020-02-04 19:40:05 +07:00
parent b45cded779
commit c32c314d44
14 changed files with 1873 additions and 17 deletions

View File

@ -14,4 +14,9 @@ Kang Bundo <kangbundo@gmail.com> (Korean)
Liu Hao <jarryson@gmail.com> (Simplified Chinese)
Miś Uszatek <adres.email@ymail.com> (Polish)
Oleg Pakhtusov <oupakhtusov@gmail.com> (Russian)
Pedro Albuquerque <pmra@gmx.com> (Portuguese)
Wei-Lun Chao <bluebat@member.fsf.org> (Traditional Chinese)
Contributors
------------
Guillaume Hoffmann <guillaumh@gmail.com>

View File

@ -1,6 +1,9 @@
Diffuse 0.5.0 - 2016-07-10
- convert to Python 3
- convert to GTK 3
- added Pedro Albuquerque's Portuguese translation
- added Åke Engelbrektson's Swedish translation
- added Guillaume Hoffmann's Darcs support improvements
- add support for Git submodules
- added Akom Chotiphantawanon's Thai translation
- updated Python highlighting for Python 3 grammar

View File

@ -6,7 +6,7 @@
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the licence, or (at your option) any later
# Foundation; either version 2 of the license, or (at your option) any later
# version.
#
# This program is distributed in the hope that it will be useful, but WITHOUT
@ -234,7 +234,7 @@ class SyntaxParser:
lookup[state] = []
lookup[prev_state].append([pattern, token_type, next_state])
# given a string and an initial state, idenitify the final state and tokens
# given a string and an initial state, identify the final state and tokens
def parse(self, state_name, s):
lookup = self.transitions_lookup
transitions, blocks, start = lookup[state_name], [], 0
@ -561,7 +561,7 @@ class Resources:
return self.strings[symbol]
except KeyError:
logDebug('Warning: unknown string "%s"' % (symbol, ))
self.strings[symbols] = v = ''
self.strings[symbol] = v = ''
return v
# syntax highlighting
@ -1712,11 +1712,11 @@ class _Darcs:
if mods:
args.extend(['whatsnew', '-s'])
else:
args.extend(['changes', '--number', '-s'])
args.extend(['log', '--number', '-s'])
try:
args.extend(['-n', str(int(rev))])
except ValueError:
args.extend(['--max-count', '1', '-p', rev])
args.extend(['-h', rev])
# build list of interesting files
pwd, isabs = os.path.abspath(os.curdir), False
for name in names:
@ -1779,7 +1779,8 @@ class _Darcs:
if fs.contains(k):
if not isabs:
k = relpath(pwd, k)
modified[k] = [ (k, prev), (k, rev) ]
if k not in renamed:
modified[k] = [ (k, prev), (k, rev) ]
elif x == ' ':
# renamed
k = s[1:].split(' -> ')
@ -1815,7 +1816,7 @@ class _Darcs:
try:
args.extend([ '-n', str(int(rev)) ])
except ValueError:
args.extend([ '-p', rev ])
args.extend([ '-h', rev ])
args.append(safeRelativePath(self.root, name, prefs, 'darcs_cygwin'))
return popenRead(self.root, args, prefs, 'darcs_bash')
@ -2644,7 +2645,7 @@ def _get_svk_repo(path, prefs):
if _VcsFolderSet(projs).contains(name):
return _Svk(path)
except IOError:
logError(_('Error parsing %s.') % (config, ))
logError(_('Error parsing %s.') % (svkconfig, ))
class VCSs:
def __init__(self):
@ -6895,6 +6896,7 @@ class Diffuse(Gtk.Window):
[ Gtk.STOCK_SAVE_AS, self.button_cb, 'save_as', _('Save File As...') ] ])
self.label = label = Gtk.Label.new()
label.set_selectable(True)
label.set_ellipsize(Pango.EllipsizeMode.START)
label.set_max_width_chars(1)
@ -8441,7 +8443,7 @@ if __name__ == '__main__':
specs, labels, options = [], [], {}
# start a new tab
mode = 'single'
elif i + 1 < argc and arg in [ '-V', '--vcs-order' ]:
elif i + 1 < argc and arg in [ '-V', '--vcs' ]:
i += 1
diff.prefs.setString('vcs_search_order', args[i])
diff.preferences_updated()

View File

@ -7,19 +7,23 @@ Name[it]=Diffuse - strumento di unione
Name[ja]=Diffuse
Name[ko]=Diffuse
Name[pl]=Diffuse Narzędzie Scalania
Name[pt]=Diffuse Ferramenta de união
Name[ru]=Diffuse Инструмент Слияния
Name[sv]=Diffuse sammanfogningsverktyg
Name[th]=Diffuse -
Name[zh_CN]=Diffuse
Name[zh_TW]=Diffuse
Comment=Graphical tool for merging and comparing text files
Comment[cs]=Grafický nástroj pro slučování a porovnávání textových souborů
Comment[de]=Werzeug zum Mischen und Vergleichen von Textdateien
Comment[de]=Werkzeug zum Mischen und Vergleichen von Textdateien
Comment[es]=Un utillaje para juntar y comparar archivos de texto
Comment[it]=Strumento grafico per l'unione e il confronto di file
Comment[ja]=
Comment[ko]=
Comment[pl]=Graficzne narzędzie do łączenia i porównywania plików tekstowych
Comment[pt]=Ferramenta gráfica para unir e comparar ficheiros de texto
Comment[ru]=Графический инструмент для слияния и сравнения текстовых файлов
Comment[sv]=Grafiskt verktyg för jämförelse och sammanfogning av textfiler
Comment[th]=
Comment[zh_CN]=
Comment[zh_TW]=

View File

@ -63,7 +63,7 @@ syntax_pattern raw_string normal c++_string '\)[^\)]*"'
syntax_pattern raw_string raw_string c++_string '.[^\)]*'
# literals
syntax_pattern normal normal c++_literal '((([0-9]+\.[0-9]*|\.[0-9]+)(e[\+\-]?[0-9]+)?|[0-9]+e[\+\-]?[0-9]+)[fl]?|(0|[1-9][0-9]*)f|(0x[0-9a-f]+|0[0-7]*|[1-9][0-9]*)(ul?|lu?)?)' ignorecase
syntax_pattern normal normal c++_literal '((([0-9]+\.[0-9]*|\.[0-9]+)([ep][\+\-]?[0-9]+)?|[0-9]+[ep][\+\-]?[0-9]+)[fl]?|(0|[1-9][0-9]*)f|(0x[0-9a-f]+|0[0-7]*|[1-9][0-9]*)(ul?|lu?)?)' ignorecase
syntax_pattern normal normal c++_literal '\b(true|false|M_E|M_LOG2E|M_LOG10E|M_LN2|M_LN10|M_PI|M_PI_2|M_PI_4|M_1_PI|M_2_PI|M_2_SQRTPI|M_SQRT2|M_SQRT1_2|NULL|nullptr)\b'
# typing keywords

View File

@ -56,7 +56,7 @@ syntax_pattern backquote backquote ruby_string '.[^\\`]*'
# literals
syntax_pattern normal expr ruby_literal '(((0|[1-9][0-9])*\.[0-9]*|\.[0-9]+)(e[\+\-]?[0-9]+)?|(0|[1-9][0-9]*)e[\+\-]?[0-9]+|0x[0-9a-f]+|0[0-7]*|[1-9][0-9]*)' ignorecase
syntax_pattern normal expr ruby_literal '\b(false|FALSE|nil|NIL|true|TRUE|__FILE__|__LINE__)\b'
syntax_pattern normal expr ruby_literal '\?(\C-|\M-(\C-)?)?[^ \t\r\n]'
syntax_pattern normal expr ruby_literal '\\?(\\C-|\\M-(\\C-)?)?[^ \t\r\n]'
# variables
syntax_pattern normal expr ruby_variable "(@@?[a-z_][a-z_0-9]*|\\$([a-z_][a-z_0-9]*|-[a-z]|[!@&`+1~=/\\\\,;\\.<>0\\*\\$\\?:\"']))\b" ignorecase

View File

@ -197,7 +197,7 @@ msgstr "Derrick Moser <derrick_moser@yahoo.com>"
#: ../src/usr/bin/diffuse:6733
msgid "Diffuse is a graphical tool for merging and comparing text files."
msgstr "Diffuse ist ein graphisches Werzeug zum Zusammenführen und Vergleichen von Textdateien."
msgstr "Diffuse ist ein graphisches Werkzeug zum Zusammenführen und Vergleichen von Textdateien."
#: ../src/usr/bin/diffuse:821
msgid "Display"
@ -717,7 +717,7 @@ msgstr ""
" diffuse [ [OPTION...] [DATEI...] ]...\n"
" diffuse ( -h | -? | --help | -v | --version )\n"
"\n"
"Diffuse ist ein graphisches Werzeug zum Zusammenführen und Vergleichen von\n"
"Diffuse ist ein graphisches Werkzeug zum Zusammenführen und Vergleichen von\n"
"Textdateien. Diffuse ist in der Lage eine beliebige Anzahl von Dateien direkt\n"
"zu vergleichen und gibt Nutzern die Möglichkeit manuell die Übereinstimmung\n"
"anzupassen und Dateien direkt zu bearbeiten. Diffuse kann ebenfalls Revisionen\n"

View File

@ -1,4 +1,4 @@
# German translations for diffuse package.
# Spanish translations for diffuse package.
# This is an alpha release.
# Copyright (C) 2010 Derrick Moser
# This file is distributed under the same license as the diffuse package.

916
translations/pt.po Normal file
View File

@ -0,0 +1,916 @@
# Portuguese translation for diffuse.
# Copyright © 2006-2013 Derrick Moser
# This file is distributed under the same license as the diffuse package.
# Pedro Albuquerque <pmra@gmx.com>, 2018.
#
msgid ""
msgstr ""
"Project-Id-Version: diffuse-svn\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-04-08 18:50+0100\n"
"PO-Revision-Date: 2018-11-12 07:54+0000\n"
"Last-Translator: Pedro Albuquerque <pmra@gmx.com>\n"
"Language-Team: Português <pmra@gmx.com>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Gtranslator 2.91.7\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-SourceCharset: UTF-8\n"
"X-Poedit-Basepath: ..\\src\\usr\\bin\n"
"X-Poedit-KeywordsList: _\n"
"X-Poedit-SearchPath-0: .\n"
#: diffuse:68
msgid "Copyright © 2006-2014 Derrick Moser"
msgstr "Copyright © 2006-2014 Derrick Moser"
#: diffuse:86
msgid ""
"Usage:\n"
" diffuse [ [OPTION...] [FILE...] ]...\n"
" diffuse ( -h | -? | --help | -v | --version )\n"
"\n"
"Diffuse is a graphical tool for merging and comparing text files. Diffuse "
"is\n"
"able to compare an arbitrary number of files side-by-side and gives users "
"the\n"
"ability to manually adjust line matching and directly edit files. Diffuse "
"can\n"
"also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,\n"
"Monotone, RCS, Subversion, and SVK repositories for comparison and merging.\n"
"\n"
"Help Options:\n"
" ( -h | -? | --help ) Display this usage information\n"
" ( -v | --version ) Display version and copyright "
"information\n"
"\n"
"Configuration Options:\n"
" --no-rcfile Do not read any resource files\n"
" --rcfile <file> Specify explicit resource file\n"
"\n"
"General Options:\n"
" ( -c | --commit ) <rev> File revisions <rev-1> and <rev>\n"
" ( -D | --close-if-same ) Close all tabs with no differences\n"
" ( -e | --encoding ) <codec> Use <codec> to read and write files\n"
" ( -L | --label ) <label> Display <label> instead of the file name\n"
" ( -m | --modified ) Create a new tab for each modified file\n"
" ( -r | --revision ) <rev> File revision <rev>\n"
" ( -s | --separate ) Create a new tab for each file\n"
" ( -t | --tab ) Start a new tab\n"
" --line <line> Start with line <line> selected\n"
" --null-file Create a blank file comparison pane\n"
"\n"
"Display Options:\n"
" ( -b | --ignore-space-change ) Ignore changes to white space\n"
" ( -B | --ignore-blank-lines ) Ignore changes in blank lines\n"
" ( -E | --ignore-end-of-line ) Ignore end of line differences\n"
" ( -i | --ignore-case ) Ignore case differences\n"
" ( -w | --ignore-all-space ) Ignore white space differences"
msgstr ""
"Uso:\n"
" diffuse [ [OPÇÃO...] [FICHEIRO...] ]...\n"
" diffuse ( -h | -? | --help | -v | --version )\n"
"\n"
"O Diffuse é uma ferramenta gráfica para unir e comparar ficheiros de texto.\n"
"É capaz de comparar um número arbitrário de ficheiros lado-a-lado e dá aos\n"
"utilizadores a possibilidade de ajustar manualmente as linhas com edição "
"directa.\n"
"Pode ainda obter revisões de ficheiros de repositórios Bazaar, CVS, Darcs, "
"Git,\n"
"Mercurial, Monotone, RCS, Subversion e SVK para comparação e união.\n"
"\n"
"Opções de ajuda:\n"
" ( -h | -? | --help ) mostra esta ajuda\n"
" ( -v | --version ) mostra informação da versão e direitos de "
"autor\n"
"\n"
"Opções de configuração:\n"
" --no-rcfile não lê qualquer ficheiro de recursos\n"
" --rcfile <file> especifica um ficheiro de recursos "
"especifico\n"
"\n"
"Opções gerais:\n"
" ( -c | --commit ) <rev> revisões de ficheiros <rev-1> e <rev>\n"
" ( -D | --close-if-same ) fecha todos os separadores sem "
"diferenças\n"
" ( -e | --encoding ) <codec> usa <codec> para ler e escreve ficheiros\n"
" ( -L | --label ) <etiqueta> mostra <etiqueta> em vez do nome do "
"ficheiro\n"
" ( -m | --modified ) cria um novo separador para cada ficheiro "
"modificado\n"
" ( -r | --revision ) <rev> revisão de ficheiro <rev>\n"
" ( -s | --separate ) cria um novo separador para cada "
"ficheiro\n"
" ( -t | --tab ) começa um novo separador\n"
" --line <linha> começa com a linha <linha> seleccionada\n"
" --null-file cria um novo painel de comparação\n"
"\n"
"Opções de vista:\n"
" ( -b | --ignore-space-change ) ignora alterações a espaços\n"
" ( -B | --ignore-blank-lines ) ignora alterações a linhas em branco\n"
" ( -E | --ignore-end-of-line ) ignora diferenças de fim de linha\n"
" ( -i | --ignore-case ) ignora diferenças entre maiúsculas\n"
" ( -w | --ignore-all-space ) ignora diferenças de espaços"
#: diffuse:706
#, python-format
msgid "Error processing line %(line)d of %(file)s."
msgstr "Erro ao processar a linha %(line)d de %(file)s."
#: diffuse:725
msgid "Auto Detect"
msgstr "Detecção automática"
#: diffuse:821
msgid "Display"
msgstr "Mostrar"
#: diffuse:823
msgid "Font"
msgstr "Letra"
#: diffuse:824
msgid "Tab width"
msgstr "Largura de tabulação"
#: diffuse:825
msgid "Show right margin"
msgstr "Mostrar margem direita"
#: diffuse:826
msgid "Right margin"
msgstr "Margem direita"
#: diffuse:827
msgid "Show line numbers"
msgstr "Mostrar números de linha"
#: diffuse:828
msgid "Show white space characters"
msgstr "Mostrar espaços em branco"
#: diffuse:829
msgid "Ignore case differences"
msgstr "Ignorar diferenças de maiúsculas"
#: diffuse:830
msgid "Ignore white space differences"
msgstr "Ignorar diferenças de espaços"
#: diffuse:831 diffuse:839
msgid "Ignore changes to white space"
msgstr "Ignorar alterações a espaços"
#: diffuse:832
msgid "Ignore blank line differences"
msgstr "Ignorar diferenças de linhas em branco"
#: diffuse:833
msgid "Ignore end of line differences"
msgstr "Ignorar diferenças de fins de linha"
#: diffuse:835
msgid "Alignment"
msgstr "Alinhamento"
#: diffuse:837
msgid "Ignore case"
msgstr "Ignorar maiúsculas"
#: diffuse:838
msgid "Ignore white space"
msgstr "Ignorar espaços"
#: diffuse:840
msgid "Ignore blank lines"
msgstr "Ignorar linhas em branco"
#: diffuse:841
msgid "Ignore end of line characters"
msgstr "Ignorar caracteres de fim de linha"
#: diffuse:843
msgid "Editor"
msgstr "Editor"
#: diffuse:845
msgid "Auto indent"
msgstr "Indentação automática"
#: diffuse:846
msgid "Expand tabs to spaces"
msgstr "Expandir tabulações para espaços"
#: diffuse:847
msgid "Soft tab width"
msgstr "Largura de tabulação suave"
#: diffuse:849
msgid "Tabs"
msgstr "Separadores"
#: diffuse:851
msgid "Default panes"
msgstr "Painéis predefinidos"
#: diffuse:852
msgid "Always show the tab bar"
msgstr "Mostrar sempre a barra de separadores"
#: diffuse:853
#, python-format
msgid "Warn me when closing a tab will quit %s"
msgstr "Avisar se fechar um separador fecha o %s"
#: diffuse:855
msgid "Regional Settings"
msgstr "Definições regionais"
#: diffuse:857
msgid "Default codec"
msgstr "Codificação predefinida"
#: diffuse:858
msgid "Order of codecs used to identify encoding"
msgstr "Ordem de codificações para identificar a codificação"
#: diffuse:878
msgid "Cygwin"
msgstr "Cygwin"
#: diffuse:880
msgid "Root directory"
msgstr "Pasta raiz"
#: diffuse:881
msgid "Cygdrive prefix"
msgstr "Prefixo cygdrive"
#: diffuse:901
msgid "\"co\" command"
msgstr "comando \"co\""
#: diffuse:902
msgid "\"rlog\" command"
msgstr "comando \"rlog\""
#: diffuse:904
msgid "Command"
msgstr "Comando"
#: diffuse:906
msgid "Launch from a Bash login shell"
msgstr "Iniciar numa consola de sessão bash"
#: diffuse:908
msgid "Update paths for Cygwin"
msgstr "Actualizar caminhos para o Cygwin"
#: diffuse:911
msgid "Version Control"
msgstr "Controlo de versões"
#: diffuse:975
msgid "Preferences"
msgstr "Preferências"
#: diffuse:1013 diffuse:7276
#, python-format
msgid "Error writing %s."
msgstr "Erro ao excrever %s."
#: diffuse:1630 diffuse:2193 diffuse:2321
#, python-format
msgid "Error parsing revision %s."
msgstr "Erro ao analisar a revisão %s."
#: diffuse:2528
#, python-format
msgid "Error parsing %s."
msgstr "Erro ao analisar %s."
#: diffuse:4737
msgid "Align with Selection"
msgstr "Alinhar com a selecção"
#: diffuse:4738
msgid "Isolate"
msgstr "Isolar"
#: diffuse:4739
msgid "Merge Selection"
msgstr "Unir selecção"
#: diffuse:4741 diffuse:7563
msgid "Cut"
msgstr "Cortar"
#: diffuse:4742 diffuse:7564
msgid "Copy"
msgstr "Copiar"
#: diffuse:4743 diffuse:7565
msgid "Paste"
msgstr "Colar"
#: diffuse:4745
msgid "Select All"
msgstr "Seleccionar tudo"
#: diffuse:4746 diffuse:7566
msgid "Clear Edits"
msgstr "Limpar edição"
#: diffuse:4748
msgid "Swap with Selected Pane"
msgstr "Trocar com o painel seleccionado"
#: diffuse:6597
msgid "Find..."
msgstr "Localizar..."
#: diffuse:6603
msgid "Search For: "
msgstr "Procurar por: "
#: diffuse:6628
msgid "Match Case"
msgstr "Comparar maiúsculas"
#: diffuse:6633
msgid "Search Backwards"
msgstr "Procurar para trás"
#: diffuse:6647
#, python-format
msgid "Closing this tab will quit %s."
msgstr "Fechar este painel sai do %s."
#: diffuse:6659
msgid "Encoding: "
msgstr "Codificação: "
#: diffuse:6669
msgid "Revision: "
msgstr "Revisão: "
#: diffuse:6733
msgid "Diffuse is a graphical tool for merging and comparing text files."
msgstr ""
"O Diffuse é uma ferramenta gráfica para unir e comparar ficheiros de texto."
#: diffuse:6736
msgid "Derrick Moser <derrick_moser@yahoo.com>"
msgstr "Derrick Moser <derrick_moser@yahoo.com>"
#: diffuse:6737
msgid "translator-credits"
msgstr "Pedro Albuquerque <pmra@gmx.com>"
#: diffuse:6740
msgid ""
"This program is free software; you can redistribute it and/or modify it "
"under the terms of the GNU General Public License as published by the Free "
"Software Foundation; either version 2 of the licence, or (at your option) "
"any later version.\n"
"\n"
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
"more details.\n"
"\n"
"You should have received a copy of the GNU General Public License along with "
"this program. You may also obtain a copy of the GNU General Public License "
"from the Free Software Foundation by visiting their web site (http://www.fsf."
"org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, "
"Fifth Floor, Boston, MA 02110-1301 USA\n"
msgstr ""
"Este programa é gratuito; pode redistribuí-lo e/ou modificá-lo sob os termos "
"da GNU General Public License como publicada pela Free Software Foundation; "
"seja a versão 2 da licença, ou (por opção sua) qualquer versão posterior.\n"
"\n"
"Este programa é distribuído na esperança de ser útil, mas SEM QUALQUER "
"GARANTIA; nem mesmo a garantia implícita de COMERCIALIZAÇÃO ou ADEQUAÇÃO A "
"UM PROPÓSITO EM PARTICULAR. Veja a GNU General Public License para mais "
"detalhes.\n"
"\n"
"Deverá ter recebido uma cópia da GNU General Public License juntamente com o "
"programa. Também pode obter uma cópia da GNU General Public License da Free "
"Software Foundation visitando a sua página web (http://www.fsf.org/) ou "
"escrevendo para Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, "
"Boston, MA 02110-1301 USA\n"
#: diffuse:6774
msgid "Close Tab"
msgstr "Fechar separador"
#: diffuse:6829
msgid "Open File..."
msgstr "Abrir ficheiro..."
#: diffuse:6830
msgid "Reload File"
msgstr "Recarregar ficheiro"
#: diffuse:6831
msgid "Save File"
msgstr "Gravar ficheiro"
#: diffuse:6832
msgid "Save File As..."
msgstr "Gravar ficheiro como..."
#: diffuse:6912
#, python-format
msgid "Column %d"
msgstr "Coluna %d"
#: diffuse:6977
msgid "Save changes before loading the new file?"
msgstr "Gravar alterações antes de carregar o novo ficheiro?"
#: diffuse:7105
#, python-format
msgid "Error reading revision %(rev)s of %(file)s."
msgstr "Erro ao ler a revisão %(rev)s de %(file)s."
#: diffuse:7107 diffuse:8322
#, python-format
msgid "Error reading %s."
msgstr "Erro ao ler %s."
#: diffuse:7130
msgid "Open File"
msgstr "Abrir ficheiro"
#: diffuse:7180
#, python-format
msgid "The file %s changed on disk. Do you want to reload the file?"
msgstr "O ficheiro %s foi alterado no disco. Deseja recarregá-lo?"
#: diffuse:7200
#, python-format
msgid "Save %(title)s Pane %(pane)d"
msgstr "Gravar %(title)s painel %(pane)d"
#: diffuse:7226
#, python-format
msgid "A file named %s already exists. Do you want to overwrite it?"
msgstr "Já existe um ficheiro chamado %s. Deseja sobrescrevê-lo?"
#: diffuse:7231
#, python-format
msgid ""
"The file %s has been modified by another process since reading it. If you "
"save, all the external changes could be lost. Save anyways?"
msgstr ""
"O ficheiro %s foi modificado por outro processo desde a leitura. Se gravar, "
"perderá todas as alterações externas. Gravar mesmo assim?"
#: diffuse:7272
#, python-format
msgid "Error encoding to %s."
msgstr "Erro ao codificar para %s."
#: diffuse:7306
msgid "Go To Line..."
msgstr "Ir para linha..."
#: diffuse:7306
msgid "Line Number: "
msgstr "Número de linha: "
#: diffuse:7332
msgid ""
"Press the enter key or double click to edit. Press the space bar or use the "
"RMB menu to manually align."
msgstr ""
"Prima Enter ou faça duplo clique para editar. Prima a barra de espaços ou "
"use o menu RMB para alinhar manualmente."
#: diffuse:7334
msgid "Press the escape key to finish editing."
msgstr "Prima Esc para terminar a edição."
#: diffuse:7336
msgid ""
"Select target line and press the space bar to align. Press the escape key "
"to cancel."
msgstr ""
"Seleccione a linha alvo e prima a barra de espaço para alinhar. Prima Esc "
"para cancelar."
#: diffuse:7436
msgid "_File"
msgstr "_Ficheiro"
#: diffuse:7437
msgid "_Open File..."
msgstr "Abrir ficheir_o..."
#: diffuse:7438
msgid "Open File In New _Tab..."
msgstr "Abrir ficheiro em no_vo separador..."
#: diffuse:7439
msgid "Open _Modified Files..."
msgstr "Abrir ficheiros _modificados..."
#: diffuse:7440
msgid "Open Commi_t..."
msgstr "Abrir rev_isão..."
#: diffuse:7441
msgid "_Reload File"
msgstr "_Recarregar ficheiro"
#: diffuse:7443
msgid "_Save File"
msgstr "_Gravar ficheiro"
#: diffuse:7444
msgid "Save File _As..."
msgstr "Gr_avar ficheiro como..."
#: diffuse:7445
msgid "Save A_ll"
msgstr "Gravar _tudo"
#: diffuse:7447
msgid "New _2-Way File Merge"
msgstr "Nova união de _2 vias"
#: diffuse:7448
msgid "New _3-Way File Merge"
msgstr "Nova união de _3 vias"
#: diffuse:7449
msgid "New _N-Way File Merge..."
msgstr "Nova união de _N vias"
#: diffuse:7451
msgid "_Close Tab"
msgstr "Fe_char separador"
#: diffuse:7452
msgid "_Undo Close Tab"
msgstr "Desfa_zer Fechar separador"
#: diffuse:7453
msgid "_Quit"
msgstr "_Sair"
#: diffuse:7455
msgid "_Edit"
msgstr "_Editar"
#: diffuse:7456
msgid "_Undo"
msgstr "_Desfazer"
#: diffuse:7457
msgid "_Redo"
msgstr "_Refazer"
#: diffuse:7459
msgid "Cu_t"
msgstr "Cor_tar"
#: diffuse:7460
msgid "_Copy"
msgstr "_Copiar"
#: diffuse:7461
msgid "_Paste"
msgstr "Co_lar"
#: diffuse:7463
msgid "Select _All"
msgstr "Seleccion_ar tudo"
#: diffuse:7464
msgid "C_lear Edits"
msgstr "_Limpar edição"
#: diffuse:7465
msgid "_Dismiss All Edits"
msgstr "_Descartar toda a edição"
#: diffuse:7467
msgid "_Find..."
msgstr "_Localizar..."
#: diffuse:7468
msgid "Find _Next"
msgstr "Localizar segui_nte"
#: diffuse:7469
msgid "Find Pre_vious"
msgstr "Localizar _anterior"
#: diffuse:7470
msgid "_Go To Line..."
msgstr "_Ir para linha..."
#: diffuse:7472
msgid "Pr_eferences..."
msgstr "Pr_eferências..."
#: diffuse:7474
msgid "None"
msgstr "Nada"
#: diffuse:7482
msgid "_View"
msgstr "_Ver"
#: diffuse:7483
msgid "_Syntax Highlighting"
msgstr "Realce de _sintaxe"
#: diffuse:7485
msgid "Re_align All"
msgstr "Re_alinhar tudo"
#: diffuse:7486
msgid "_Isolate"
msgstr "_Isolar"
#: diffuse:7488
msgid "_First Difference"
msgstr "_Primeira diferença"
#: diffuse:7489
msgid "_Previous Difference"
msgstr "Diferença _anterior"
#: diffuse:7490
msgid "_Next Difference"
msgstr "Diferença segui_nte"
#: diffuse:7491
msgid "_Last Difference"
msgstr "Ú_ltima diferença"
#: diffuse:7493
msgid "Fir_st Tab"
msgstr "P_rimeiro separador"
#: diffuse:7494
msgid "Pre_vious Tab"
msgstr "_Separador anterior"
#: diffuse:7495
msgid "Next _Tab"
msgstr "Separador seguin_te"
#: diffuse:7496
msgid "Las_t Tab"
msgstr "Úl_timo separador"
#: diffuse:7498
msgid "Shift Pane _Right"
msgstr "Mover separador à di_reita"
#: diffuse:7499
msgid "Shift Pane _Left"
msgstr "Mover separador à es_querda"
#: diffuse:7501
msgid "F_ormat"
msgstr "F_ormatar"
#: diffuse:7502
msgid "Convert To _Upper Case"
msgstr "Converter para maiúsc_ulas"
#: diffuse:7503
msgid "Convert To _Lower Case"
msgstr "Converter para minúscu_las"
#: diffuse:7505
msgid "Sort Lines In _Ascending Order"
msgstr "Ordenar linhas _ascendentemente"
#: diffuse:7506
msgid "Sort Lines In D_escending Order"
msgstr "Ordenar linhas d_escendentemente"
#: diffuse:7508
msgid "Remove Trailing _White Space"
msgstr "Remover espaços _finais"
#: diffuse:7509
msgid "Convert Tabs To _Spaces"
msgstr "Converter tabulações em e_spaços"
#: diffuse:7510
msgid "Convert Leading Spaces To _Tabs"
msgstr "Converter espaços iniciais em _tabulações"
#: diffuse:7512
msgid "_Increase Indenting"
msgstr "Aumentar _indentação"
#: diffuse:7513
msgid "De_crease Indenting"
msgstr "Di_minuir indentação"
#: diffuse:7515
msgid "Convert To _DOS Format"
msgstr "Converter para formato _DOS"
#: diffuse:7516
msgid "Convert To _Mac Format"
msgstr "Converter para formato _Mac"
#: diffuse:7517
msgid "Convert To Uni_x Format"
msgstr "Converter para formato Uni_x"
#: diffuse:7519
msgid "_Merge"
msgstr "_Unir"
#: diffuse:7520
msgid "Copy Selection _Right"
msgstr "Copiar selecção à di_reita"
#: diffuse:7521
msgid "Copy Selection _Left"
msgstr "Copiar selecção à es_querda"
#: diffuse:7523
msgid "Copy Left _Into Selection"
msgstr "Cop_iar esquerda para a selecção"
#: diffuse:7524
msgid "Copy Right I_nto Selection"
msgstr "Copiar _direita para a selecção"
#: diffuse:7525
msgid "_Merge From Left Then Right"
msgstr "U_nir da esquerda e depois da direita"
#: diffuse:7526
msgid "M_erge From Right Then Left"
msgstr "Unir da dir_eita e depois da esquerda"
#: diffuse:7528
msgid "_Help"
msgstr "A_juda"
#: diffuse:7529
msgid "_Help Contents..."
msgstr "Conteúdo da a_juda..."
#: diffuse:7531
#, python-format
msgid "_About %s..."
msgstr "_Acerca do %s..."
#: diffuse:7545
msgid "New 2-Way File Merge"
msgstr "Nova união de _2 vias"
#: diffuse:7546
msgid "New 3-Way File Merge"
msgstr "Nova união de _3 vias"
#: diffuse:7548
msgid "Realign All"
msgstr "Realinhar tudo"
#: diffuse:7549
msgid "First Difference"
msgstr "Primeira diferença"
#: diffuse:7550
msgid "Previous Difference"
msgstr "Diferença anterior"
#: diffuse:7551
msgid "Next Difference"
msgstr "Diferença seguinte"
#: diffuse:7552
msgid "Last Difference"
msgstr "Última diferença"
#: diffuse:7554
msgid "Copy Selection Right"
msgstr "Copiar selecção à direita"
#: diffuse:7555
msgid "Copy Selection Left"
msgstr "Copiar selecção à esquerda"
#: diffuse:7556
msgid "Copy Left Into Selection"
msgstr "Copiar esquerda para a selecção"
#: diffuse:7557
msgid "Copy Right Into Selection"
msgstr "Copiar direita para a selecção"
#: diffuse:7558
msgid "Merge From Left Then Right"
msgstr "Unir da esquerda e depois da direita"
#: diffuse:7559
msgid "Merge From Right Then Left"
msgstr "Unir da direita e depois da esquerda"
#: diffuse:7561
msgid "Undo"
msgstr "Desfazer"
#: diffuse:7562
msgid "Redo"
msgstr "Refazer"
#: diffuse:7678
msgid ""
"Some files have unsaved changes. Select the files to save before closing."
msgstr ""
"Alguns ficheiros têm alterações por gravar. Seleccione os ficheiros a gravar "
"antes de fechar."
#: diffuse:7691
msgid "Tab"
msgstr "Separador"
#: diffuse:7696
msgid "Pane"
msgstr "Painel"
#: diffuse:7707
msgid "Close _Without Saving"
msgstr "Fechar sem gra_var"
#: diffuse:7818
#, python-format
msgid "File Merge %d"
msgstr "União de ficheiros %d"
#: diffuse:7921
#, python-format
msgid "Error retrieving commits for %s."
msgstr "Erro ao obter revisões de %s."
#: diffuse:7952
#, python-format
msgid "Error retrieving modifications for %s."
msgstr "Erro ao obter modificações de %s."
#: diffuse:7985
msgid "Open File In New Tab"
msgstr "Abrir ficheiro em novo separador"
#: diffuse:8001
msgid "Choose Folder With Modified Files"
msgstr "Escolher pasta com ficheiros modificados"
#: diffuse:8014
msgid "No modified files found."
msgstr "Sem ficheiros modificados."
#: diffuse:8021
msgid "Choose Folder With Commit"
msgstr "Escolher pasta com revisão"
#: diffuse:8034
msgid "No committed files found."
msgstr "Sem ficheiros revistos."
#: diffuse:8070
msgid "New N-Way File Merge..."
msgstr "Nova união de N vias..."
#: diffuse:8070
msgid "Number of panes: "
msgstr "Número de painéis: "
#: diffuse:8135
msgid "Phrase not found. Continue from the end of the file?"
msgstr "Frase não encontrada. Continuar do final do ficheiro?"
#: diffuse:8137
msgid "Phrase not found. Continue from the start of the file?"
msgstr "Frase não encontrada. Continuar do início do ficheiro?"
#: diffuse:8399
msgid "Error parsing line number."
msgstr "Erro ao analisar o número de linha."
#: diffuse:8409
#, python-format
msgid "Skipping unknown argument \"%s\"."
msgstr "A ignorar argumento desconhecido \"%s\"."
#: diffuse:8416
#, python-format
msgid "Error processing argument \"%s\". Directory not expected."
msgstr "Erro ao processar o argumento \"%s\". Pasta inesperada."

View File

@ -1,4 +1,4 @@
# German translations for diffuse package.
# Russian translations for diffuse package.
# This is an alpha release.
# Copyright (C) 2009 Derrick Moser
# This file is distributed under the same license as the diffuse package.

910
translations/sv.po Normal file
View File

@ -0,0 +1,910 @@
# Swedish translation for Diffuse.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# Åke Engelbrektson <eson@svenskasprakfiler.se>, 2017.
#
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-12-24 14:49+0100\n"
"PO-Revision-Date: 2017-12-31 08:45+0100\n"
"Language-Team: Svenska Språkfiler <contactform@svenskasprakfiler.se>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.7.1\n"
"Last-Translator: Åke Engelbrektson <eson@svenskasprakfiler.se>\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Language: sv\n"
#: diffuse:892
msgid "\"co\" command"
msgstr "\"co\" kommando"
#: diffuse:893
msgid "\"rlog\" command"
msgstr "\"rlog\" kommando"
#: diffuse:7229
#, python-format
msgid "A file named %s already exists. Do you want to overwrite it?"
msgstr "Det finns redan en fil som heter %s. Vill du skriva över den?"
#: diffuse:4731
msgid "Align with Selection"
msgstr "Justera till markerat"
#: diffuse:826
msgid "Alignment"
msgstr "Justering"
#: diffuse:843
msgid "Always show the tab bar"
msgstr "Visa alltid flikfältet"
#: diffuse:716
msgid "Auto Detect"
msgstr "Identifiera automatiskt"
#: diffuse:836
msgid "Auto indent"
msgstr "Automatiskt indrag"
#: diffuse:7469
msgid "C_lear Edits"
msgstr "_Rensa bort ändringar"
#: diffuse:8026
msgid "Choose Folder With Commit"
msgstr "Välj mapp för arkiveringar"
#: diffuse:8006
msgid "Choose Folder With Modified Files"
msgstr "Välj mapp med ändrade filer"
#: diffuse:4740 diffuse:7571
msgid "Clear Edits"
msgstr "Rensa bort ändringar"
#: diffuse:6777
msgid "Close Tab"
msgstr "Stäng fliken"
#: diffuse:7712
msgid "Close _Without Saving"
msgstr "Stäng _utan att spara"
#: diffuse:6641
#, python-format
msgid "Closing this tab will quit %s."
msgstr "Stängning av denna flik, avslutar %s."
#: diffuse:6915
#, python-format
msgid "Column %d"
msgstr "Kolumn %d"
#: diffuse:895
msgid "Command"
msgstr "Kommando"
#: diffuse:7515
msgid "Convert Leading Spaces To _Tabs"
msgstr "Konvertera inledande blanksteg till _tabbar"
#: diffuse:7514
msgid "Convert Tabs To _Spaces"
msgstr "Konvertera tabbar till _blanksteg"
#: diffuse:7522
msgid "Convert To Uni_x Format"
msgstr "Konvertera till _Unix-format"
#: diffuse:7520
msgid "Convert To _DOS Format"
msgstr "Konvertera till _DOS-format"
#: diffuse:7508
msgid "Convert To _Lower Case"
msgstr "Konvertera till _gemener"
#: diffuse:7521
msgid "Convert To _Mac Format"
msgstr "Konvertera till _MAC-format"
#: diffuse:7507
msgid "Convert To _Upper Case"
msgstr "Konvertera till _VERSALER"
#: diffuse:4736 diffuse:7569
msgid "Copy"
msgstr "Kopiera"
#: diffuse:7561
msgid "Copy Left Into Selection"
msgstr "Kopiera från vänster till markerat"
#: diffuse:7528
msgid "Copy Left _Into Selection"
msgstr "Kopiera från vänster till _markerat"
#: diffuse:7529
msgid "Copy Right I_nto Selection"
msgstr "Kopiera från höger till m_arkerat"
#: diffuse:7562
msgid "Copy Right Into Selection"
msgstr "Kopiera från höger till markerat"
#: diffuse:7560
msgid "Copy Selection Left"
msgstr "Kopiera från markerat till vänster"
#: diffuse:7559
msgid "Copy Selection Right"
msgstr "Kopiera från markerat till höger"
#: diffuse:7526
msgid "Copy Selection _Left"
msgstr "Kopiera från markerat till _vänster"
#: diffuse:7525
msgid "Copy Selection _Right"
msgstr "Kopiera från markerat till _höger"
#: diffuse:68
msgid "Copyright © 2006-2014 Derrick Moser"
msgstr "Copyright © 2006-2014 Derrick Moser"
#: diffuse:7464
msgid "Cu_t"
msgstr "Klipp _ut"
#: diffuse:4735 diffuse:7568
msgid "Cut"
msgstr "Klipp ut"
#: diffuse:872
msgid "Cygdrive prefix"
msgstr "Cygdrive-prefix"
#: diffuse:869
msgid "Cygwin"
msgstr "Cygwin"
#: diffuse:7518
msgid "De_crease Indenting"
msgstr "Mi_nska indrag"
#: diffuse:848
msgid "Default codec"
msgstr "Standardkodning"
#: diffuse:842
msgid "Default panes"
msgstr "Standardpaneler"
#: diffuse:6739
msgid "Derrick Moser <derrick_moser@yahoo.com>"
msgstr "Derrick Moser <derrick_moser@yahoo.com>"
#: diffuse:6736
msgid "Diffuse is a graphical tool for merging and comparing text files."
msgstr ""
"Diffuse är ett grafiskt verktyg för att jämföra och sammanfoga textfiler."
#: diffuse:812
msgid "Display"
msgstr "Visning"
#: diffuse:834
msgid "Editor"
msgstr "Redigerare"
#: diffuse:6660
msgid "Encoding: "
msgstr "Teckentabell: "
#: diffuse:7275
#, python-format
msgid "Error encoding to %s."
msgstr "Fel vid kodning till %s."
#: diffuse:2519
#, python-format
msgid "Error parsing %s."
msgstr "Fel vid tolkning av %s."
#: diffuse:8404
msgid "Error parsing line number."
msgstr "Fel vid tolkning av radnummer."
#: diffuse:1621 diffuse:2184 diffuse:2312
#, python-format
msgid "Error parsing revision %s."
msgstr "Fel vid tolkning av revision %s."
#: diffuse:8421
#, python-format
msgid "Error processing argument \"%s\". Directory not expected."
msgstr ""
"Fel vid bearbetning av argumentet \"%s\". Katalogen inte den förväntade."
#: diffuse:697
#, python-format
msgid "Error processing line %(line)d of %(file)s."
msgstr "Fel vid bearbetning av rad %(line)d i %(file)s."
#: diffuse:7110 diffuse:8327
#, python-format
msgid "Error reading %s."
msgstr "Fel vid läsning av %s."
#: diffuse:7108
#, python-format
msgid "Error reading revision %(rev)s of %(file)s."
msgstr "Fel vid läsning av revision %(rev)s i %(file)s"
#: diffuse:7926
#, python-format
msgid "Error retrieving commits for %s."
msgstr "Fel vid hämtning av arkiveringar för %s."
#: diffuse:7957
#, python-format
msgid "Error retrieving modifications for %s."
msgstr "Fel vid hämtning av ändringar för %s."
#: diffuse:1004 diffuse:7279
#, python-format
msgid "Error writing %s."
msgstr "Fel vid skrivning av %s."
#: diffuse:837
msgid "Expand tabs to spaces"
msgstr "Expandera tabbar till blanksteg"
#: diffuse:7506
msgid "F_ormat"
msgstr "F_ormat"
#: diffuse:7823
#, python-format
msgid "File Merge %d"
msgstr "Filsammanslagning %d"
#: diffuse:7474
msgid "Find Pre_vious"
msgstr "Sök _föregående"
#: diffuse:7473
msgid "Find _Next"
msgstr "Sök _nästa"
#: diffuse:6591
msgid "Find..."
msgstr "Sök..."
#: diffuse:7498
msgid "Fir_st Tab"
msgstr "F_örsta fliken"
#: diffuse:7554
msgid "First Difference"
msgstr "Första olikheten"
#: diffuse:814
msgid "Font"
msgstr "Teckensnitt"
#: diffuse:7309
msgid "Go To Line..."
msgstr "Gå till rad..."
#: diffuse:823
msgid "Ignore blank line differences"
msgstr "Ignorera olikheter i tomma rader"
#: diffuse:831
msgid "Ignore blank lines"
msgstr "Ignorera tomma rader"
#: diffuse:828
msgid "Ignore case"
msgstr "Ignorera skiftläge"
#: diffuse:820
msgid "Ignore case differences"
msgstr "Ignorera olikheter i skiftläge"
#: diffuse:822 diffuse:830
msgid "Ignore changes to white space"
msgstr "Ignorera ändringar i blanksteg"
#: diffuse:832
msgid "Ignore end of line characters"
msgstr "Ignorera tecken för radavslut"
#: diffuse:824
msgid "Ignore end of line differences"
msgstr "Ignorera olikheter i radavslut"
#: diffuse:829
msgid "Ignore white space"
msgstr "Ignorera blanksteg"
#: diffuse:821
msgid "Ignore white space differences"
msgstr "Ignorera olikheter i blanksteg"
#: diffuse:4732
msgid "Isolate"
msgstr "Isolera"
#: diffuse:7501
msgid "Las_t Tab"
msgstr "S_ista fliken"
#: diffuse:7557
msgid "Last Difference"
msgstr "Sista olikheten"
#: diffuse:897
msgid "Launch from a Bash login shell"
msgstr "Starta från ett Bash inloggningsskal"
#: diffuse:7309
msgid "Line Number: "
msgstr "Radnummer: "
#: diffuse:7531
msgid "M_erge From Right Then Left"
msgstr "S_ammanfoga från höger, sedan vänster"
#: diffuse:6622
msgid "Match Case"
msgstr "Skiftlägeskänslig"
#: diffuse:7563
msgid "Merge From Left Then Right"
msgstr "Sammanfoga från vänster, sedan höger"
#: diffuse:7564
msgid "Merge From Right Then Left"
msgstr "Sammanfoga från höger, sedan vänster"
#: diffuse:4733
msgid "Merge Selection"
msgstr "Sammanfoga markerat"
#: diffuse:7550
msgid "New 2-Way File Merge"
msgstr "Ny 2-vägs filsammanslagning"
#: diffuse:7551
msgid "New 3-Way File Merge"
msgstr "Ny 3-vägs filsammanslagning"
#: diffuse:8075
msgid "New N-Way File Merge..."
msgstr "Ny x-vägs filsammanslagning..."
#: diffuse:7452
msgid "New _2-Way File Merge"
msgstr "Ny _2-vägs filsammanslagning"
#: diffuse:7453
msgid "New _3-Way File Merge"
msgstr "Ny _3-vägs filsammanslagning"
#: diffuse:7454
msgid "New _N-Way File Merge..."
msgstr "Ny _x-vägs filsammanslagning..."
#: diffuse:7556
msgid "Next Difference"
msgstr "Nästa olikhet"
#: diffuse:7500
msgid "Next _Tab"
msgstr "Nästa _flik"
#: diffuse:8039
msgid "No committed files found."
msgstr "Inga arkiverade filer hittades."
#: diffuse:8019
msgid "No modified files found."
msgstr "Inga ändrade filer hittades"
#: diffuse:7479
msgid "None"
msgstr "Ingen"
#: diffuse:8075
msgid "Number of panes: "
msgstr "Antal paneler: "
#: diffuse:7445
msgid "Open Commi_t..."
msgstr "_Öppna arkivering..."
#: diffuse:7133
msgid "Open File"
msgstr "Öppna fil"
#: diffuse:7990
msgid "Open File In New Tab"
msgstr "Öppna fil i ny flik"
#: diffuse:7443
msgid "Open File In New _Tab..."
msgstr "Öppna fil i ny _flik..."
#: diffuse:6832
msgid "Open File..."
msgstr "Öppna fil..."
#: diffuse:7444
msgid "Open _Modified Files..."
msgstr "Öppna _ändrade filer..."
#: diffuse:849
msgid "Order of codecs used to identify encoding"
msgstr "Tabellordning för att identifiera kodning"
#: diffuse:7701
msgid "Pane"
msgstr "Panel"
#: diffuse:4737 diffuse:7570
msgid "Paste"
msgstr "Klistra in"
#: diffuse:8140
msgid "Phrase not found. Continue from the end of the file?"
msgstr "Frasen kan inte hittas. Vill du fortsätta från slutet på filen?"
#: diffuse:8142
msgid "Phrase not found. Continue from the start of the file?"
msgstr "Frasen kan inte hittas. Vill du fortsätta från början på filen?"
#: diffuse:7477
msgid "Pr_eferences..."
msgstr "_Inställningar..."
#: diffuse:7499
msgid "Pre_vious Tab"
msgstr "Före_gående flik"
#: diffuse:966
msgid "Preferences"
msgstr "Inställningar"
#: diffuse:7335
msgid ""
"Press the enter key or double click to edit. Press the space bar or use the "
"RMB menu to manually align."
msgstr ""
"Tryck på returtangenten eller dubbelklicka för att redigera. Tryck blanksteg "
"eller använd kontextmenyn för att justera manuellt."
#: diffuse:7337
msgid "Press the escape key to finish editing."
msgstr "Tryck på Esc-tangenten för att avsluta redigering."
#: diffuse:7555
msgid "Previous Difference"
msgstr "Föregående olikhet"
#: diffuse:7490
msgid "Re_align All"
msgstr "_Omjustera alla"
#: diffuse:7553
msgid "Realign All"
msgstr "Omjustera alla"
#: diffuse:7567
msgid "Redo"
msgstr "Upprepa"
#: diffuse:846
msgid "Regional Settings"
msgstr "Regionala inställningar"
#: diffuse:6833
msgid "Reload File"
msgstr "Läs in filen igen"
#: diffuse:7513
msgid "Remove Trailing _White Space"
msgstr "Ta bort avslutande blanksteg"
#: diffuse:6670
msgid "Revision: "
msgstr "Revision: "
#: diffuse:817
msgid "Right margin"
msgstr "Höger marginal"
#: diffuse:871
msgid "Root directory"
msgstr "Root-mapp"
#: diffuse:7203
#, python-format
msgid "Save %(title)s Pane %(pane)d"
msgstr "Spara %(title)s Panel %(pane)d"
#: diffuse:7450
msgid "Save A_ll"
msgstr "Spara a_lla"
#: diffuse:6834
msgid "Save File"
msgstr "Spara filen"
#: diffuse:6835
msgid "Save File As..."
msgstr "Spara filen som..."
#: diffuse:7449
msgid "Save File _As..."
msgstr "Spara filen _som..."
#: diffuse:6980
msgid "Save changes before loading the new file?"
msgstr "Vill du spara ändringar före inläsning av den ny filen?"
#: diffuse:6627
msgid "Search Backwards"
msgstr "Sök bakifrån"
#: diffuse:6597
msgid "Search For: "
msgstr "Sök efter: "
#: diffuse:4739
msgid "Select All"
msgstr "Markera alla"
#: diffuse:7468
msgid "Select _All"
msgstr "Markera _alla"
#: diffuse:7339
msgid ""
"Select target line and press the space bar to align. Press the escape key "
"to cancel."
msgstr ""
"Välj målrad och tryck blanksteg för att justera. Tryck Esc för att avbryta."
#: diffuse:7504
msgid "Shift Pane _Left"
msgstr "Växla panel _vänster"
#: diffuse:7503
msgid "Shift Pane _Right"
msgstr "Växla panel _höger"
#: diffuse:818
msgid "Show line numbers"
msgstr "Visa radnummer"
#: diffuse:816
msgid "Show right margin"
msgstr "Visa höger marginal"
#: diffuse:819
msgid "Show white space characters"
msgstr "Visa blankstegstecken"
#: diffuse:8414
#, python-format
msgid "Skipping unknown argument \"%s\"."
msgstr "Undantar okänt argument \"%s\"."
#: diffuse:838
msgid "Soft tab width"
msgstr "Mjuk tabulatorbredd"
#: diffuse:7683
msgid ""
"Some files have unsaved changes. Select the files to save before closing."
msgstr ""
"Vissa filer har ändringar som inte sparats. Välj filer att spara före "
"stängning."
#: diffuse:7511
msgid "Sort Lines In D_escending Order"
msgstr "Sortera rader i _fallande ordning"
#: diffuse:7510
msgid "Sort Lines In _Ascending Order"
msgstr "Sortera rader i _stigande ordning"
#: diffuse:4742
msgid "Swap with Selected Pane"
msgstr "Växla med markerad panel"
#: diffuse:7696
msgid "Tab"
msgstr "Flik"
#: diffuse:815
msgid "Tab width"
msgstr "Tabulatorbredd"
#: diffuse:840
msgid "Tabs"
msgstr "Flikar"
#: diffuse:7183
#, python-format
msgid "The file %s changed on disk. Do you want to reload the file?"
msgstr "Filen %s har ändrats på disk. Vill du läsa in filen igen?"
#: diffuse:7234
#, python-format
msgid ""
"The file %s has been modified by another process since reading it. If you "
"save, all the external changes could be lost. Save anyways?"
msgstr ""
"Filen %s har ändrats av en annan process sedan inläsning. Om du sparar kan "
"alla externa ändringar förloras. Vill du spara ändå?"
#: diffuse:6743
msgid ""
"This program is free software; you can redistribute it and/or modify it "
"under the terms of the GNU General Public License as published by the Free "
"Software Foundation; either version 2 of the licence, or (at your option) "
"any later version.\n"
"\n"
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
"more details.\n"
"\n"
"You should have received a copy of the GNU General Public License along with "
"this program. You may also obtain a copy of the GNU General Public License "
"from the Free Software Foundation by visiting their web site (http://www.fsf."
"org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, "
"Fifth Floor, Boston, MA 02110-1301 USA\n"
msgstr ""
"Detta program är fri mjukvara! Du kan återdistribuera det och/eller "
"modifiera det, under villkoren för GNU General Public License som den "
"publiceras av Free Software Foundation. Antingen version 2 av licensen, "
"eller valfri senare version.\n"
"\n"
"Programmet distribueras i hopp om att det skall vara användbart, men UTAN "
"NÅGRA GARANTIER. Utan ens underförstådd garanti om SÄLJBARHET eller "
"LÄMPLIGHET FÖR ETT VISST ÄNDAMÅL. Se GNU General Public License för mer "
"detaljerad info.\n"
"\n"
"Du bör ha fått en kopia av GNU General Public License tillsammans med det "
"här programmet. Du kan också hämta en kopia av GNU General Public License "
"från Free Software Foundation genom att besöka deras webbsida (http://www."
"fsf.org/) eller skriva till Free Software Foundation, Inc., 51 Franklin St, "
"Fifth Floor, Boston, MA 02110-1301 USA.\n"
#: diffuse:7566
msgid "Undo"
msgstr "Ångra"
#: diffuse:899
msgid "Update paths for Cygwin"
msgstr "Uppdatera sökvägar för Cygwin"
#: diffuse:86
msgid ""
"Usage:\n"
" diffuse [ [OPTION...] [FILE...] ]...\n"
" diffuse ( -h | -? | --help | -v | --version )\n"
"\n"
"Diffuse is a graphical tool for merging and comparing text files. Diffuse "
"is\n"
"able to compare an arbitrary number of files side-by-side and gives users "
"the\n"
"ability to manually adjust line matching and directly edit files. Diffuse "
"can\n"
"also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,\n"
"Monotone, RCS, Subversion, and SVK repositories for comparison and merging.\n"
"\n"
"Help Options:\n"
" ( -h | -? | --help ) Display this usage information\n"
" ( -v | --version ) Display version and copyright "
"information\n"
"\n"
"Configuration Options:\n"
" --no-rcfile Do not read any resource files\n"
" --rcfile <file> Specify explicit resource file\n"
"\n"
"General Options:\n"
" ( -c | --commit ) <rev> File revisions <rev-1> and <rev>\n"
" ( -D | --close-if-same ) Close all tabs with no differences\n"
" ( -e | --encoding ) <codec> Use <codec> to read and write files\n"
" ( -L | --label ) <label> Display <label> instead of the file name\n"
" ( -m | --modified ) Create a new tab for each modified file\n"
" ( -r | --revision ) <rev> File revision <rev>\n"
" ( -s | --separate ) Create a new tab for each file\n"
" ( -t | --tab ) Start a new tab\n"
" --line <line> Start with line <line> selected\n"
" --null-file Create a blank file comparison pane\n"
"\n"
"Display Options:\n"
" ( -b | --ignore-space-change ) Ignore changes to white space\n"
" ( -B | --ignore-blank-lines ) Ignore changes in blank lines\n"
" ( -E | --ignore-end-of-line ) Ignore end of line differences\n"
" ( -i | --ignore-case ) Ignore case differences\n"
" ( -w | --ignore-all-space ) Ignore white space differences"
msgstr ""
"Användning:\n"
" diffuse [ [OPTION...] [FILE...] ]...\n"
" diffuse ( -h | -? | --help | -v | --version )\n"
"\n"
"Diffuse är ett grafiskt verktyg för sammanfogning och jämförelse av "
"textfiler. \n"
"Diffuse kan jämföra ett godtyckligt antal filer sida vid sida och ger "
"användaren\n"
"en möjlighet att manuellt justera radmatchning och att direktredigera "
"filer.\n"
"Diffuse kan också hämta revideringar av filer från Bazaar, CVS, Darcs, Git,\n"
"Mercurial, Monotone, RCS, Subversion, och SVK för jämförelse och "
"sammanfogning.\n"
"\n"
"Hjälpalternativ:\n"
" ( -h | -? | --help ) Visa användningsinformation\n"
" ( -v | --version ) Visa version och upphovsrättsinformation\n"
"\n"
"Konfigurationsalternativ:\n"
" --no-rcfile Läs inga resursfiler\n"
" --rcfile <file> Specificera explicit resursfil\n"
"\n"
"General Options:\n"
" ( -c | --commit ) <rev> Filrevisioner <rev-1> och <rev>\n"
" ( -D | --close-if-same ) Stäng alla flikar som saknar olikheter\n"
" ( -e | --encoding ) <codec> Använd <teckentabell> för att läsa och "
"skriva filer\n"
" ( -L | --label ) <label> Visa <etikett> istället för filnamn\n"
" ( -m | --modified ) Skapa ny flik för varje ändrad fil\n"
" ( -r | --revision ) <rev> Filrevision <rev>\n"
" ( -s | --separate ) Skapa ny flik för varje fil\n"
" ( -t | --tab ) Starta en ny flik\n"
" --line <line> Starta med rad <radnummer> markerad\n"
" --null-file Skapa en tom filjämförelsepanel\n"
"\n"
"Display Options:\n"
" ( -b | --ignore-space-change ) Ignorera ändringar i blanksteg\n"
" ( -B | --ignore-blank-lines ) Ignorera ändringar i tomma rader\n"
" ( -E | --ignore-end-of-line ) Ignorera olikheter i radslut\n"
" ( -i | --ignore-case ) Ignorera olikheter i skiftläge\n"
" ( -w | --ignore-all-space ) Ignorera olikheter i blanksteg"
#: diffuse:902
msgid "Version Control"
msgstr "Versionskontroll"
#: diffuse:844
#, python-format
msgid "Warn me when closing a tab will quit %s"
msgstr "Varna mig när flikstängning kommer att avsluta %s"
#: diffuse:7536
#, python-format
msgid "_About %s..."
msgstr "_Om %s..."
#: diffuse:7456
msgid "_Close Tab"
msgstr "_Stäng fliken"
#: diffuse:7465
msgid "_Copy"
msgstr "_Kopiera"
#: diffuse:7470
msgid "_Dismiss All Edits"
msgstr "_Förkasta alla ändringar"
#: diffuse:7460
msgid "_Edit"
msgstr "_Redigera"
#: diffuse:7441
msgid "_File"
msgstr "_Arkiv"
#: diffuse:7472
msgid "_Find..."
msgstr "_Sök..."
#: diffuse:7493
msgid "_First Difference"
msgstr "_Första olikheten"
#: diffuse:7475
msgid "_Go To Line..."
msgstr "_Gå till rad..."
#: diffuse:7533
msgid "_Help"
msgstr "_Hjälp"
#: diffuse:7534
msgid "_Help Contents..."
msgstr "_Hjälpinnehåll..."
#: diffuse:7517
msgid "_Increase Indenting"
msgstr "_Utöka indrag"
#: diffuse:7491
msgid "_Isolate"
msgstr "_Isolera"
#: diffuse:7496
msgid "_Last Difference"
msgstr "_Sista olikheten"
#: diffuse:7524
msgid "_Merge"
msgstr "_Sammanfoga"
#: diffuse:7530
msgid "_Merge From Left Then Right"
msgstr "_Sammanfoga från vänster, sedan höger"
#: diffuse:7495
msgid "_Next Difference"
msgstr "_Nästa olikhet"
#: diffuse:7442
msgid "_Open File..."
msgstr "_Öppna fil..."
#: diffuse:7466
msgid "_Paste"
msgstr "_Klistra in"
#: diffuse:7494
msgid "_Previous Difference"
msgstr "_Föregående olikhet"
#: diffuse:7458
msgid "_Quit"
msgstr "_Avsluta"
#: diffuse:7462
msgid "_Redo"
msgstr "_Upprepa"
#: diffuse:7446
msgid "_Reload File"
msgstr "_Läs in filen igen"
#: diffuse:7448
msgid "_Save File"
msgstr "_Spara filen"
#: diffuse:7488
msgid "_Syntax Highlighting"
msgstr "_Syntaxmarkering"
#: diffuse:7461
msgid "_Undo"
msgstr "_Ångra"
#: diffuse:7457
msgid "_Undo Close Tab"
msgstr "_Ångra flikstängning"
#: diffuse:7487
msgid "_View"
msgstr "_Visa"
#: diffuse:6740
msgid "translator-credits"
msgstr "Åke Engelbrektson"

View File

@ -1,4 +1,4 @@
# Chinese translations for X package
# Chinese translations for diffuse package
# Diffuse 软件包的简体中文翻译.
# Copyright (C) 2009 THE X'S COPYRIGHT HOLDER
# This file is distributed under the same license as the X package.

8
windows-installer/pt.isl Normal file
View File

@ -0,0 +1,8 @@
[CustomMessages]
;cp1252
ToolName=Diffuse - ferramenta de união
UninstallTool=Desinstalar o Diffuse
OpenWithTool=Abrir com o Diffuse
MainFiles=Ficheiros principais
ShellIntegration=Integração com o menu do Windows
AddToPath=Adicionar o caminho de instalação ao caminho de procura

8
windows-installer/sv.isl Normal file
View File

@ -0,0 +1,8 @@
[CustomMessages]
;cp1252
ToolName=Diffuse sammanfogningsverktyg
UninstallTool=Avinstallera Diffuse sammanfogningsverktyg
OpenWithTool=Öppna med Diffuse sammanfogningsverktyg
MainFiles=Huvudfiler
ShellIntegration=Windows skalintegrering
AddToPath=Lägg till installationssökvägen till sökvägen