Commits January 2017

commits@gajim.org

1 participants
111 discussions

[Git][gajim/gajim][master] 2 commits: Use separate application id for each profile.
by Philipp Hörist 22 Jan '17

22 Jan '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9ea208e3 by Tomasz Miąsko at 2017-01-18T20:38:28+01:00 Use separate application id for each profile. Application id is customized in do_handle_local_options just before it is registered and can't be changed any further. This makes it possible to run multiple instances of Gajim, at most one for each profile. - - - - - ca3b5eee by Philipp Hörist at 2017-01-22T17:12:25+01:00 Merge branch 'multiple-instances' into 'master' Use separate application id for each profile. See merge request !32 - - - - - 1 changed file: - src/application.py Changes: ===================================== src/application.py ===================================== --- a/src/application.py +++ b/src/application.py @@ -217,6 +217,15 @@ class GajimApplication(Gtk.Application): if hasattr(self.interface, 'roster') and self.interface.roster: self.interface.roster.prepare_quit() + def do_handle_local_options(self, options: GLib.VariantDict) -> int: + if options.contains('profile'): + # Incorporate profile name into application id + # to have a single app instance for each profile. + profile = options.lookup_value('profile').get_string() + app_id = '%s.%s' % (self.get_application_id(), profile) + self.set_application_id(app_id) + return -1 + def do_command_line(self, command_line: Gio.ApplicationCommandLine) -> int: Gtk.Application.do_command_line(self, command_line) options = command_line.get_options_dict() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b4678cec5bc7245543867ffd6a0668e77…

1 0

[Git][gajim/gajim][gajim_0.16] 6 commits: Parse commandline arguments earlier
by Philipp Hörist 22 Jan '17

