diff --git a/AUTHORS b/AUTHORS index 62540a3..459683f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -14,4 +14,9 @@ Kang Bundo (Korean) Liu Hao (Simplified Chinese) Miś Uszatek (Polish) Oleg Pakhtusov (Russian) +Pedro Albuquerque (Portuguese) Wei-Lun Chao (Traditional Chinese) + +Contributors +------------ +Guillaume Hoffmann diff --git a/ChangeLog b/ChangeLog index 63fd7ef..a1741b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/src/usr/bin/diffuse b/src/usr/bin/diffuse index 92fca7a..5da8d04 100755 --- a/src/usr/bin/diffuse +++ b/src/usr/bin/diffuse @@ -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() diff --git a/src/usr/share/applications/diffuse.desktop b/src/usr/share/applications/diffuse.desktop index 5ff9143..d22ac4b 100644 --- a/src/usr/share/applications/diffuse.desktop +++ b/src/usr/share/applications/diffuse.desktop @@ -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]=比較與合併文字檔案的圖形化工具 diff --git a/src/usr/share/diffuse/syntax/c++.syntax b/src/usr/share/diffuse/syntax/c++.syntax index 811d268..70a3d4c 100644 --- a/src/usr/share/diffuse/syntax/c++.syntax +++ b/src/usr/share/diffuse/syntax/c++.syntax @@ -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 diff --git a/src/usr/share/diffuse/syntax/ruby.syntax b/src/usr/share/diffuse/syntax/ruby.syntax index 8aa208a..9a99fb6 100644 --- a/src/usr/share/diffuse/syntax/ruby.syntax +++ b/src/usr/share/diffuse/syntax/ruby.syntax @@ -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 diff --git a/translations/de.po b/translations/de.po index 1e61f3c..c6a9264 100644 --- a/translations/de.po +++ b/translations/de.po @@ -197,7 +197,7 @@ msgstr "Derrick Moser " #: ../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" diff --git a/translations/es.po b/translations/es.po index 3f8db0c..367597b 100644 --- a/translations/es.po +++ b/translations/es.po @@ -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. diff --git a/translations/pt.po b/translations/pt.po new file mode 100644 index 0000000..265a2dc --- /dev/null +++ b/translations/pt.po @@ -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 , 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 \n" +"Language-Team: Português \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 Specify explicit resource file\n" +"\n" +"General Options:\n" +" ( -c | --commit ) File revisions and \n" +" ( -D | --close-if-same ) Close all tabs with no differences\n" +" ( -e | --encoding ) Use to read and write files\n" +" ( -L | --label )