22 Jan '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: 17214c2b by Philipp Hörist at 2017-01-14T19:38:17+01:00 Parse commandline arguments earlier - - - - - 498d049a by Philipp Hörist at 2017-01-14T19:38:27+01:00 Simplify configpaths import - - - - - 6af02d78 by Philipp Hörist at 2017-01-14T21:13:51+01:00 Create logfile always in config path - - - - - 38e12198 by Philipp Hörist at 2017-01-14T23:26:44+01:00 Create logfile only when gajim is frozen - - - - - 3dc7e38b by Philipp Hörist at 2017-01-15T00:00:17+01:00 Make verbose logging less verbose - - - - - 8abf73f9 by Philipp Hörist at 2017-01-22T17:11:34+01:00 Merge branch 'gajim_0.16' into 'gajim_0.16' Portable Logfile See merge request !30 - - - - - 2 changed files: - src/common/logging_helpers.py - src/gajim.py Changes: ===================================== src/common/logging_helpers.py ===================================== --- a/src/common/logging_helpers.py +++ b/src/common/logging_helpers.py @@ -20,6 +20,7 @@ import logging import i18n +import os def parseLogLevel(arg): """ @@ -133,10 +134,14 @@ class FancyFormatter(logging.Formatter): return logging.Formatter.format(self, record) -def init(use_color=False): +def init(levels, verbose, quiet): """ Iinitialize the logging system """ + use_color = False + if os.name != 'nt': + use_color = sys.stderr.isatty() + consoleloghandler = logging.StreamHandler() consoleloghandler.setFormatter( FancyFormatter( @@ -158,12 +163,16 @@ def init(use_color=False): root_log.addHandler(consoleloghandler) root_log.propagate = False -def set_loglevels(loglevels_string): - parseAndSetLogLevels(loglevels_string) + if levels: + parseAndSetLogLevels(levels) + if verbose: + set_verbose() + if quiet: + set_quiet() def set_verbose(): - parseAndSetLogLevels('gajim=1') - parseAndSetLogLevels('.nbxmpp=1') + parseAndSetLogLevels('gajim=DEBUG') + parseAndSetLogLevels('.nbxmpp=INFO') def set_quiet(): parseAndSetLogLevels('gajim=CRITICAL') @@ -172,9 +181,7 @@ def set_quiet(): # tests if __name__ == '__main__': - init(use_color=True) - - set_loglevels('gajim.c=DEBUG,INFO') + init('gajim.c=DEBUG,INFO', None, None) log = logging.getLogger('gajim') log.debug('debug') ===================================== src/gajim.py ===================================== --- a/src/gajim.py +++ b/src/gajim.py @@ -38,18 +38,90 @@ import os import sys import warnings +import getopt +import locale +from common import i18n -if os.name == 'nt': - log_path = os.path.join(os.environ['APPDATA'], 'Gajim') +profile = '' +config_path = None +log_level = None +log_quiet = False +log_verbose = False + +try: + shortargs = 'hqvl:p:c:' + # add gtk/gnome session option as gtk_get_option_group is not wrapped + longargs = 'help quiet verbose loglevel= profile= config-path=' + longargs += ' class= name= screen= gtk-module= sync g-fatal-warnings' + longargs += ' sm-client-id= sm-client-state-file= sm-disable' + opts = getopt.getopt(sys.argv[1:], shortargs, longargs.split())[0] +except getopt.error, msg1: + print msg1 + print 'for help use --help' + sys.exit(2) +for o, a in opts: + if o in ('-h', '--help'): + out = _('Usage:') + \ + '\n gajim [options] filename\n\n' + \ + _('Options:') + \ + '\n -h, --help ' + \ + _('Show this help message and exit') + \ + '\n -q, --quiet ' + \ + _('Show only critical errors') + \ + '\n -v, --verbose ' + \ + _('Print xml stanzas and other debug information') + \ + '\n -p, --profile ' + \ + _('Use defined profile in configuration directory') + \ + '\n -c, --config-path ' + \ + _('Set configuration directory') + \ + '\n -l, --loglevel ' + \ + _('Configure logging system') + '\n' + print out.encode(locale.getpreferredencoding()) + sys.exit() + elif o in ('-q', '--quiet'): + log_quiet = True + elif o in ('-v', '--verbose'): + log_verbose = True + elif o in ('-p', '--profile'): # gajim --profile name + profile = unicode(a, locale.getpreferredencoding()) + elif o in ('-l', '--loglevel'): + log_level = a + elif o in ('-c', '--config-path'): + config_path = unicode(a, locale.getpreferredencoding()) + +from common import configpaths +configpaths.gajimpaths.init(config_path) +configpaths.gajimpaths.init_profile(profile) + +if hasattr(sys, 'frozen'): + log_path = configpaths.gajimpaths.config_root if not os.path.exists(log_path): os.mkdir(log_path, 0700) - log_file = os.path.join(log_path, 'gajim.log') - fout = open(log_file, 'a') + + class MyStd(object): + _file = None + _error = None + def write(self, text): + logfile = os.path.join(log_path, 'gajim.log') + if self._file is None and self._error is None: + try: + self._file = open(logfile, 'a') + except Exception, details: + self._error = details + if self._file is not None: + self._file.write(text) + self._file.flush() + def flush(self): + if self._file is not None: + self._file.flush() + + fout = MyStd() sys.stdout = fout sys.stderr = fout warnings.filterwarnings(action='ignore') +if os.name == 'nt': if os.path.isdir('gtk'): # Used to create windows installer with GTK included paths = os.environ['PATH'] @@ -120,101 +192,17 @@ if os.name == 'nt': sys.path.append('.') from common import logging_helpers -logging_helpers.init(sys.stderr.isatty()) +logging_helpers.init(log_level, log_verbose, log_quiet) import logging -# gajim.gui or gajim.gtk more appropriate ? -log = logging.getLogger('gajim.gajim') - -import getopt -from common import i18n - -def parseOpts(): - profile_ = '' - config_path_ = None - - try: - shortargs = 'hqvl:p:c:' - # add gtk/gnome session option as gtk_get_option_group is not wrapped - longargs = 'help quiet verbose loglevel= profile= config-path=' - longargs += ' class= name= screen= gtk-module= sync g-fatal-warnings' - longargs += ' sm-client-id= sm-client-state-file= sm-disable' - opts = getopt.getopt(sys.argv[1:], shortargs, longargs.split())[0] - except getopt.error, msg1: - print msg1 - print 'for help use --help' - sys.exit(2) - for o, a in opts: - if o in ('-h', '--help'): - out = _('Usage:') + \ - '\n gajim [options] filename\n\n' + \ - _('Options:') + \ - '\n -h, --help ' + \ - _('Show this help message and exit') + \ - '\n -q, --quiet ' + \ - _('Show only critical errors') + \ - '\n -v, --verbose ' + \ - _('Print xml stanzas and other debug information') + \ - '\n -p, --profile ' + \ - _('Use defined profile in configuration directory') + \ - '\n -c, --config-path ' + \ - _('Set configuration directory') + \ - '\n -l, --loglevel ' + \ - _('Configure logging system') + '\n' - print out.encode(locale.getpreferredencoding()) - sys.exit() - elif o in ('-q', '--quiet'): - logging_helpers.set_quiet() - elif o in ('-v', '--verbose'): - logging_helpers.set_verbose() - elif o in ('-p', '--profile'): # gajim --profile name - profile_ = a - elif o in ('-l', '--loglevel'): - logging_helpers.set_loglevels(a) - elif o in ('-c', '--config-path'): - config_path_ = a - return profile_, config_path_ - -import locale -profile, config_path = parseOpts() -if config_path: - config_path = unicode(config_path, locale.getpreferredencoding()) -del parseOpts - -profile = unicode(profile, locale.getpreferredencoding()) - -import common.configpaths -common.configpaths.gajimpaths.init(config_path) -del config_path -common.configpaths.gajimpaths.init_profile(profile) -del profile +log = logging.getLogger('gajim') if os.name == 'nt': - plugins_locale_dir = os.path.join(common.configpaths.gajimpaths[ + plugins_locale_dir = os.path.join(configpaths.gajimpaths[ 'PLUGINS_USER'], 'locale').encode(locale.getpreferredencoding()) libintl.bindtextdomain('gajim_plugins', plugins_locale_dir) libintl.bind_textdomain_codeset('gajim_plugins', 'UTF-8') - class MyStderr(object): - _file = None - _error = None - def write(self, text): - fname = os.path.join(common.configpaths.gajimpaths.cache_root, - os.path.split(sys.executable)[1]+'.log') - if self._file is None and self._error is None: - try: - self._file = open(fname, 'a') - except Exception, details: - self._error = details - if self._file is not None: - self._file.write(text) - self._file.flush() - def flush(self): - if self._file is not None: - self._file.flush() - - sys.stderr = MyStderr() - # PyGTK2.10+ only throws a warning warnings.filterwarnings('error', module='gtk') try: @@ -303,7 +291,7 @@ import gtkexcepthook import signal import gtkgui_helpers -gajimpaths = common.configpaths.gajimpaths +gajimpaths = configpaths.gajimpaths pid_filename = gajimpaths['PID_FILE'] config_filename = gajimpaths['CONFIG_FILE'] View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6386a6a128c780e2455be59ecce878475…

1 0

[Git][gajim/gajim][gajim_0.16] Fix language list
by Yann Leboulanger 16 Jan '17

16 Jan '17

Yann Leboulanger pushed to branch gajim_0.16 at gajim / gajim Commits: 6386a6a1 by Yann Leboulanger at 2017-01-16T09:08:06+01:00 Fix language list - - - - - 1 changed file: - po/LINGUAS Changes: ===================================== po/LINGUAS ===================================== --- a/po/LINGUAS +++ b/po/LINGUAS @@ -7,7 +7,7 @@ es ru bg de -nb +nb_NO cs nl pt_BR View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6386a6a128c780e2455be59ecce8784757…

1 0

[Git][gajim/gajim][gajim_0.16] iremove old norwegian translations
by Yann Leboulanger 15 Jan '17

15 Jan '17

Yann Leboulanger pushed to branch gajim_0.16 at gajim / gajim Commits: f822a108 by Yann Leboulanger at 2017-01-15T20:51:39+00:00 iremove old norwegian translations - - - - - 2 changed files: - − po/nb.po - − po/no.po Changes: ===================================== po/nb.po deleted ===================================== The diff for this file was not included because it is too large. ===================================== po/no.po deleted ===================================== The diff for this file was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f822a1087a9da28db85ede6162e216905f…

1 0

[Git][gajim/gajim][gajim_0.16] add nb_NO translation
by Yann Leboulanger 15 Jan '17

15 Jan '17

Yann Leboulanger pushed to branch gajim_0.16 at gajim / gajim Commits: ba17a48c by Yann Leboulanger at 2017-01-15T21:10:05+01:00 add nb_NO translation - - - - - 1 changed file: - + po/nb_NO.po Changes: ===================================== po/nb_NO.po ===================================== The diff for this file was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ba17a48c33ce70e661489e44ce2cc9af32…

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Add new XEP namespaces
by Philipp Hörist 14 Jan '17

14 Jan '17

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: ee708ff3 by Philipp Hörist at 2017-01-14T15:33:09+01:00 Add new XEP namespaces - - - - - fe60632e by Philipp Hörist at 2017-01-14T16:04:00+01:00 Merge branch 'master' into 'master' Add new XEP namespaces See merge request !2 - - - - - 1 changed file: - nbxmpp/protocol.py Changes: ===================================== nbxmpp/protocol.py ===================================== --- a/nbxmpp/protocol.py +++ b/nbxmpp/protocol.py @@ -52,6 +52,7 @@ NS_BYTESTREAM = 'http://jabber.org/protocol/bytestreams' # XEP-0065 NS_CAPS = 'http://jabber.org/protocol/caps' # XEP-0115 NS_CAPTCHA = 'urn:xmpp:captcha' # XEP-0158 NS_CARBONS = 'urn:xmpp:carbons:2' # XEP-0280 +NS_CHATMARKERS = 'urn:xmpp:chat-markers:0' # XEP-0333 NS_CHATSTATES = 'http://jabber.org/protocol/chatstates' # XEP-0085 NS_CHATTING = 'http://jabber.org/protocol/chatting' # XEP-0194 NS_CLIENT = 'jabber:client' @@ -70,6 +71,7 @@ NS_DIALBACK = 'jabber:server:dialback' NS_DISCO = 'http://jabber.org/protocol/disco' NS_DISCO_INFO = NS_DISCO + '#info' NS_DISCO_ITEMS = NS_DISCO + '#items' +NS_EME = 'urn:xmpp:eme:0' # XEP-0380 NS_ENCRYPTED = 'jabber:x:encrypted' # XEP-0027 NS_ESESSION = 'http://www.xmpp.org/extensions/xep-0116.html#ns' NS_ESESSION_INIT = 'http://www.xmpp.org/extensions/xep-0116.html#ns-init' # XEP-0116 @@ -84,6 +86,7 @@ NS_GROUPCHAT = 'gc-1.0' NS_MSG_HINTS = 'urn:xmpp:hints' # XEP-0280 NS_HTTP_AUTH = 'http://jabber.org/protocol/http-auth' # XEP-0070 NS_HTTP_BIND = 'http://jabber.org/protocol/httpbind' # XEP-0124 +NS_HTTPUPLOAD = 'urn:xmpp:http:upload' # XEP-0363 NS_IBB = 'http://jabber.org/protocol/ibb' NS_INVISIBLE = 'presence-invisible' # Jabberd2 NS_IQ = 'iq' # Jabberd2 @@ -111,6 +114,7 @@ NS_MUC_UNIQUE = NS_MUC + '#unique' NS_MUC_CONFIG = NS_MUC + '#roomconfig' NS_NICK = 'http://jabber.org/protocol/nick' # XEP-0172 NS_OFFLINE = 'http://www.jabber.org/jeps/jep-0030.html' # XEP-0013 +NS_OMEMO = 'urn:xmpp:omemo:0' # XEP-0384 NS_PHYSLOC = 'http://jabber.org/protocol/physloc' # XEP-0112 NS_PING = 'urn:xmpp:ping' # XEP-0199 NS_PRESENCE = 'presence' # Jabberd2 @@ -137,6 +141,7 @@ NS_SESSION = 'urn:ietf:params:xml:ns:xmpp-session' NS_SI = 'http://jabber.org/protocol/si' # XEP-0096 NS_SI_PUB = 'http://jabber.org/protocol/sipub' # XEP-0137 NS_SIGNED = 'jabber:x:signed' # XEP-0027 +NS_SIMS = 'urn:xmpp:sims:1' # XEP-0385 NS_SSN = 'urn:xmpp:ssn' # XEP-0155 NS_STANZA_CRYPTO = 'http://www.xmpp.org/extensions/xep-0200.html#ns' # XEP-0200 NS_STANZAS = 'urn:ietf:params:xml:ns:xmpp-stanzas' View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/88484a02e508b4cb8acdbade5…

1 0

[Git][gajim/gajim][master] update po files
by Yann Leboulanger 14 Jan '17

14 Jan '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: b4678cec by Yann Leboulanger at 2017-01-14T14:02:54+00:00 update po files - - - - - 30 changed files: - po/be.po - po/be(a)latin.po - po/bg.po - po/br.po - po/cs.po - po/da.po - po/de.po - po/el.po - po/en_GB.po - po/eo.po - po/es.po - po/eu.po - po/fr.po - po/gl.po - po/he.po - po/hr.po - po/hu.po - po/it.po - po/ja.po - po/kk.po - po/lt.po - po/nb.po - po/nl.po - po/no.po - po/pl.po - po/pt.po - po/pt_BR.po - po/ru.po - po/sk.po - po/sr.po The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b4678cec5bc7245543867ffd6a0668e777…

1 0

[Git][gajim/gajim][gajim_0.16] update po files
by Yann Leboulanger 14 Jan '17

14 Jan '17

Yann Leboulanger pushed to branch gajim_0.16 at gajim / gajim Commits: 44da2e7d by Yann Leboulanger at 2017-01-14T13:56:53+00:00 update po files - - - - - 30 changed files: - po/be.po - po/be(a)latin.po - po/bg.po - po/br.po - po/cs.po - po/da.po - po/de.po - po/el.po - po/en_GB.po - po/eo.po - po/es.po - po/eu.po - po/fr.po - po/gl.po - po/he.po - po/hr.po - po/hu.po - po/it.po - po/ja.po - po/kk.po - po/lt.po - po/nb.po - po/nl.po - po/no.po - po/pl.po - po/pt.po - po/pt_BR.po - po/ru.po - po/sk.po - po/sr.po The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/44da2e7de67ccd760fabafeff9cf99b02d…

1 0

[Git][gajim/gajim][master] 2 commits: Fix encoding in windows installer
by Philipp Hörist 10 Jan '17

10 Jan '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: e941472e by Philipp Hörist at 2017-01-10T21:18:55+01:00 Fix encoding in windows installer - - - - - bfd9c5a9 by Philipp Hörist at 2017-01-10T21:24:18+01:00 Merge branch 'master' into 'master' Fix encoding in windows installer See merge request !29 - - - - - 2 changed files: - gajim-portable.nsi - gajim.nsi Changes: ===================================== gajim-portable.nsi ===================================== --- a/gajim-portable.nsi +++ b/gajim-portable.nsi @@ -1,3 +1,6 @@ +; File encoding 'UTF-8 with BOM' + +Unicode true !include "MUI2.nsh" Name "Gajim" @@ -77,21 +80,21 @@ LangString DESC_SecGajim ${LANG_ITALIAN} "Installa i file principali di Gajim." ; Russian -LangString NAME_Emoticons ${LANG_RUSSIAN} "Ñìàéëèêè" -LangString NAME_Iconsets ${LANG_RUSSIAN} "Òåìû èêîíîê" -LangString NAME_Languages ${LANG_RUSSIAN} "ßçûêè" -LangString NAME_SecLanguagesOther ${LANG_RUSSIAN} "Äðóãîå" -LangString NAME_Themes ${LANG_RUSSIAN} "Òåìû" -LangString DESC_SecGajim ${LANG_RUSSIAN} "Óñòàíîâêà îñíîâíûõ ôàéëîâ Gajim." +LangString NAME_Emoticons ${LANG_RUSSIAN} "Смайлики" +LangString NAME_Iconsets ${LANG_RUSSIAN} "Темы иконок" +LangString NAME_Languages ${LANG_RUSSIAN} "Языки" +LangString NAME_SecLanguagesOther ${LANG_RUSSIAN} "Другое" +LangString NAME_Themes ${LANG_RUSSIAN} "Темы" +LangString DESC_SecGajim ${LANG_RUSSIAN} "Установка основных файлов Gajim." ; Hebrew -LangString NAME_Emoticons ${LANG_HEBREW} "øâùåðéí" -LangString NAME_Iconsets ${LANG_HEBREW} "îòøëé öìîéú" -LangString NAME_Languages ${LANG_HEBREW} "ùôåú" -LangString NAME_SecLanguagesOther ${LANG_HEBREW} "àçøåú" -LangString NAME_Themes ${LANG_HEBREW} "òøëàåú ðåùà" -LangString DESC_SecGajim ${LANG_HEBREW} "îú÷éï ÷áöé Gajim òé÷øééí." +LangString NAME_Emoticons ${LANG_HEBREW} "רגשונים" +LangString NAME_Iconsets ${LANG_HEBREW} "מערכי צלמית" +LangString NAME_Languages ${LANG_HEBREW} "שפות" +LangString NAME_SecLanguagesOther ${LANG_HEBREW} "אחרות" +LangString NAME_Themes ${LANG_HEBREW} "ערכאות נושא" +LangString DESC_SecGajim ${LANG_HEBREW} "מתקין קבצי Gajim עיקריים." Section "Gajim" SecGajim SectionIn RO @@ -257,3 +260,7 @@ SectionGroupEnd !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN !insertmacro MUI_DESCRIPTION_TEXT ${SecGajim} $(DESC_SecGajim) !insertmacro MUI_FUNCTION_DESCRIPTION_END + +Function .onInit + !insertmacro MUI_LANGDLL_DISPLAY +FunctionEnd ===================================== gajim.nsi ===================================== --- a/gajim.nsi +++ b/gajim.nsi @@ -1,3 +1,6 @@ +; File encoding 'UTF-8 with BOM' + +Unicode true !include "MUI2.nsh" Name "Gajim" @@ -66,19 +69,19 @@ LangString STR_Running ${LANG_ENGLISH} "It appears that Gajim is currently runni Please quit Gajim and restart the uninstaller." ; French -LangString NAME_Emoticons ${LANG_FRENCH} "Emoticnes" -LangString NAME_Iconsets ${LANG_FRENCH} "Bibliothque d'icnes" +LangString NAME_Emoticons ${LANG_FRENCH} "Emoticônes" +LangString NAME_Iconsets ${LANG_FRENCH} "Bibliothèque d'icônes" LangString NAME_Languages ${LANG_FRENCH} "Langues" LangString NAME_SecLanguagesOther ${LANG_FRENCH} "Autre" -LangString NAME_Themes ${LANG_FRENCH} "Thmes" -LangString NAME_SecDesktopIcon ${LANG_FRENCH} "Crer une icne sur le bureau" -LangString NAME_SecAutostart ${LANG_FRENCH} "Lancer Gajim au dmarrage de Windows" +LangString NAME_Themes ${LANG_FRENCH} "Thèmes" +LangString NAME_SecDesktopIcon ${LANG_FRENCH} "Créer une icône sur le bureau" +LangString NAME_SecAutostart ${LANG_FRENCH} "Lancer Gajim au démarrage de Windows" LangString DESC_SecGajim ${LANG_FRENCH} "Installer les fichiers principaux de Gajim." -LangString DESC_SecDesktopIcon ${LANG_FRENCH} "Si selectionn, un raccourci pour Gajim sera cr sur le bureau." -LangString DESC_SecAutostart ${LANG_FRENCH} "Si activ, Gajim sera automatiquement lanc au dmarrage de Windows." -LangString STR_Installed ${LANG_FRENCH} "Gajim est apparement dj install. Lancer la dsinstallation ?" -LangString STR_Running ${LANG_FRENCH} "Gajim est apparament lanc.$\n\ - Fermez-le et redmarrez le dsinstallateur." +LangString DESC_SecDesktopIcon ${LANG_FRENCH} "Si selectionné, un raccourci pour Gajim sera créé sur le bureau." +LangString DESC_SecAutostart ${LANG_FRENCH} "Si activé, Gajim sera automatiquement lancé au démarrage de Windows." +LangString STR_Installed ${LANG_FRENCH} "Gajim est apparement déjà installé. Lancer la désinstallation ?" +LangString STR_Running ${LANG_FRENCH} "Gajim est apparament lancé.$\n\ + Fermez-le et redémarrez le désinstallateur." ; German LangString NAME_Emoticons ${LANG_GERMAN} "Emoticons" @@ -89,10 +92,10 @@ LangString NAME_Themes ${LANG_GERMAN} "Designs" LangString NAME_SecDesktopIcon ${LANG_GERMAN} "Desktop-Icon erstellen" LangString NAME_SecAutostart ${LANG_GERMAN} "Gajim mit Windows starten" LangString DESC_SecGajim ${LANG_GERMAN} "Installiert die Hauptdateien von Gajim." -LangString DESC_SecDesktopIcon ${LANG_GERMAN} "Wenn dies aktiviert wird, wird ein Icon fr Gajim auf dem Desktop erstellt." +LangString DESC_SecDesktopIcon ${LANG_GERMAN} "Wenn dies aktiviert wird, wird ein Icon für Gajim auf dem Desktop erstellt." LangString DESC_SecAutostart ${LANG_GERMAN} "Gajim wird automatisch gestartet, sowie Windows startet, wenn dies aktivier wird." LangString STR_Installed ${LANG_GERMAN} "Gajim is apparently already installed. Uninstall it?" -LangString STR_Running ${LANG_GERMAN} "Es scheint, dass Gajim bereits luft.$\n\ +LangString STR_Running ${LANG_GERMAN} "Es scheint, dass Gajim bereits läuft.$\n\ Bitte beenden Sie es und starten Sie den Installer erneut.." ; Italian @@ -104,40 +107,41 @@ LangString NAME_Themes ${LANG_ITALIAN} "Temi" LangString NAME_SecDesktopIcon ${LANG_ITALIAN} "Crea un'icona sul desktop" LangString NAME_SecAutostart ${LANG_ITALIAN} "Lancia Gajim quando parte Windows" LangString DESC_SecGajim ${LANG_ITALIAN} "Installa i file principali di Gajim." -LangString DESC_SecDesktopIcon ${LANG_ITALIAN} "Se selezionato, un'icona verr creata sul desktop." -LangString DESC_SecAutostart ${LANG_ITALIAN} "Se selezionato, Gajim sar eseguito all'avvio di Windows." +LangString DESC_SecDesktopIcon ${LANG_ITALIAN} "Se selezionato, un'icona verrà creata sul desktop." +LangString DESC_SecAutostart ${LANG_ITALIAN} "Se selezionato, Gajim sarà eseguito all'avvio di Windows." LangString STR_Installed ${LANG_ITALIAN} "Gajim is apparently already installed. Uninstall it?" LangString STR_Running ${LANG_ITALIAN} "It appears that Gajim is currently running.$\n\ Close it and restart uninstaller." ; Russian -LangString NAME_Emoticons ${LANG_RUSSIAN} "" -LangString NAME_Iconsets ${LANG_RUSSIAN} " " -LangString NAME_Languages ${LANG_RUSSIAN} "" -LangString NAME_SecLanguagesOther ${LANG_RUSSIAN} "" -LangString NAME_Themes ${LANG_RUSSIAN} "" -LangString NAME_SecDesktopIcon ${LANG_RUSSIAN} " " -LangString NAME_SecAutostart ${LANG_RUSSIAN} " Gajim Windows" -LangString DESC_SecGajim ${LANG_RUSSIAN} " Gajim." -LangString DESC_SecDesktopIcon ${LANG_RUSSIAN} " , Gajim." -LangString DESC_SecAutostart ${LANG_RUSSIAN} " , Gajim Windows." -LangString STR_Installed ${LANG_RUSSIAN} ", Gajim . ?" -LangString STR_Running ${LANG_RUSSIAN} ", Gajim .$\n ." +LangString NAME_Emoticons ${LANG_RUSSIAN} "Смайлики" +LangString NAME_Iconsets ${LANG_RUSSIAN} "Темы иконок" +LangString NAME_Languages ${LANG_RUSSIAN} "Языки" +LangString NAME_SecLanguagesOther ${LANG_RUSSIAN} "Другое" +LangString NAME_Themes ${LANG_RUSSIAN} "Темы" +LangString NAME_SecDesktopIcon ${LANG_RUSSIAN} "Создать я лык на абочем столе" +LangString NAME_SecAutostart ${LANG_RUSSIAN} "Запускать Gajim при загрузке Windows" +LangString DESC_SecGajim ${LANG_RUSSIAN} "Установка основных файлов Gajim." +LangString DESC_SecDesktopIcon ${LANG_RUSSIAN} "Если отмечено, на рабочем столе будет создан ярлык Gajim." +LangString DESC_SecAutostart ${LANG_RUSSIAN} "Если отмечено, Gajim будет автоматически запускаться при загрузке Windows." +LangString STR_Installed ${LANG_RUSSIAN} "Похоже, Gajim уже установлен. Деинсталлировать установленную версию?" +LangString STR_Running ${LANG_RUSSIAN} "Похоже, Gajim уже запущен.$\n\ + Закройте его и запустите деинсталлятор снова." ; Hebrew -LangString NAME_Emoticons ${LANG_HEBREW} "" -LangString NAME_Iconsets ${LANG_HEBREW} " " -LangString NAME_Languages ${LANG_HEBREW} "" -LangString NAME_SecLanguagesOther ${LANG_HEBREW} "" -LangString NAME_Themes ${LANG_HEBREW} " " -LangString NAME_SecDesktopIcon ${LANG_HEBREW} " " -LangString NAME_SecAutostart ${LANG_HEBREW} " Gajim Windows " -LangString DESC_SecGajim ${LANG_HEBREW} " Gajim ." -LangString DESC_SecDesktopIcon ${LANG_HEBREW} " , Gajim ." -LangString DESC_SecAutostart ${LANG_HEBREW} " , Gajim Windows ." -LangString STR_Installed ${LANG_HEBREW} " , Gajim . ?" -LangString STR_Running ${LANG_HEBREW} " Gajim .$\n\ - Gajim ." +LangString NAME_Emoticons ${LANG_HEBREW} "רגשונים" +LangString NAME_Iconsets ${LANG_HEBREW} "מערכי צלמית" +LangString NAME_Languages ${LANG_HEBREW} "שפות" +LangString NAME_SecLanguagesOther ${LANG_HEBREW} "אחרות" +LangString NAME_Themes ${LANG_HEBREW} "ערכאות נושא" +LangString NAME_SecDesktopIcon ${LANG_HEBREW} "צור סמל בשולחן עבודה" +LangString NAME_SecAutostart ${LANG_HEBREW} "הפעל את Gajim כאשר Windows מתחיל" +LangString DESC_SecGajim ${LANG_HEBREW} "מתקין קבצי Gajim עיקריים." +LangString DESC_SecDesktopIcon ${LANG_HEBREW} "במידה ונקבעת, קיצור דרך עבור Gajim יושם על שולחן העבודה." +LangString DESC_SecAutostart ${LANG_HEBREW} "במידה ונקבעת, Gajim יופעל אוטומטית כאשר Windows מתחיל." +LangString STR_Installed ${LANG_HEBREW} "כפי הנראה, Gajim כבר מותקן. להסיר אותו?" +LangString STR_Running ${LANG_HEBREW} "נראה שהתוכנית Gajim מורצת כעת.$\n\ + אנא צא מן Gajim ואתחל את מסיר ההתקנה." Section "Gajim" SecGajim SectionIn RO @@ -390,6 +394,7 @@ Function un.onInit MessageBox MB_ICONSTOP|MB_OK $(STR_Running) Quit Remove: + !insertmacro MUI_UNGETLANGUAGE FunctionEnd Function .onInit View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b13338ab3a076121f0711722effe548db…

1 0

[Git][gajim/gajim][gajim_0.16] 2 commits: Fix encoding in windows installer
by Philipp Hörist 10 Jan '17

10 Jan '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: 39aa0d91 by Philipp Hörist at 2017-01-10T20:55:31+01:00 Fix encoding in windows installer - - - - - 4fb4074c by Philipp Hörist at 2017-01-10T20:57:46+01:00 Merge branch 'installer' into 'gajim_0.16' Fix encoding in windows installer See merge request !28 - - - - - 2 changed files: - gajim-portable.nsi - gajim.nsi Changes: ===================================== gajim-portable.nsi ===================================== --- a/gajim-portable.nsi +++ b/gajim-portable.nsi @@ -1,3 +1,6 @@ +; File encoding 'UTF-8 with BOM' + +Unicode true !include "MUI2.nsh" Name "Gajim" @@ -81,23 +84,23 @@ LangString DESC_SecGtk ${LANG_ITALIAN} "Installa Gtk+ 2 (necessario per eseguire ; Russian -LangString NAME_Emoticons ${LANG_RUSSIAN} "Ñìàéëèêè" -LangString NAME_Iconsets ${LANG_RUSSIAN} "Òåìû èêîíîê" -LangString NAME_Languages ${LANG_RUSSIAN} "ßçûêè" -LangString NAME_SecLanguagesOther ${LANG_RUSSIAN} "Äðóãîå" -LangString NAME_Themes ${LANG_RUSSIAN} "Òåìû" -LangString DESC_SecGajim ${LANG_RUSSIAN} "Óñòàíîâêà îñíîâíûõ ôàéëîâ Gajim." -LangString DESC_SecGtk ${LANG_RUSSIAN} "Óñòàíîâêà Gtk+ 2 (íåîáõîäèìî äëÿ ðàáîòû Gajim)." +LangString NAME_Emoticons ${LANG_RUSSIAN} "Смайлики" +LangString NAME_Iconsets ${LANG_RUSSIAN} "Темы иконок" +LangString NAME_Languages ${LANG_RUSSIAN} "Языки" +LangString NAME_SecLanguagesOther ${LANG_RUSSIAN} "Другое" +LangString NAME_Themes ${LANG_RUSSIAN} "Темы" +LangString DESC_SecGajim ${LANG_RUSSIAN} "Установка основных файлов Gajim." +LangString DESC_SecGtk ${LANG_RUSSIAN} "Установка Gtk 2 (необходимо для работы Gajim)." ; Hebrew -LangString NAME_Emoticons ${LANG_HEBREW} "øâùåðéí" -LangString NAME_Iconsets ${LANG_HEBREW} "îòøëé öìîéú" -LangString NAME_Languages ${LANG_HEBREW} "ùôåú" -LangString NAME_SecLanguagesOther ${LANG_HEBREW} "àçøåú" -LangString NAME_Themes ${LANG_HEBREW} "òøëàåú ðåùà" -LangString DESC_SecGajim ${LANG_HEBREW} "îú÷éï ÷áöé Gajim òé÷øééí." -LangString DESC_SecGtk ${LANG_HEBREW} "îú÷éï Gtk+ 2 (ðçåöä ìäøöú Gajim)." +LangString NAME_Emoticons ${LANG_HEBREW} "רגשונים" +LangString NAME_Iconsets ${LANG_HEBREW} "מערכי צלמית" +LangString NAME_Languages ${LANG_HEBREW} "שפות" +LangString NAME_SecLanguagesOther ${LANG_HEBREW} "אחרות" +LangString NAME_Themes ${LANG_HEBREW} "ערכאות נושא" +LangString DESC_SecGajim ${LANG_HEBREW} "מתקין קבצי Gajim עיקריים." +LangString DESC_SecGtk ${LANG_HEBREW} "מתקין Gtk+ 2 (נחוצה להרצת Gajim)." Section "Gajim" SecGajim SectionIn RO @@ -413,3 +416,7 @@ SectionGroupEnd !insertmacro MUI_DESCRIPTION_TEXT ${SecGajim} $(DESC_SecGajim) !insertmacro MUI_DESCRIPTION_TEXT ${SecGtk} $(DESC_SecGtk) !insertmacro MUI_FUNCTION_DESCRIPTION_END + +Function .onInit + !insertmacro MUI_LANGDLL_DISPLAY +FunctionEnd \ No newline at end of file ===================================== gajim.nsi ===================================== --- a/gajim.nsi +++ b/gajim.nsi @@ -1,3 +1,6 @@ +; File encoding 'UTF-8 with BOM' + +Unicode true !include "MUI2.nsh" Name "Gajim" @@ -67,20 +70,20 @@ LangString STR_Running ${LANG_ENGLISH} "It appears that Gajim is currently runni Please quit Gajim and restart the uninstaller." ; French -LangString NAME_Emoticons ${LANG_FRENCH} "Emoticnes" -LangString NAME_Iconsets ${LANG_FRENCH} "Bibliothque d'icnes" +LangString NAME_Emoticons ${LANG_FRENCH} "Emoticônes" +LangString NAME_Iconsets ${LANG_FRENCH} "Bibliothèque d'icônes" LangString NAME_Languages ${LANG_FRENCH} "Langues" LangString NAME_SecLanguagesOther ${LANG_FRENCH} "Autre" -LangString NAME_Themes ${LANG_FRENCH} "Thmes" -LangString NAME_SecDesktopIcon ${LANG_FRENCH} "Crer une icne sur le bureau" -LangString NAME_SecAutostart ${LANG_FRENCH} "Lancer Gajim au dmarrage de Windows" +LangString NAME_Themes ${LANG_FRENCH} "Thèmes" +LangString NAME_SecDesktopIcon ${LANG_FRENCH} "Créer une icône sur le bureau" +LangString NAME_SecAutostart ${LANG_FRENCH} "Lancer Gajim au démarrage de Windows" LangString DESC_SecGajim ${LANG_FRENCH} "Installer les fichiers principaux de Gajim." -LangString DESC_SecGtk ${LANG_FRENCH} "Installer Gtk+ 2 (ncessaire Gajim)." -LangString DESC_SecDesktopIcon ${LANG_FRENCH} "Si selectionn, un raccourci pour Gajim sera cr sur le bureau." -LangString DESC_SecAutostart ${LANG_FRENCH} "Si activ, Gajim sera automatiquement lanc au dmarrage de Windows." -LangString STR_Installed ${LANG_FRENCH} "Gajim est apparement dj install. Lancer la dsinstallation ?" -LangString STR_Running ${LANG_FRENCH} "Gajim est apparament lanc.$\n\ - Fermez-le et redmarrez le dsinstallateur." +LangString DESC_SecGtk ${LANG_FRENCH} "Installer Gtk+ 2 (nécessaire à Gajim)." +LangString DESC_SecDesktopIcon ${LANG_FRENCH} "Si selectionné, un raccourci pour Gajim sera créé sur le bureau." +LangString DESC_SecAutostart ${LANG_FRENCH} "Si activé, Gajim sera automatiquement lancé au démarrage de Windows." +LangString STR_Installed ${LANG_FRENCH} "Gajim est apparement déjà installé. Lancer la désinstallation ?" +LangString STR_Running ${LANG_FRENCH} "Gajim est apparament lancé.$\n\ + Fermez-le et redémarrez le désinstallateur." ; German LangString NAME_Emoticons ${LANG_GERMAN} "Emoticons" @@ -92,10 +95,10 @@ LangString NAME_SecDesktopIcon ${LANG_GERMAN} "Desktop-Icon erstellen" LangString NAME_SecAutostart ${LANG_GERMAN} "Gajim mit Windows starten" LangString DESC_SecGajim ${LANG_GERMAN} "Installiert die Hauptdateien von Gajim." LangString DESC_SecGtk ${LANG_GERMAN} "Installiert Gtk+ 2 (notwendig um Gajim zu benutzen)." -LangString DESC_SecDesktopIcon ${LANG_GERMAN} "Wenn dies aktiviert wird, wird ein Icon fr Gajim auf dem Desktop erstellt." +LangString DESC_SecDesktopIcon ${LANG_GERMAN} "Wenn dies aktiviert wird, wird ein Icon für Gajim auf dem Desktop erstellt." LangString DESC_SecAutostart ${LANG_GERMAN} "Gajim wird automatisch gestartet, sowie Windows startet, wenn dies aktivier wird." LangString STR_Installed ${LANG_GERMAN} "Gajim ist bereits installiert. Soll es deinstalliert werden?" -LangString STR_Running ${LANG_GERMAN} "Es scheint, dass Gajim bereits luft.$\n\ +LangString STR_Running ${LANG_GERMAN} "Es scheint, dass Gajim bereits läuft.$\n\ Bitte beenden Sie es und starten Sie den Installer erneut.." ; Italian @@ -108,42 +111,44 @@ LangString NAME_SecDesktopIcon ${LANG_ITALIAN} "Crea un'icona sul desktop" LangString NAME_SecAutostart ${LANG_ITALIAN} "Lancia Gajim quando parte Windows" LangString DESC_SecGajim ${LANG_ITALIAN} "Installa i file principali di Gajim." LangString DESC_SecGtk ${LANG_ITALIAN} "Installa Gtk+ 2 (necessario per eseguire Gajim)." -LangString DESC_SecDesktopIcon ${LANG_ITALIAN} "Se selezionato, un'icona verr creata sul desktop." -LangString DESC_SecAutostart ${LANG_ITALIAN} "Se selezionato, Gajim sar eseguito all'avvio di Windows." +LangString DESC_SecDesktopIcon ${LANG_ITALIAN} "Se selezionato, un'icona verrà creata sul desktop." +LangString DESC_SecAutostart ${LANG_ITALIAN} "Se selezionato, Gajim sarà eseguito all'avvio di Windows." LangString STR_Installed ${LANG_ITALIAN} "Gajim is apparently already installed. Uninstall it?" LangString STR_Running ${LANG_ITALIAN} "It appears that Gajim is currently running.$\n\ Close it and restart uninstaller." ; Russian -LangString NAME_Emoticons ${LANG_RUSSIAN} "" -LangString NAME_Iconsets ${LANG_RUSSIAN} " " -LangString NAME_Languages ${LANG_RUSSIAN} "" -LangString NAME_SecLanguagesOther ${LANG_RUSSIAN} "" -LangString NAME_Themes ${LANG_RUSSIAN} "" -LangString NAME_SecDesktopIcon ${LANG_RUSSIAN} " " -LangString NAME_SecAutostart ${LANG_RUSSIAN} " Gajim Windows" -LangString DESC_SecGajim ${LANG_RUSSIAN} " Gajim." -LangString DESC_SecGtk ${LANG_RUSSIAN} " Gtk+ 2 ( Gajim)." -LangString DESC_SecDesktopIcon ${LANG_RUSSIAN} " , Gajim." -LangString DESC_SecAutostart ${LANG_RUSSIAN} " , Gajim Windows." -LangString STR_Installed ${LANG_RUSSIAN} ", Gajim . ?" -LangString STR_Running ${LANG_RUSSIAN} ", Gajim .$\n ." +LangString NAME_Emoticons ${LANG_RUSSIAN} "Смайлики" +LangString NAME_Iconsets ${LANG_RUSSIAN} "Темы иконок" +LangString NAME_Languages ${LANG_RUSSIAN} "Языки" +LangString NAME_SecLanguagesOther ${LANG_RUSSIAN} "Другое" +LangString NAME_Themes ${LANG_RUSSIAN} "Темы" +LangString NAME_SecDesktopIcon ${LANG_RUSSIAN} "Создать я лык на абочем столе" +LangString NAME_SecAutostart ${LANG_RUSSIAN} "Запускать Gajim при загрузке Windows" +LangString DESC_SecGajim ${LANG_RUSSIAN} "Установка основных файлов Gajim." +LangString DESC_SecGtk ${LANG_RUSSIAN} "Установка Gtk 2 (необходимо для работы Gajim)." +LangString DESC_SecDesktopIcon ${LANG_RUSSIAN} "Если отмечено, на рабочем столе будет создан ярлык Gajim." +LangString DESC_SecAutostart ${LANG_RUSSIAN} "Если отмечено, Gajim будет автоматически запускаться при загрузке Windows." +LangString STR_Installed ${LANG_RUSSIAN} "Похоже, Gajim уже установлен. Деинсталлировать установленную версию?" +LangString STR_Running ${LANG_RUSSIAN} "Похоже, Gajim уже запущен.$\n\ + Закройте его и запустите деинсталлятор снова." + ; Hebrew -LangString NAME_Emoticons ${LANG_HEBREW} "" -LangString NAME_Iconsets ${LANG_HEBREW} " " -LangString NAME_Languages ${LANG_HEBREW} "" -LangString NAME_SecLanguagesOther ${LANG_HEBREW} "" -LangString NAME_Themes ${LANG_HEBREW} " " -LangString NAME_SecDesktopIcon ${LANG_HEBREW} " " -LangString NAME_SecAutostart ${LANG_HEBREW} " Gajim Windows " -LangString DESC_SecGajim ${LANG_HEBREW} " Gajim ." -LangString DESC_SecGtk ${LANG_HEBREW} " Gtk+ 2 ( Gajim)." -LangString DESC_SecDesktopIcon ${LANG_HEBREW} " , Gajim ." -LangString DESC_SecAutostart ${LANG_HEBREW} " , Gajim Windows ." -LangString STR_Installed ${LANG_HEBREW} " , Gajim . ?" -LangString STR_Running ${LANG_HEBREW} " Gajim .$\n\ - Gajim ." +LangString NAME_Emoticons ${LANG_HEBREW} "רגשונים" +LangString NAME_Iconsets ${LANG_HEBREW} "מערכי צלמית" +LangString NAME_Languages ${LANG_HEBREW} "שפות" +LangString NAME_SecLanguagesOther ${LANG_HEBREW} "אחרות" +LangString NAME_Themes ${LANG_HEBREW} "ערכאות נושא" +LangString NAME_SecDesktopIcon ${LANG_HEBREW} "צור סמל בשולחן עבודה" +LangString NAME_SecAutostart ${LANG_HEBREW} "הפעל את Gajim כאשר Windows מתחיל" +LangString DESC_SecGajim ${LANG_HEBREW} "מתקין קבצי Gajim עיקריים." +LangString DESC_SecGtk ${LANG_HEBREW} "מתקין Gtk+ 2 (נחוצה להרצת Gajim)." +LangString DESC_SecDesktopIcon ${LANG_HEBREW} "במידה ונקבעת, קיצור דרך עבור Gajim יושם על שולחן העבודה." +LangString DESC_SecAutostart ${LANG_HEBREW} "במידה ונקבעת, Gajim יופעל אוטומטית כאשר Windows מתחיל." +LangString STR_Installed ${LANG_HEBREW} "כפי הנראה, Gajim כבר מותקן. להסיר אותו?" +LangString STR_Running ${LANG_HEBREW} "נראה שהתוכנית Gajim מורצת כעת.$\n\ + אנא צא מן Gajim ואתחל את מסיר ההתקנה." Section "Gajim" SecGajim SectionIn RO @@ -585,6 +590,7 @@ Function un.onInit MessageBox MB_ICONSTOP|MB_OK $(STR_Running) Quit Remove: + !insertmacro MUI_UNGETLANGUAGE FunctionEnd Function .onInit View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/bae08ea1c957a2207e02ff049b257e97d…

1 0

← Newer
1
2
3
4
5
6
7
...
12
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2017