Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim] Deleted tag gajim-1.3.0-beta2
by Philipp Hörist 09 Jan '21

09 Jan '21

Philipp Hörist deleted tag gajim-1.3.0-beta2 at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new tag gajim-1.3.0-beta2
by Philipp Hörist 09 Jan '21

09 Jan '21

Philipp Hörist pushed new tag gajim-1.3.0-beta2 at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/gajim-1.3.0-beta2 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 10 commits: Delimiter: Don’t stop connecting when private xml is not available
by Philipp Hörist 09 Jan '21

09 Jan '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: eb02ccc3 by lovetox at 2021-01-04T23:28:44+01:00 Delimiter: Don’t stop connecting when private xml is not available - - - - - 54ab434d by lovetox at 2021-01-09T11:54:01+01:00 Proxy: Change string No Proxy meant that Gajim is not overriding a system configured proxy. System makes this more clear. - - - - - 35f6e521 by lovetox at 2021-01-09T11:56:20+01:00 Settings: Remove verbose setting get_debug_mode() does a better job - - - - - f6c86192 by Daniel Brötzmann at 2021-01-09T11:57:12+01:00 Profile: Clarify vCard Key entry - - - - - 685f2c4f by lovetox at 2021-01-09T11:57:12+01:00 Move svg icon to scaleable folder - - - - - a03d1717 by lovetox at 2021-01-09T11:57:12+01:00 Update index.theme - - - - - ba85e7ae by lovetox at 2021-01-09T11:57:12+01:00 Update setupy.py - - - - - 35bb00df by lovetox at 2021-01-09T11:57:12+01:00 HistoryManager: Make it work again in standalone mode Fixes #10384 - - - - - 69493b80 by lovetox at 2021-01-09T11:57:12+01:00 FileTransfer: Add cancel signal - - - - - 6b53f794 by lovetox at 2021-01-09T11:57:12+01:00 FileTransferProgress: Use cancel action - - - - - 14 changed files: - gajim/common/config.py - gajim/common/filetransfer.py - gajim/common/modules/delimiter.py - gajim/common/setting_values.py - gajim/data/icons/hicolor/index.theme - gajim/data/icons/hicolor/symbolic/apps/org.gajim.Gajim-symbolic.svg → gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim-symbolic.svg - gajim/gtk/accounts.py - gajim/gtk/filetransfer_progress.py - gajim/gtk/preferences.py - gajim/gtk/profile.py - gajim/gtk/vcard_grid.py - gajim/gui_interface.py - gajim/history_manager.py - setup.py Changes: ===================================== gajim/common/config.py ===================================== @@ -65,7 +65,6 @@ class Config: __options = ({ # name: [ type, default_value, help_string, restart ] - 'verbose': [opt_bool, False, '', True], 'autopopup': [opt_bool, False], 'autopopupaway': [opt_bool, False], 'sounddnd': [opt_bool, False, _('Play sound even when being busy.')], ===================================== gajim/common/filetransfer.py ===================================== @@ -105,3 +105,6 @@ def set_finished(self): def update_progress(self): self.notify('progress') + + def cancel(self): + self.notify('cancel') ===================================== gajim/common/modules/delimiter.py ===================================== @@ -16,7 +16,6 @@ from nbxmpp.errors import is_error -from nbxmpp.modules.util import raise_if_error from gajim.common.modules.base import BaseModule from gajim.common.modules.util import as_task @@ -42,7 +41,10 @@ def get_roster_delimiter(self): delimiter = yield self.request_delimiter() if is_error(delimiter) or delimiter is None: result = yield self.set_delimiter(self.delimiter) - raise_if_error(result) + if is_error(result): + self._con.connect_machine() + return + delimiter = self.delimiter self.delimiter = delimiter ===================================== gajim/common/setting_values.py ===================================== @@ -13,7 +13,6 @@ class _ACCOUNT_DEFAULT: # pylint: disable=line-too-long APP_SETTINGS = { - 'verbose': False, 'autopopup': False, 'show_notifications': True, 'autopopupaway': False, ===================================== gajim/data/icons/hicolor/index.theme ===================================== @@ -2,1661 +2,74 @@ Name=Hicolor Comment=Fallback icon theme Hidden=true -Directories=16x16/actions,16x16/animations,16x16/apps,16x16/categories,16x16/devices,16x16/emblems,16x16/emotes,16x16/filesystems,16x16/intl,16x16/mimetypes,16x16/places,16x16/status,16x16/stock/chart,16x16/stock/code,16x16/stock/data,16x16/stock/form,16x16/stock/image,16x16/stock/io,16x16/stock/media,16x16/stock/navigation,16x16/stock/net,16x16/stock/object,16x16/stock/table,16x16/stock/text,22x22/actions,22x22/animations,22x22/apps,22x22/categories,22x22/devices,22x22/emblems,22x22/emotes,22x22/filesystems,22x22/intl,22x22/mimetypes,22x22/places,22x22/status,22x22/stock/chart,22x22/stock/code,22x22/stock/data,22x22/stock/form,22x22/stock/image,22x22/stock/io,22x22/stock/media,22x22/stock/navigation,22x22/stock/net,22x22/stock/object,22x22/stock/table,22x22/stock/text,24x24/actions,24x24/animations,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/emotes,24x24/filesystems,24x24/intl,24x24/mimetypes,24x24/places,24x24/status,24x24/stock/chart,24x24/stock/code,24x24/stock/data,24x24/stock/form,24x24/stock/image,24x24/stock/io,24x24/stock/media,24x24/stock/navigation,24x24/stock/net,24x24/stock/object,24x24/stock/table,24x24/stock/text,32x32/actions,32x32/animations,32x32/apps,32x32/categories,32x32/devices,32x32/emblems,32x32/emotes,32x32/filesystems,32x32/intl,32x32/mimetypes,32x32/places,32x32/status,32x32/stock/chart,32x32/stock/code,32x32/stock/data,32x32/stock/form,32x32/stock/image,32x32/stock/io,32x32/stock/media,32x32/stock/navigation,32x32/stock/net,32x32/stock/object,32x32/stock/table,32x32/stock/text,36x36/actions,36x36/animations,36x36/apps,36x36/categories,36x36/devices,36x36/emblems,36x36/emotes,36x36/filesystems,36x36/intl,36x36/mimetypes,36x36/places,36x36/status,36x36/stock/chart,36x36/stock/code,36x36/stock/data,36x36/stock/form,36x36/stock/image,36x36/stock/io,36x36/stock/media,36x36/stock/navigation,36x36/stock/net,36x36/stock/object,36x36/stock/table,36x36/stock/text,48x48/actions,48x48/animations,48x48/apps,48x48/categories,48x48/devices,48x48/emblems,48x48/emotes,48x48/filesystems,48x48/intl,48x48/mimetypes,48x48/places,48x48/status,48x48/stock/chart,48x48/stock/code,48x48/stock/data,48x48/stock/form,48x48/stock/image,48x48/stock/io,48x48/stock/media,48x48/stock/navigation,48x48/stock/net,48x48/stock/object,48x48/stock/table,48x48/stock/text,64x64/actions,64x64/animations,64x64/apps,64x64/categories,64x64/devices,64x64/emblems,64x64/emotes,64x64/filesystems,64x64/intl,64x64/mimetypes,64x64/places,64x64/status,64x64/stock/chart,64x64/stock/code,64x64/stock/data,64x64/stock/form,64x64/stock/image,64x64/stock/io,64x64/stock/media,64x64/stock/navigation,64x64/stock/net,64x64/stock/object,64x64/stock/table,64x64/stock/text,72x72/actions,72x72/animations,72x72/apps,72x72/categories,72x72/devices,72x72/emblems,72x72/emotes,72x72/filesystems,72x72/intl,72x72/mimetypes,72x72/places,72x72/status,72x72/stock/chart,72x72/stock/code,72x72/stock/data,72x72/stock/form,72x72/stock/image,72x72/stock/io,72x72/stock/media,72x72/stock/navigation,72x72/stock/net,72x72/stock/object,72x72/stock/table,72x72/stock/text,96x96/actions,96x96/animations,96x96/apps,96x96/categories,96x96/devices,96x96/emblems,96x96/emotes,96x96/filesystems,96x96/intl,96x96/mimetypes,96x96/places,96x96/status,96x96/stock/chart,96x96/stock/code,96x96/stock/data,96x96/stock/form,96x96/stock/image,96x96/stock/io,96x96/stock/media,96x96/stock/navigation,96x96/stock/net,96x96/stock/object,96x96/stock/table,96x96/stock/text,128x128/actions,128x128/animations,128x128/apps,128x128/categories,128x128/devices,128x128/emblems,128x128/emotes,128x128/filesystems,128x128/intl,128x128/mimetypes,128x128/places,128x128/status,128x128/stock/chart,128x128/stock/code,128x128/stock/data,128x128/stock/form,128x128/stock/image,128x128/stock/io,128x128/stock/media,128x128/stock/navigation,128x128/stock/net,128x128/stock/object,128x128/stock/table,128x128/stock/text,192x192/actions,192x192/animations,192x192/apps,192x192/categories,192x192/devices,192x192/emblems,192x192/emotes,192x192/filesystems,192x192/intl,192x192/mimetypes,192x192/places,192x192/status,192x192/stock/chart,192x192/stock/code,192x192/stock/data,192x192/stock/form,192x192/stock/image,192x192/stock/io,192x192/stock/media,192x192/stock/navigation,192x192/stock/net,192x192/stock/object,192x192/stock/table,192x192/stock/text,256x256/actions,256x256/animations,256x256/apps,256x256/categories,256x256/devices,256x256/emblems,256x256/emotes,256x256/filesystems,256x256/intl,256x256/mimetypes,256x256/places,256x256/status,256x256/stock/chart,256x256/stock/code,256x256/stock/data,256x256/stock/form,256x256/stock/image,256x256/stock/io,256x256/stock/media,256x256/stock/navigation,256x256/stock/net,256x256/stock/object,256x256/stock/table,256x256/stock/text,scalable/actions,scalable/animations,scalable/apps,scalable/categories,scalable/devices,scalable/emblems,scalable/emotes,scalable/filesystems,scalable/intl,scalable/mimetypes,scalable/places,scalable/status,scalable/stock/chart,scalable/stock/code,scalable/stock/data,scalable/stock/form,scalable/stock/image,scalable/stock/io,scalable/stock/media,scalable/stock/navigation,scalable/stock/net,scalable/stock/object,scalable/stock/table,scalable/stock/text +Directories=16x16/actions,16x16/devices,16x16/status,32x32/categories,32x32/devices,32x32/status,48x48/status,96x96/categories,scalable/apps,scalable/categories,scalable/devices,scalable/status -[16x16/actions] -Size=16 -Context=Actions -Type=Threshold - -[16x16/animations] -Size=16 -Context=Animations -Type=Threshold - -[16x16/apps] -Size=16 -Context=Applications -Type=Threshold - -[16x16/categories] -Size=16 -Context=Categories -Type=Threshold - -[16x16/devices] -Size=16 -Context=Devices -Type=Threshold - -[16x16/emblems] -Size=16 -Context=Emblems -Type=Threshold - -[16x16/emotes] -Size=16 -Context=Emotes -Type=Threshold - -[16x16/filesystems] -Size=16 -Context=FileSystems -Type=Threshold - -[16x16/intl] -Size=16 -Context=International -Type=Threshold - -[16x16/mimetypes] -Size=16 -Context=MimeTypes -Type=Threshold - -[16x16/places] -Size=16 -Context=Places -Type=Threshold - -[16x16/status] -Size=16 -Context=Status -Type=Threshold - -[16x16/stock/chart] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/code] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/data] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/form] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/image] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/io] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/media] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/navigation] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/net] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/object] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/table] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/text] -Size=16 -Context=Stock -Type=Threshold - -[22x22/actions] -Size=22 -Context=Actions -Type=Threshold - -[22x22/animations] -Size=22 -Context=Animations -Type=Threshold - -[22x22/apps] -Size=22 -Context=Applications -Type=Threshold - -[22x22/categories] -Size=22 -Context=Categories -Type=Threshold - -[22x22/devices] -Size=22 -Context=Devices -Type=Threshold - -[22x22/emblems] -Size=22 -Context=Emblems -Type=Threshold - -[22x22/emotes] -Size=22 -Context=Emotes -Type=Threshold - -[22x22/filesystems] -Size=22 -Context=FileSystems -Type=Threshold - -[22x22/intl] -Size=22 -Context=International -Type=Threshold - -[22x22/mimetypes] -Size=22 -Context=MimeTypes -Type=Threshold - -[22x22/places] -Size=22 -Context=Places -Type=Threshold - -[22x22/status] -Size=22 -Context=Status -Type=Threshold - -[22x22/stock/chart] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/code] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/data] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/form] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/image] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/io] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/media] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/navigation] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/net] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/object] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/table] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/text] -Size=22 -Context=Stock -Type=Threshold - -[24x24/actions] -Size=24 -Context=Actions -Type=Threshold - -[24x24/animations] -Size=24 -Context=Animations -Type=Threshold - -[24x24/apps] -Size=24 -Context=Applications -Type=Threshold - -[24x24/categories] -Size=24 -Context=Categories -Type=Threshold - -[24x24/devices] -Size=24 -Context=Devices -Type=Threshold - -[24x24/emblems] -Size=24 -Context=Emblems -Type=Threshold - -[24x24/emotes] -Size=24 -Context=Emotes -Type=Threshold - -[24x24/filesystems] -Size=24 -Context=FileSystems -Type=Threshold - -[24x24/intl] -Size=24 -Context=International -Type=Threshold - -[24x24/mimetypes] -Size=24 -Context=MimeTypes -Type=Threshold - -[24x24/places] -Size=24 -Context=Places -Type=Threshold - -[24x24/status] -Size=24 -Context=Status -Type=Threshold - -[24x24/stock/chart] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/code] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/data] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/form] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/image] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/io] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/media] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/navigation] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/net] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/object] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/table] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/text] -Size=24 -Context=Stock -Type=Threshold - -[32x32/actions] -Size=32 -Context=Actions -Type=Threshold - -[32x32/animations] -Size=32 -Context=Animations -Type=Threshold - -[32x32/apps] -Size=32 -Context=Applications -Type=Threshold - -[32x32/categories] -Size=32 -Context=Categories -Type=Threshold - -[32x32/devices] -Size=32 -Context=Devices -Type=Threshold - -[32x32/emblems] -Size=32 -Context=Emblems -Type=Threshold - -[32x32/emotes] -Size=32 -Context=Emotes -Type=Threshold - -[32x32/filesystems] -Size=32 -Context=FileSystems -Type=Threshold - -[32x32/intl] -Size=32 -Context=International -Type=Threshold - -[32x32/mimetypes] -Size=32 -Context=MimeTypes -Type=Threshold - -[32x32/places] -Size=32 -Context=Places -Type=Threshold - -[32x32/status] -Size=32 -Context=Status -Type=Threshold - -[32x32/stock/chart] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/code] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/data] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/form] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/image] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/io] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/media] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/navigation] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/net] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/object] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/table] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/text] -Size=32 -Context=Stock -Type=Threshold - -[36x36/actions] -Size=36 -Context=Actions -Type=Threshold - -[36x36/animations] -Size=36 -Context=Animations -Type=Threshold - -[36x36/apps] -Size=36 -Context=Applications -Type=Threshold - -[36x36/categories] -Size=36 -Context=Categories -Type=Threshold - -[36x36/devices] -Size=36 -Context=Devices -Type=Threshold - -[36x36/emblems] -Size=36 -Context=Emblems -Type=Threshold - -[36x36/emotes] -Size=36 -Context=Emotes -Type=Threshold - -[36x36/filesystems] -Size=36 -Context=FileSystems -Type=Threshold - -[36x36/intl] -Size=36 -Context=International -Type=Threshold - -[36x36/mimetypes] -Size=36 -Context=MimeTypes -Type=Threshold - -[36x36/places] -Size=36 -Context=Places -Type=Threshold - -[36x36/status] -Size=36 -Context=Status -Type=Threshold - -[36x36/stock/chart] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/code] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/data] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/form] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/image] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/io] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/media] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/navigation] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/net] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/object] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/table] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/text] -Size=36 -Context=Stock -Type=Threshold - -[48x48/actions] -Size=48 -Context=Actions -Type=Threshold - -[48x48/animations] -Size=48 -Context=Animations -Type=Threshold - -[48x48/apps] -Size=48 -Context=Applications -Type=Threshold - -[48x48/categories] -Size=48 -Context=Categories -Type=Threshold - -[48x48/devices] -Size=48 -Context=Devices -Type=Threshold - -[48x48/emblems] -Size=48 -Context=Emblems -Type=Threshold - -[48x48/emotes] -Size=48 -Context=Emotes -Type=Threshold - -[48x48/filesystems] -Size=48 -Context=FileSystems -Type=Threshold - -[48x48/intl] -Size=48 -Context=International -Type=Threshold - -[48x48/mimetypes] -Size=48 -Context=MimeTypes -Type=Threshold - -[48x48/places] -Size=48 -Context=Places -Type=Threshold - -[48x48/status] -Size=48 -Context=Status -Type=Threshold - -[48x48/stock/chart] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/code] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/data] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/form] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/image] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/io] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/media] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/navigation] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/net] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/object] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/table] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/text] -Size=48 -Context=Stock -Type=Threshold - -[64x64/actions] -Size=64 -Context=Actions -Type=Threshold - -[64x64/animations] -Size=64 -Context=Animations -Type=Threshold - -[64x64/apps] -Size=64 -Context=Applications -Type=Threshold - -[64x64/categories] -Size=64 -Context=Categories -Type=Threshold - -[64x64/devices] -Size=64 -Context=Devices -Type=Threshold - -[64x64/emblems] -Size=64 -Context=Emblems -Type=Threshold - -[64x64/emotes] -Size=64 -Context=Emotes -Type=Threshold - -[64x64/filesystems] -Size=64 -Context=FileSystems -Type=Threshold - -[64x64/intl] -Size=64 -Context=International -Type=Threshold - -[64x64/mimetypes] -Size=64 -Context=MimeTypes -Type=Threshold - -[64x64/places] -Size=64 -Context=Places -Type=Threshold - -[64x64/status] -Size=64 -Context=Status -Type=Threshold - -[64x64/stock/chart] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/code] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/data] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/form] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/image] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/io] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/media] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/navigation] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/net] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/object] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/table] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/text] -Size=64 -Context=Stock -Type=Threshold -[72x72/actions] -Size=72 -Context=Actions -Type=Threshold - -[72x72/animations] -Size=72 -Context=Animations -Type=Threshold - -[72x72/apps] -Size=72 -Context=Applications -Type=Threshold - -[72x72/categories] -Size=72 -Context=Categories -Type=Threshold - -[72x72/devices] -Size=72 -Context=Devices -Type=Threshold - -[72x72/emblems] -Size=72 -Context=Emblems -Type=Threshold - -[72x72/emotes] -Size=72 -Context=Emotes -Type=Threshold - -[72x72/filesystems] -Size=72 -Context=FileSystems -Type=Threshold - -[72x72/intl] -Size=72 -Context=International -Type=Threshold - -[72x72/mimetypes] -Size=72 -Context=MimeTypes -Type=Threshold - -[72x72/places] -Size=72 -Context=Places -Type=Threshold - -[72x72/status] -Size=72 -Context=Status -Type=Threshold - -[72x72/stock/chart] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/code] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/data] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/form] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/image] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/io] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/media] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/navigation] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/net] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/object] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/table] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/text] -Size=72 -Context=Stock -Type=Threshold - -[96x96/actions] -Size=96 -Context=Actions -Type=Threshold - -[96x96/animations] -Size=96 -Context=Animations -Type=Threshold - -[96x96/apps] -Size=96 -Context=Applications -Type=Threshold - -[96x96/categories] -Size=96 -Context=Categories -Type=Threshold - -[96x96/devices] -Size=96 -Context=Devices -Type=Threshold - -[96x96/emblems] -Size=96 -Context=Emblems -Type=Threshold - -[96x96/emotes] -Size=96 -Context=Emotes -Type=Threshold - -[96x96/filesystems] -Size=96 -Context=FileSystems -Type=Threshold - -[96x96/intl] -Size=96 -Context=International -Type=Threshold - -[96x96/mimetypes] -Size=96 -Context=MimeTypes -Type=Threshold - -[96x96/places] -Size=96 -Context=Places -Type=Threshold - -[96x96/status] -Size=96 -Context=Status -Type=Threshold - -[96x96/stock/chart] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/code] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/data] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/form] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/image] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/io] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/media] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/navigation] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/net] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/object] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/table] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/text] -Size=96 -Context=Stock -Type=Threshold -[128x128/actions] -Size=128 +[16x16/actions] +Size=16 Context=Actions -Type=Threshold +Type=Fixed -[128x128/animations] -Size=128 -Context=Animations -Type=Threshold - -[128x128/apps] -Size=128 -Context=Applications -Type=Threshold - -[128x128/categories] -Size=128 -Context=Categories -Type=Threshold - -[128x128/devices] -Size=128 +[16x16/devices] +Size=16 Context=Devices -Type=Threshold - -[128x128/emblems] -Size=128 -Context=Emblems -Type=Threshold - -[128x128/emotes] -Size=128 -Context=Emotes -Type=Threshold - -[128x128/filesystems] -Size=128 -Context=FileSystems -Type=Threshold - -[128x128/intl] -Size=128 -Context=International -Type=Threshold - -[128x128/mimetypes] -Size=128 -Context=MimeTypes -Type=Threshold - -[128x128/places] -Size=128 -Context=Places -Type=Threshold +Type=Fixed -[128x128/status] -Size=128 +[16x16/status] +Size=16 Context=Status -Type=Threshold - -[128x128/stock/chart] -Size=128 -Context=Stock -Type=Threshold - -[128x128/stock/code] -Size=128 -Context=Stock -Type=Threshold - -[128x128/stock/data] -Size=128 -Context=Stock -Type=Threshold - -[128x128/stock/form] -Size=128 -Context=Stock -Type=Threshold - -[128x128/stock/image] -Size=128 -Context=Stock -Type=Threshold - -[128x128/stock/io] -Size=128 -Context=Stock -Type=Threshold - -[128x128/stock/media] -Size=128 -Context=Stock -Type=Threshold - -[128x128/stock/navigation] -Size=128 -Context=Stock -Type=Threshold - -[128x128/stock/net] -Size=128 -Context=Stock -Type=Threshold - -[128x128/stock/object] -Size=128 -Context=Stock -Type=Threshold - -[128x128/stock/table] -Size=128 -Context=Stock -Type=Threshold +Type=Fixed -[128x128/stock/text] -Size=128 -Context=Stock -Type=Threshold - -[192x192/actions] -Size=192 -Context=Actions -Type=Threshold - -[192x192/animations] -Size=192 -Context=Animations -Type=Threshold - -[192x192/apps] -Size=192 -Context=Applications -Type=Threshold - -[192x192/categories] -Size=192 +[32x32/categories] +Size=32 Context=Categories -Type=Threshold +Type=Fixed -[192x192/devices] -Size=192 +[32x32/devices] +Size=32 Context=Devices -Type=Threshold - -[192x192/emblems] -Size=192 -Context=Emblems -Type=Threshold - -[192x192/emotes] -Size=192 -Context=Emotes -Type=Threshold - -[192x192/filesystems] -Size=192 -Context=FileSystems -Type=Threshold - -[192x192/intl] -Size=192 -Context=International -Type=Threshold - -[192x192/mimetypes] -Size=192 -Context=MimeTypes -Type=Threshold +Type=Fixed -[192x192/places] -Size=192 -Context=Places -Type=Threshold - -[192x192/status] -Size=192 +[32x32/status] +Size=32 Context=Status -Type=Threshold - -[192x192/stock/chart] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/code] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/data] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/form] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/image] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/io] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/media] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/navigation] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/net] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/object] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/table] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/text] -Size=192 -Context=Stock -Type=Threshold - -[256x256/actions] -MinSize=64 -Size=256 -MaxSize=256 -Context=Actions -Type=Scalable - -[256x256/animations] -MinSize=64 -Size=256 -MaxSize=256 -Context=Animations -Type=Scalable - -[256x256/apps] -MinSize=64 -Size=256 -MaxSize=256 -Context=Applications -Type=Scalable - -[256x256/categories] -MinSize=64 -Size=256 -MaxSize=256 -Context=Categories -Type=Scalable - -[256x256/devices] -MinSize=64 -Size=256 -MaxSize=256 -Context=Devices -Type=Scalable - -[256x256/emblems] -MinSize=64 -Size=256 -MaxSize=256 -Context=Emblems -Type=Scalable - -[256x256/emotes] -MinSize=64 -Size=256 -MaxSize=256 -Context=Emotes -Type=Scalable - -[256x256/filesystems] -MinSize=64 -Size=256 -MaxSize=256 -Context=FileSystems -Type=Scalable - -[256x256/intl] -MinSize=64 -Size=256 -MaxSize=256 -Context=International -Type=Scalable - -[256x256/mimetypes] -MinSize=64 -Size=256 -MaxSize=256 -Context=MimeTypes -Type=Scalable - -[256x256/places] -MinSize=64 -Size=256 -MaxSize=256 -Context=Places -Type=Scalable +Type=Fixed -[256x256/status] -MinSize=64 -Size=256 -MaxSize=256 +[48x48/status] +Size=48 Context=Status -Type=Scalable - -[256x256/stock/chart] -MinSize=64 -Size=256 -MaxSize=256 -Context=Stock -Type=Scalable - -[256x256/stock/code] -MinSize=64 -Size=256 -MaxSize=256 -Context=Stock -Type=Scalable - -[256x256/stock/data] -MinSize=64 -Size=256 -MaxSize=256 -Context=Stock -Type=Scalable - -[256x256/stock/form] -MinSize=64 -Size=256 -MaxSize=256 -Context=Stock -Type=Scalable - -[256x256/stock/image] -MinSize=64 -Size=256 -MaxSize=256 -Context=Stock -Type=Scalable - -[256x256/stock/io] -MinSize=64 -Size=256 -MaxSize=256 -Context=Stock -Type=Scalable - -[256x256/stock/media] -MinSize=64 -Size=256 -MaxSize=256 -Context=Stock -Type=Scalable - -[256x256/stock/navigation] -MinSize=64 -Size=256 -MaxSize=256 -Context=Stock -Type=Scalable +Type=Fixed -[256x256/stock/net] -MinSize=64 -Size=256 -MaxSize=256 -Context=Stock -Type=Scalable - -[256x256/stock/object] -MinSize=64 -Size=256 -MaxSize=256 -Context=Stock -Type=Scalable - -[256x256/stock/table] -MinSize=64 -Size=256 -MaxSize=256 -Context=Stock -Type=Scalable - -[256x256/stock/text] -MinSize=64 -Size=256 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/actions] -MinSize=1 -Size=128 -MaxSize=256 -Context=Actions -Type=Scalable - -[scalable/animations] -MinSize=1 -Size=128 -MaxSize=256 -Context=Animations -Type=Scalable +[96x96/categories] +Size=96 +Context=Categories +Type=Fixed [scalable/apps] -MinSize=1 Size=128 +MinSize=16 MaxSize=256 Context=Applications Type=Scalable [scalable/categories] -MinSize=1 Size=128 +MinSize=16 MaxSize=256 Context=Categories Type=Scalable [scalable/devices] -MinSize=1 Size=128 +MinSize=16 MaxSize=256 Context=Devices Type=Scalable -[scalable/emblems] -MinSize=1 -Size=128 -MaxSize=256 -Context=Emblems -Type=Scalable - -[scalable/emotes] -MinSize=1 -Size=128 -MaxSize=256 -Context=Emotes -Type=Scalable - -[scalable/filesystems] -MinSize=1 -Size=128 -MaxSize=256 -Context=FileSystems -Type=Scalable - -[scalable/intl] -MinSize=1 -Size=128 -MaxSize=256 -Context=International -Type=Scalable - -[scalable/mimetypes] -MinSize=1 -Size=128 -MaxSize=256 -Context=MimeTypes -Type=Scalable - -[scalable/places] -MinSize=1 -Size=128 -MaxSize=256 -Context=Places -Type=Scalable - [scalable/status] -MinSize=1 Size=128 +MinSize=16 MaxSize=256 Context=Status Type=Scalable - -[scalable/stock/chart] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/code] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/data] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/form] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/image] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/io] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/media] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/navigation] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/net] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/object] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/table] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/text] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - ===================================== gajim/data/icons/hicolor/symbolic/apps/org.gajim.Gajim-symbolic.svg → gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim-symbolic.svg ===================================== ===================================== gajim/gtk/accounts.py ===================================== @@ -787,7 +787,7 @@ def __init__(self, account): Setting(SettingKind.POPOVER, _('Proxy'), SettingType.ACCOUNT_CONFIG, 'proxy', name='proxy', props={'entries': self._get_proxies(), - 'default-text': _('No Proxy'), + 'default-text': _('System'), 'button-icon-name': 'preferences-system-symbolic', 'button-callback': self._on_proxy_edit}), ===================================== gajim/gtk/filetransfer_progress.py ===================================== @@ -58,8 +58,11 @@ def __init__(self, transfer): self._ui.connect_signals(self) def _on_transfer_state_change(self, transfer, _signal_name, state): + if self._destroyed: + return + if state.is_error: - ErrorDialog(_('Upload Failed'), + ErrorDialog(_('Error'), transfer.error_text, transient_for=app.interface.roster.window) self.destroy() @@ -80,12 +83,12 @@ def _on_cancel_button_clicked(self, _widget): self.destroy() def _on_destroy(self, *args): + self._destroyed = True + if self._transfer.state.is_active: - client = app.get_client(self._transfer.account) - client.get_module('HTTPUpload').cancel_transfer(self._transfer) + self._transfer.cancel() self._transfer = None - self._destroyed = True if self._pulse is not None: GLib.source_remove(self._pulse) ===================================== gajim/gtk/preferences.py ===================================== @@ -983,7 +983,7 @@ def __init__(self, pref_window): 'global_proxy', name='global_proxy', props={'entries': self._get_proxies(), - 'default-text': _('No Proxy'), + 'default-text': _('System'), 'button-icon-name': 'preferences-system-symbolic', 'button-callback': self._on_proxy_edit}), ===================================== gajim/gtk/profile.py ===================================== @@ -36,7 +36,7 @@ 'title': Q_('?profile:Title'), 'role': Q_('?profile:Role'), 'url': _('URL'), - 'key': Q_('?profile:Key'), + 'key': Q_('?profile:Public Encryption Key'), } ===================================== gajim/gtk/vcard_grid.py ===================================== @@ -43,7 +43,7 @@ 'org': _('Organisation'), 'note': Q_('?profile:Note'), 'url': _('URL'), - 'key': Q_('?profile:Key'), + 'key': Q_('?profile:Public Encryption Key'), } ===================================== gajim/gui_interface.py ===================================== @@ -73,7 +73,6 @@ from gajim.common import socks5 from gajim.common import helpers from gajim.common import passwords -from gajim.common import logging_helpers from gajim.common.helpers import ask_for_status_message from gajim.common.helpers import get_group_chat_nick from gajim.common.structs import MUCData @@ -879,6 +878,7 @@ def _send_httpupload(self, chat_control, path): None, dialog_name='open-file-error2', args=error)) return + transfer.connect('cancel', self._on_cancel_upload) transfer.connect('state-changed', self._on_http_upload_state_changed) FileTransferProgress(transfer) @@ -902,6 +902,11 @@ def _on_http_upload_state_changed(transfer, _signal_name, state): client = app.get_client(transfer.account) client.send_message(message) + @staticmethod + def _on_cancel_upload(transfer, _signal_name): + client = app.get_client(transfer.account) + client.get_module('HTTPUpload').cancel_transfer(transfer) + @staticmethod def handle_event_metacontacts(obj): app.contacts.define_metacontacts(obj.conn.name, obj.meta_list) @@ -2125,9 +2130,6 @@ def __init__(self): app.load_css_config() app.storage.archive.reset_shown_unread_messages() - # override logging settings from config (don't take care of '-q' option) - if app.settings.get('verbose'): - logging_helpers.set_verbose() for account in app.settings.get_accounts(): if app.settings.get_account_setting(account, 'is_zeroconf'): ===================================== gajim/history_manager.py ===================================== @@ -46,6 +46,7 @@ from gi.repository import Gio from gi.repository import Pango +import gajim.gui from gajim.common import app from gajim.common import configpaths from gajim.common.i18n import _ @@ -54,6 +55,8 @@ from gajim.common.const import JIDConstant from gajim.common.const import KindConstant from gajim.common.const import ShowConstant +from gajim.common.settings import Settings + def is_standalone(): # Determine if we are in standalone mode @@ -64,7 +67,15 @@ def is_standalone(): return False +def init_gtk(): + gajim.gui.init('gtk') + from gajim.gui import exception + exception.init() + + if is_standalone(): + init_gtk() + try: shortargs = 'hvsc:l:p:' longargs = 'help verbose separate config-path= loglevel= profile=' @@ -86,6 +97,8 @@ def is_standalone(): configpaths.set_config_root(a) configpaths.init() + app.settings = Settings() + app.settings.init() app.load_css_config() from gajim.common import helpers ===================================== setup.py ===================================== @@ -191,8 +191,8 @@ def run(self): data_files_app_icon = [ ("share/icons/hicolor/scalable/apps", ["gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim.svg"]), - ("share/icons/hicolor/symbolic/apps", - ["gajim/data/icons/hicolor/symbolic/apps/org.gajim.Gajim-symbolic.svg"]) + ("share/icons/hicolor/scalable/apps", + ["gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim-symbolic.svg"]) ] data_files = data_files_app_icon View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/161774edf97670670a1973cef079db5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/161774edf97670670a1973cef079db5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] 5 commits: Delimiter: Don’t stop connecting when private xml is not available
by Philipp Hörist 09 Jan '21

09 Jan '21

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: 1b55c3fa by lovetox at 2021-01-09T11:53:10+01:00 Delimiter: Don’t stop connecting when private xml is not available - - - - - 6394776f by lovetox at 2021-01-09T11:57:43+01:00 VCardGrid: Fix storing org property values Fixes #10377 - - - - - fe7cdb53 by lovetox at 2021-01-09T17:24:37+01:00 Don’t return None on format_*() calls Fixes #10235 - - - - - d0f6a26f by lovetox at 2021-01-09T17:24:38+01:00 Simplify imports - - - - - 0f4dd5c6 by Daniel Brötzmann at 2021-01-09T17:24:38+01:00 Don’t send PM if group chat is not anonymous - - - - - 7 changed files: - gajim/common/modules/delimiter.py - gajim/common/setting_values.py - gajim/groupchat_control.py - gajim/gtk/preferences.py - gajim/gtk/util.py - gajim/gtk/vcard_grid.py - gajim/gui/__init__.py Changes: ===================================== gajim/common/modules/delimiter.py ===================================== @@ -16,7 +16,6 @@ from nbxmpp.errors import is_error -from nbxmpp.modules.util import raise_if_error from gajim.common.modules.base import BaseModule from gajim.common.modules.util import as_task @@ -42,7 +41,10 @@ def get_roster_delimiter(self): delimiter = yield self.request_delimiter() if is_error(delimiter) or delimiter is None: result = yield self.set_delimiter(self.delimiter) - raise_if_error(result) + if is_error(result): + self._con.connect_machine() + return + delimiter = self.delimiter self.delimiter = delimiter ===================================== gajim/common/setting_values.py ===================================== @@ -115,6 +115,7 @@ class _ACCOUNT_DEFAULT: 'notification_position_x': -1, 'notification_position_y': -1, 'muc_highlight_words': '', + 'muc_prefer_direct_msg': True, 'quit_on_roster_x_button': False, 'hide_on_roster_x_button': False, 'show_status_msgs_in_roster': True, ===================================== gajim/groupchat_control.py ===================================== @@ -1902,11 +1902,14 @@ def _start_private_message(self, nick): gc_c = app.contacts.get_gc_contact(self.account, self.room_jid, nick) nick_jid = gc_c.get_full_jid() - ctrl = app.interface.msg_win_mgr.get_control(nick_jid, self.account) - if not ctrl: + muc_prefer_direct_msg = app.settings.get('muc_prefer_direct_msg') + pm_queue = len(app.events.get_events( + self.account, jid=nick_jid, types=['pm'])) + if not self.is_anonymous and muc_prefer_direct_msg and not pm_queue: + jid = app.get_jid_without_resource(gc_c.jid) + ctrl = app.interface.new_chat_from_jid(self.account, jid) + else: ctrl = app.interface.new_private_chat(gc_c, self.account) - - if ctrl: ctrl.parent_win.set_active_tab(ctrl) return ctrl ===================================== gajim/gtk/preferences.py ===================================== @@ -420,6 +420,12 @@ def __init__(self, *args): desc=_('Default for new public group chats'), props={'entries': THRESHOLD_OPTIONS}), + Setting(SettingKind.SWITCH, + _('Direct Messages'), + SettingType.CONFIG, + 'muc_prefer_direct_msg', + desc=_('Prefer direct messages in private group chats ')), + Setting(SettingKind.SWITCH, _('Show Joined / Left'), SettingType.CONFIG, ===================================== gajim/gtk/util.py ===================================== @@ -554,9 +554,6 @@ def get_account_mood_icon_name(account): def format_activity(activity, subactivity, text): - if activity is None: - return None - if subactivity in ACTIVITIES[activity]: subactivity = ACTIVITIES[activity][subactivity] activity = ACTIVITIES[activity]['category'] @@ -586,8 +583,6 @@ def get_account_activity_icon_name(account): def format_tune(artist, _length, _rating, source, title, _track, _uri): - if artist is None and title is None and source is None: - return None artist = GLib.markup_escape_text(artist or _('Unknown Artist')) title = GLib.markup_escape_text(title or _('Unknown Title')) source = GLib.markup_escape_text(source or _('Unknown Source')) ===================================== gajim/gtk/vcard_grid.py ===================================== @@ -583,7 +583,7 @@ def __init__(self, prop, account): def _on_text_changed(self, entry, _param): text = entry.get_text() if self._prop.name == 'org': - self._prop.values[0] = text + self._prop.values = [text] else: self._prop.value = text self._value_label.set_value(text) ===================================== gajim/gui/__init__.py ===================================== @@ -1,10 +1,11 @@ import sys -import importlib +from importlib.abc import MetaPathFinder +from importlib.util import spec_from_file_location from pathlib import Path -class GUIFinder(importlib.abc.MetaPathFinder): +class GUIFinder(MetaPathFinder): def __init__(self, name, fallback=None): self._path = Path(__file__).parent.parent / name @@ -22,7 +23,7 @@ def find_spec(self, fullname, _path, _target=None): if module_path is None: return None - spec = importlib.util.spec_from_file_location(fullname, module_path) + spec = spec_from_file_location(fullname, module_path) return spec View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5540f00c5fe616182c8c90ba35e36c5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5540f00c5fe616182c8c90ba35e36c5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] 2 commits: FileTransfer: Add cancel signal
by Philipp Hörist 08 Jan '21

08 Jan '21

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: 2ed39767 by lovetox at 2021-01-08T23:32:44+01:00 FileTransfer: Add cancel signal - - - - - 5540f00c by lovetox at 2021-01-08T23:33:42+01:00 FileTransferProgress: Use cancel action - - - - - 3 changed files: - gajim/common/filetransfer.py - gajim/gtk/filetransfer_progress.py - gajim/gui_interface.py Changes: ===================================== gajim/common/filetransfer.py ===================================== @@ -105,3 +105,6 @@ def set_finished(self): def update_progress(self): self.notify('progress') + + def cancel(self): + self.notify('cancel') ===================================== gajim/gtk/filetransfer_progress.py ===================================== @@ -58,8 +58,11 @@ def __init__(self, transfer): self._ui.connect_signals(self) def _on_transfer_state_change(self, transfer, _signal_name, state): + if self._destroyed: + return + if state.is_error: - ErrorDialog(_('Upload Failed'), + ErrorDialog(_('Error'), transfer.error_text, transient_for=app.interface.roster.window) self.destroy() @@ -80,12 +83,12 @@ def _on_cancel_button_clicked(self, _widget): self.destroy() def _on_destroy(self, *args): + self._destroyed = True + if self._transfer.state.is_active: - client = app.get_client(self._transfer.account) - client.get_module('HTTPUpload').cancel_transfer(self._transfer) + self._transfer.cancel() self._transfer = None - self._destroyed = True if self._pulse is not None: GLib.source_remove(self._pulse) ===================================== gajim/gui_interface.py ===================================== @@ -878,6 +878,7 @@ def _send_httpupload(self, chat_control, path): None, dialog_name='open-file-error2', args=error)) return + transfer.connect('cancel', self._on_cancel_upload) transfer.connect('state-changed', self._on_http_upload_state_changed) FileTransferProgress(transfer) @@ -901,6 +902,11 @@ def _on_http_upload_state_changed(transfer, _signal_name, state): client = app.get_client(transfer.account) client.send_message(message) + @staticmethod + def _on_cancel_upload(transfer, _signal_name): + client = app.get_client(transfer.account) + client.get_module('HTTPUpload').cancel_transfer(transfer) + @staticmethod def handle_event_metacontacts(obj): app.contacts.define_metacontacts(obj.conn.name, obj.meta_list) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4d6eef1ad280765cff9a89e827ad628… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4d6eef1ad280765cff9a89e827ad628… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] HistoryManager: Make it work again in standalone mode
by Philipp Hörist 08 Jan '21

08 Jan '21

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: 4d6eef1a by lovetox at 2021-01-08T20:13:59+01:00 HistoryManager: Make it work again in standalone mode Fixes #10384 - - - - - 1 changed file: - gajim/history_manager.py Changes: ===================================== gajim/history_manager.py ===================================== @@ -46,6 +46,7 @@ from gi.repository import Gio from gi.repository import Pango +import gajim.gui from gajim.common import app from gajim.common import configpaths from gajim.common.i18n import _ @@ -54,6 +55,8 @@ from gajim.common.const import JIDConstant from gajim.common.const import KindConstant from gajim.common.const import ShowConstant +from gajim.common.settings import Settings + def is_standalone(): # Determine if we are in standalone mode @@ -64,7 +67,15 @@ def is_standalone(): return False +def init_gtk(): + gajim.gui.init('gtk') + from gajim.gui import exception + exception.init() + + if is_standalone(): + init_gtk() + try: shortargs = 'hvsc:l:p:' longargs = 'help verbose separate config-path= loglevel= profile=' @@ -86,6 +97,8 @@ def is_standalone(): configpaths.set_config_root(a) configpaths.init() + app.settings = Settings() + app.settings.init() app.load_css_config() from gajim.common import helpers View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4d6eef1ad280765cff9a89e827ad6284… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4d6eef1ad280765cff9a89e827ad6284… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] Update setupy.py
by Philipp Hörist 08 Jan '21

08 Jan '21

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: f4d1d5d5 by lovetox at 2021-01-08T17:25:44+01:00 Update setupy.py - - - - - 1 changed file: - setup.py Changes: ===================================== setup.py ===================================== @@ -191,8 +191,8 @@ def run(self): data_files_app_icon = [ ("share/icons/hicolor/scalable/apps", ["gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim.svg"]), - ("share/icons/hicolor/symbolic/apps", - ["gajim/data/icons/hicolor/symbolic/apps/org.gajim.Gajim-symbolic.svg"]) + ("share/icons/hicolor/scalable/apps", + ["gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim-symbolic.svg"]) ] data_files = data_files_app_icon View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f4d1d5d5fd7cee04e59031e7470c240d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f4d1d5d5fd7cee04e59031e7470c240d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] 2 commits: Move svg icon to scaleable folder
by Philipp Hörist 07 Jan '21

07 Jan '21

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: ecc9c8a5 by lovetox at 2021-01-07T21:47:48+01:00 Move svg icon to scaleable folder - - - - - eb718617 by lovetox at 2021-01-07T21:47:48+01:00 Update index.theme - - - - - 2 changed files: - gajim/data/icons/hicolor/index.theme - gajim/data/icons/hicolor/symbolic/apps/org.gajim.Gajim-symbolic.svg → gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim-symbolic.svg Changes: ===================================== gajim/data/icons/hicolor/index.theme ===================================== @@ -2,1661 +2,74 @@ Name=Hicolor Comment=Fallback icon theme Hidden=true -Directories=16x16/actions,16x16/animations,16x16/apps,16x16/categories,16x16/devices,16x16/emblems,16x16/emotes,16x16/filesystems,16x16/intl,16x16/mimetypes,16x16/places,16x16/status,16x16/stock/chart,16x16/stock/code,16x16/stock/data,16x16/stock/form,16x16/stock/image,16x16/stock/io,16x16/stock/media,16x16/stock/navigation,16x16/stock/net,16x16/stock/object,16x16/stock/table,16x16/stock/text,22x22/actions,22x22/animations,22x22/apps,22x22/categories,22x22/devices,22x22/emblems,22x22/emotes,22x22/filesystems,22x22/intl,22x22/mimetypes,22x22/places,22x22/status,22x22/stock/chart,22x22/stock/code,22x22/stock/data,22x22/stock/form,22x22/stock/image,22x22/stock/io,22x22/stock/media,22x22/stock/navigation,22x22/stock/net,22x22/stock/object,22x22/stock/table,22x22/stock/text,24x24/actions,24x24/animations,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/emotes,24x24/filesystems,24x24/intl,24x24/mimetypes,24x24/places,24x24/status,24x24/stock/chart,24x24/stock/code,24x24/stock/data,24x24/stock/form,24x24/stock/image,24x24/stock/io,24x24/stock/media,24x24/stock/navigation,24x24/stock/net,24x24/stock/object,24x24/stock/table,24x24/stock/text,32x32/actions,32x32/animations,32x32/apps,32x32/categories,32x32/devices,32x32/emblems,32x32/emotes,32x32/filesystems,32x32/intl,32x32/mimetypes,32x32/places,32x32/status,32x32/stock/chart,32x32/stock/code,32x32/stock/data,32x32/stock/form,32x32/stock/image,32x32/stock/io,32x32/stock/media,32x32/stock/navigation,32x32/stock/net,32x32/stock/object,32x32/stock/table,32x32/stock/text,36x36/actions,36x36/animations,36x36/apps,36x36/categories,36x36/devices,36x36/emblems,36x36/emotes,36x36/filesystems,36x36/intl,36x36/mimetypes,36x36/places,36x36/status,36x36/stock/chart,36x36/stock/code,36x36/stock/data,36x36/stock/form,36x36/stock/image,36x36/stock/io,36x36/stock/media,36x36/stock/navigation,36x36/stock/net,36x36/stock/object,36x36/stock/table,36x36/stock/text,48x48/actions,48x48/animations,48x48/apps,48x48/categories,48x48/devices,48x48/emblems,48x48/emotes,48x48/filesystems,48x48/intl,48x48/mimetypes,48x48/places,48x48/status,48x48/stock/chart,48x48/stock/code,48x48/stock/data,48x48/stock/form,48x48/stock/image,48x48/stock/io,48x48/stock/media,48x48/stock/navigation,48x48/stock/net,48x48/stock/object,48x48/stock/table,48x48/stock/text,64x64/actions,64x64/animations,64x64/apps,64x64/categories,64x64/devices,64x64/emblems,64x64/emotes,64x64/filesystems,64x64/intl,64x64/mimetypes,64x64/places,64x64/status,64x64/stock/chart,64x64/stock/code,64x64/stock/data,64x64/stock/form,64x64/stock/image,64x64/stock/io,64x64/stock/media,64x64/stock/navigation,64x64/stock/net,64x64/stock/object,64x64/stock/table,64x64/stock/text,72x72/actions,72x72/animations,72x72/apps,72x72/categories,72x72/devices,72x72/emblems,72x72/emotes,72x72/filesystems,72x72/intl,72x72/mimetypes,72x72/places,72x72/status,72x72/stock/chart,72x72/stock/code,72x72/stock/data,72x72/stock/form,72x72/stock/image,72x72/stock/io,72x72/stock/media,72x72/stock/navigation,72x72/stock/net,72x72/stock/object,72x72/stock/table,72x72/stock/text,96x96/actions,96x96/animations,96x96/apps,96x96/categories,96x96/devices,96x96/emblems,96x96/emotes,96x96/filesystems,96x96/intl,96x96/mimetypes,96x96/places,96x96/status,96x96/stock/chart,96x96/stock/code,96x96/stock/data,96x96/stock/form,96x96/stock/image,96x96/stock/io,96x96/stock/media,96x96/stock/navigation,96x96/stock/net,96x96/stock/object,96x96/stock/table,96x96/stock/text,128x128/actions,128x128/animations,128x128/apps,128x128/categories,128x128/devices,128x128/emblems,128x128/emotes,128x128/filesystems,128x128/intl,128x128/mimetypes,128x128/places,128x128/status,128x128/stock/chart,128x128/stock/code,128x128/stock/data,128x128/stock/form,128x128/stock/image,128x128/stock/io,128x128/stock/media,128x128/stock/navigation,128x128/stock/net,128x128/stock/object,128x128/stock/table,128x128/stock/text,192x192/actions,192x192/animations,192x192/apps,192x192/categories,192x192/devices,192x192/emblems,192x192/emotes,192x192/filesystems,192x192/intl,192x192/mimetypes,192x192/places,192x192/status,192x192/stock/chart,192x192/stock/code,192x192/stock/data,192x192/stock/form,192x192/stock/image,192x192/stock/io,192x192/stock/media,192x192/stock/navigation,192x192/stock/net,192x192/stock/object,192x192/stock/table,192x192/stock/text,256x256/actions,256x256/animations,256x256/apps,256x256/categories,256x256/devices,256x256/emblems,256x256/emotes,256x256/filesystems,256x256/intl,256x256/mimetypes,256x256/places,256x256/status,256x256/stock/chart,256x256/stock/code,256x256/stock/data,256x256/stock/form,256x256/stock/image,256x256/stock/io,256x256/stock/media,256x256/stock/navigation,256x256/stock/net,256x256/stock/object,256x256/stock/table,256x256/stock/text,scalable/actions,scalable/animations,scalable/apps,scalable/categories,scalable/devices,scalable/emblems,scalable/emotes,scalable/filesystems,scalable/intl,scalable/mimetypes,scalable/places,scalable/status,scalable/stock/chart,scalable/stock/code,scalable/stock/data,scalable/stock/form,scalable/stock/image,scalable/stock/io,scalable/stock/media,scalable/stock/navigation,scalable/stock/net,scalable/stock/object,scalable/stock/table,scalable/stock/text +Directories=16x16/actions,16x16/devices,16x16/status,32x32/categories,32x32/devices,32x32/status,48x48/status,96x96/categories,scalable/apps,scalable/categories,scalable/devices,scalable/status -[16x16/actions] -Size=16 -Context=Actions -Type=Threshold - -[16x16/animations] -Size=16 -Context=Animations -Type=Threshold - -[16x16/apps] -Size=16 -Context=Applications -Type=Threshold - -[16x16/categories] -Size=16 -Context=Categories -Type=Threshold - -[16x16/devices] -Size=16 -Context=Devices -Type=Threshold - -[16x16/emblems] -Size=16 -Context=Emblems -Type=Threshold - -[16x16/emotes] -Size=16 -Context=Emotes -Type=Threshold - -[16x16/filesystems] -Size=16 -Context=FileSystems -Type=Threshold - -[16x16/intl] -Size=16 -Context=International -Type=Threshold - -[16x16/mimetypes] -Size=16 -Context=MimeTypes -Type=Threshold - -[16x16/places] -Size=16 -Context=Places -Type=Threshold - -[16x16/status] -Size=16 -Context=Status -Type=Threshold - -[16x16/stock/chart] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/code] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/data] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/form] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/image] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/io] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/media] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/navigation] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/net] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/object] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/table] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/text] -Size=16 -Context=Stock -Type=Threshold - -[22x22/actions] -Size=22 -Context=Actions -Type=Threshold - -[22x22/animations] -Size=22 -Context=Animations -Type=Threshold - -[22x22/apps] -Size=22 -Context=Applications -Type=Threshold - -[22x22/categories] -Size=22 -Context=Categories -Type=Threshold - -[22x22/devices] -Size=22 -Context=Devices -Type=Threshold - -[22x22/emblems] -Size=22 -Context=Emblems -Type=Threshold - -[22x22/emotes] -Size=22 -Context=Emotes -Type=Threshold - -[22x22/filesystems] -Size=22 -Context=FileSystems -Type=Threshold - -[22x22/intl] -Size=22 -Context=International -Type=Threshold - -[22x22/mimetypes] -Size=22 -Context=MimeTypes -Type=Threshold - -[22x22/places] -Size=22 -Context=Places -Type=Threshold - -[22x22/status] -Size=22 -Context=Status -Type=Threshold - -[22x22/stock/chart] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/code] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/data] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/form] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/image] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/io] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/media] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/navigation] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/net] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/object] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/table] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/text] -Size=22 -Context=Stock -Type=Threshold - -[24x24/actions] -Size=24 -Context=Actions -Type=Threshold - -[24x24/animations] -Size=24 -Context=Animations -Type=Threshold - -[24x24/apps] -Size=24 -Context=Applications -Type=Threshold - -[24x24/categories] -Size=24 -Context=Categories -Type=Threshold - -[24x24/devices] -Size=24 -Context=Devices -Type=Threshold - -[24x24/emblems] -Size=24 -Context=Emblems -Type=Threshold - -[24x24/emotes] -Size=24 -Context=Emotes -Type=Threshold - -[24x24/filesystems] -Size=24 -Context=FileSystems -Type=Threshold - -[24x24/intl] -Size=24 -Context=International -Type=Threshold - -[24x24/mimetypes] -Size=24 -Context=MimeTypes -Type=Threshold - -[24x24/places] -Size=24 -Context=Places -Type=Threshold - -[24x24/status] -Size=24 -Context=Status -Type=Threshold - -[24x24/stock/chart] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/code] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/data] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/form] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/image] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/io] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/media] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/navigation] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/net] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/object] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/table] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/text] -Size=24 -Context=Stock -Type=Threshold - -[32x32/actions] -Size=32 -Context=Actions -Type=Threshold - -[32x32/animations] -Size=32 -Context=Animations -Type=Threshold - -[32x32/apps] -Size=32 -Context=Applications -Type=Threshold - -[32x32/categories] -Size=32 -Context=Categories -Type=Threshold - -[32x32/devices] -Size=32 -Context=Devices -Type=Threshold - -[32x32/emblems] -Size=32 -Context=Emblems -Type=Threshold - -[32x32/emotes] -Size=32 -Context=Emotes -Type=Threshold - -[32x32/filesystems] -Size=32 -Context=FileSystems -Type=Threshold - -[32x32/intl] -Size=32 -Context=International -Type=Threshold - -[32x32/mimetypes] -Size=32 -Context=MimeTypes -Type=Threshold - -[32x32/places] -Size=32 -Context=Places -Type=Threshold - -[32x32/status] -Size=32 -Context=Status -Type=Threshold - -[32x32/stock/chart] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/code] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/data] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/form] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/image] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/io] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/media] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/navigation] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/net] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/object] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/table] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/text] -Size=32 -Context=Stock -Type=Threshold - -[36x36/actions] -Size=36 -Context=Actions -Type=Threshold - -[36x36/animations] -Size=36 -Context=Animations -Type=Threshold - -[36x36/apps] -Size=36 -Context=Applications -Type=Threshold - -[36x36/categories] -Size=36 -Context=Categories -Type=Threshold - -[36x36/devices] -Size=36 -Context=Devices -Type=Threshold - -[36x36/emblems] -Size=36 -Context=Emblems -Type=Threshold - -[36x36/emotes] -Size=36 -Context=Emotes -Type=Threshold - -[36x36/filesystems] -Size=36 -Context=FileSystems -Type=Threshold - -[36x36/intl] -Size=36 -Context=International -Type=Threshold - -[36x36/mimetypes] -Size=36 -Context=MimeTypes -Type=Threshold - -[36x36/places] -Size=36 -Context=Places -Type=Threshold - -[36x36/status] -Size=36 -Context=Status -Type=Threshold - -[36x36/stock/chart] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/code] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/data] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/form] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/image] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/io] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/media] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/navigation] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/net] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/object] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/table] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/text] -Size=36 -Context=Stock -Type=Threshold - -[48x48/actions] -Size=48 -Context=Actions -Type=Threshold - -[48x48/animations] -Size=48 -Context=Animations -Type=Threshold - -[48x48/apps] -Size=48 -Context=Applications -Type=Threshold - -[48x48/categories] -Size=48 -Context=Categories -Type=Threshold - -[48x48/devices] -Size=48 -Context=Devices -Type=Threshold - -[48x48/emblems] -Size=48 -Context=Emblems -Type=Threshold - -[48x48/emotes] -Size=48 -Context=Emotes -Type=Threshold - -[48x48/filesystems] -Size=48 -Context=FileSystems -Type=Threshold - -[48x48/intl] -Size=48 -Context=International -Type=Threshold - -[48x48/mimetypes] -Size=48 -Context=MimeTypes -Type=Threshold - -[48x48/places] -Size=48 -Context=Places -Type=Threshold - -[48x48/status] -Size=48 -Context=Status -Type=Threshold - -[48x48/stock/chart] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/code] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/data] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/form] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/image] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/io] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/media] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/navigation] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/net] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/object] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/table] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/text] -Size=48 -Context=Stock -Type=Threshold - -[64x64/actions] -Size=64 -Context=Actions -Type=Threshold - -[64x64/animations] -Size=64 -Context=Animations -Type=Threshold - -[64x64/apps] -Size=64 -Context=Applications -Type=Threshold - -[64x64/categories] -Size=64 -Context=Categories -Type=Threshold - -[64x64/devices] -Size=64 -Context=Devices -Type=Threshold - -[64x64/emblems] -Size=64 -Context=Emblems -Type=Threshold - -[64x64/emotes] -Size=64 -Context=Emotes -Type=Threshold - -[64x64/filesystems] -Size=64 -Context=FileSystems -Type=Threshold - -[64x64/intl] -Size=64 -Context=International -Type=Threshold - -[64x64/mimetypes] -Size=64 -Context=MimeTypes -Type=Threshold - -[64x64/places] -Size=64 -Context=Places -Type=Threshold - -[64x64/status] -Size=64 -Context=Status -Type=Threshold - -[64x64/stock/chart] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/code] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/data] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/form] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/image] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/io] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/media] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/navigation] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/net] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/object] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/table] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/text] -Size=64 -Context=Stock -Type=Threshold -[72x72/actions] -Size=72 -Context=Actions -Type=Threshold - -[72x72/animations] -Size=72 -Context=Animations -Type=Threshold - -[72x72/apps] -Size=72 -Context=Applications -Type=Threshold - -[72x72/categories] -Size=72 -Context=Categories -Type=Threshold - -[72x72/devices] -Size=72 -Context=Devices -Type=Threshold - -[72x72/emblems] -Size=72 -Context=Emblems -Type=Threshold - -[72x72/emotes] -Size=72 -Context=Emotes -Type=Threshold - -[72x72/filesystems] -Size=72 -Context=FileSystems -Type=Threshold - -[72x72/intl] -Size=72 -Context=International -Type=Threshold - -[72x72/mimetypes] -Size=72 -Context=MimeTypes -Type=Threshold - -[72x72/places] -Size=72 -Context=Places -Type=Threshold - -[72x72/status] -Size=72 -Context=Status -Type=Threshold - -[72x72/stock/chart] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/code] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/data] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/form] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/image] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/io] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/media] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/navigation] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/net] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/object] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/table] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/text] -Size=72 -Context=Stock -Type=Threshold - -[96x96/actions] -Size=96 -Context=Actions -Type=Threshold - -[96x96/animations] -Size=96 -Context=Animations -Type=Threshold - -[96x96/apps] -Size=96 -Context=Applications -Type=Threshold - -[96x96/categories] -Size=96 -Context=Categories -Type=Threshold - -[96x96/devices] -Size=96 -Context=Devices -Type=Threshold - -[96x96/emblems] -Size=96 -Context=Emblems -Type=Threshold - -[96x96/emotes] -Size=96 -Context=Emotes -Type=Threshold - -[96x96/filesystems] -Size=96 -Context=FileSystems -Type=Threshold - -[96x96/intl] -Size=96 -Context=International -Type=Threshold - -[96x96/mimetypes] -Size=96 -Context=MimeTypes -Type=Threshold - -[96x96/places] -Size=96 -Context=Places -Type=Threshold - -[96x96/status] -Size=96 -Context=Status -Type=Threshold - -[96x96/stock/chart] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/code] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/data] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/form] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/image] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/io] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/media] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/navigation] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/net] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/object] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/table] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/text] -Size=96 -Context=Stock -Type=Threshold -[128x128/actions] -Size=128 +[16x16/actions] +Size=16 Context=Actions -Type=Threshold +Type=Fixed -[128x128/animations] -Size=128 -Context=Animations -Type=Threshold - -[128x128/apps] -Size=128 -Context=Applications -Type=Threshold - -[128x128/categories] -Size=128 -Context=Categories -Type=Threshold - -[128x128/devices] -Size=128 +[16x16/devices] +Size=16 Context=Devices -Type=Threshold - -[128x128/emblems] -Size=128 -Context=Emblems -Type=Threshold - -[128x128/emotes] -Size=128 -Context=Emotes -Type=Threshold - -[128x128/filesystems] -Size=128 -Context=FileSystems -Type=Threshold - -[128x128/intl] -Size=128 -Context=International -Type=Threshold - -[128x128/mimetypes] -Size=128 -Context=MimeTypes -Type=Threshold - -[128x128/places] -Size=128 -Context=Places -Type=Threshold +Type=Fixed -[128x128/status] -Size=128 +[16x16/status] +Size=16 Context=Status -Type=Threshold - -[128x128/stock/chart] -Size=128 -Context=Stock -Type=Threshold - -[128x128/stock/code] -Size=128 -Context=Stock -Type=Threshold - -[128x128/stock/data] -Size=128 -Context=Stock -Type=Threshold - -[128x128/stock/form] -Size=128 -Context=Stock -Type=Threshold - -[128x128/stock/image] -Size=128 -Context=Stock -Type=Threshold - -[128x128/stock/io] -Size=128 -Context=Stock -Type=Threshold - -[128x128/stock/media] -Size=128 -Context=Stock -Type=Threshold - -[128x128/stock/navigation] -Size=128 -Context=Stock -Type=Threshold - -[128x128/stock/net] -Size=128 -Context=Stock -Type=Threshold - -[128x128/stock/object] -Size=128 -Context=Stock -Type=Threshold - -[128x128/stock/table] -Size=128 -Context=Stock -Type=Threshold +Type=Fixed -[128x128/stock/text] -Size=128 -Context=Stock -Type=Threshold - -[192x192/actions] -Size=192 -Context=Actions -Type=Threshold - -[192x192/animations] -Size=192 -Context=Animations -Type=Threshold - -[192x192/apps] -Size=192 -Context=Applications -Type=Threshold - -[192x192/categories] -Size=192 +[32x32/categories] +Size=32 Context=Categories -Type=Threshold +Type=Fixed -[192x192/devices] -Size=192 +[32x32/devices] +Size=32 Context=Devices -Type=Threshold - -[192x192/emblems] -Size=192 -Context=Emblems -Type=Threshold - -[192x192/emotes] -Size=192 -Context=Emotes -Type=Threshold - -[192x192/filesystems] -Size=192 -Context=FileSystems -Type=Threshold - -[192x192/intl] -Size=192 -Context=International -Type=Threshold - -[192x192/mimetypes] -Size=192 -Context=MimeTypes -Type=Threshold +Type=Fixed -[192x192/places] -Size=192 -Context=Places -Type=Threshold - -[192x192/status] -Size=192 +[32x32/status] +Size=32 Context=Status -Type=Threshold - -[192x192/stock/chart] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/code] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/data] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/form] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/image] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/io] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/media] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/navigation] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/net] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/object] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/table] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/text] -Size=192 -Context=Stock -Type=Threshold - -[256x256/actions] -MinSize=64 -Size=256 -MaxSize=256 -Context=Actions -Type=Scalable - -[256x256/animations] -MinSize=64 -Size=256 -MaxSize=256 -Context=Animations -Type=Scalable - -[256x256/apps] -MinSize=64 -Size=256 -MaxSize=256 -Context=Applications -Type=Scalable - -[256x256/categories] -MinSize=64 -Size=256 -MaxSize=256 -Context=Categories -Type=Scalable - -[256x256/devices] -MinSize=64 -Size=256 -MaxSize=256 -Context=Devices -Type=Scalable - -[256x256/emblems] -MinSize=64 -Size=256 -MaxSize=256 -Context=Emblems -Type=Scalable - -[256x256/emotes] -MinSize=64 -Size=256 -MaxSize=256 -Context=Emotes -Type=Scalable - -[256x256/filesystems] -MinSize=64 -Size=256 -MaxSize=256 -Context=FileSystems -Type=Scalable - -[256x256/intl] -MinSize=64 -Size=256 -MaxSize=256 -Context=International -Type=Scalable - -[256x256/mimetypes] -MinSize=64 -Size=256 -MaxSize=256 -Context=MimeTypes -Type=Scalable - -[256x256/places] -MinSize=64 -Size=256 -MaxSize=256 -Context=Places -Type=Scalable +Type=Fixed -[256x256/status] -MinSize=64 -Size=256 -MaxSize=256 +[48x48/status] +Size=48 Context=Status -Type=Scalable - -[256x256/stock/chart] -MinSize=64 -Size=256 -MaxSize=256 -Context=Stock -Type=Scalable - -[256x256/stock/code] -MinSize=64 -Size=256 -MaxSize=256 -Context=Stock -Type=Scalable - -[256x256/stock/data] -MinSize=64 -Size=256 -MaxSize=256 -Context=Stock -Type=Scalable - -[256x256/stock/form] -MinSize=64 -Size=256 -MaxSize=256 -Context=Stock -Type=Scalable - -[256x256/stock/image] -MinSize=64 -Size=256 -MaxSize=256 -Context=Stock -Type=Scalable - -[256x256/stock/io] -MinSize=64 -Size=256 -MaxSize=256 -Context=Stock -Type=Scalable - -[256x256/stock/media] -MinSize=64 -Size=256 -MaxSize=256 -Context=Stock -Type=Scalable - -[256x256/stock/navigation] -MinSize=64 -Size=256 -MaxSize=256 -Context=Stock -Type=Scalable +Type=Fixed -[256x256/stock/net] -MinSize=64 -Size=256 -MaxSize=256 -Context=Stock -Type=Scalable - -[256x256/stock/object] -MinSize=64 -Size=256 -MaxSize=256 -Context=Stock -Type=Scalable - -[256x256/stock/table] -MinSize=64 -Size=256 -MaxSize=256 -Context=Stock -Type=Scalable - -[256x256/stock/text] -MinSize=64 -Size=256 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/actions] -MinSize=1 -Size=128 -MaxSize=256 -Context=Actions -Type=Scalable - -[scalable/animations] -MinSize=1 -Size=128 -MaxSize=256 -Context=Animations -Type=Scalable +[96x96/categories] +Size=96 +Context=Categories +Type=Fixed [scalable/apps] -MinSize=1 Size=128 +MinSize=16 MaxSize=256 Context=Applications Type=Scalable [scalable/categories] -MinSize=1 Size=128 +MinSize=16 MaxSize=256 Context=Categories Type=Scalable [scalable/devices] -MinSize=1 Size=128 +MinSize=16 MaxSize=256 Context=Devices Type=Scalable -[scalable/emblems] -MinSize=1 -Size=128 -MaxSize=256 -Context=Emblems -Type=Scalable - -[scalable/emotes] -MinSize=1 -Size=128 -MaxSize=256 -Context=Emotes -Type=Scalable - -[scalable/filesystems] -MinSize=1 -Size=128 -MaxSize=256 -Context=FileSystems -Type=Scalable - -[scalable/intl] -MinSize=1 -Size=128 -MaxSize=256 -Context=International -Type=Scalable - -[scalable/mimetypes] -MinSize=1 -Size=128 -MaxSize=256 -Context=MimeTypes -Type=Scalable - -[scalable/places] -MinSize=1 -Size=128 -MaxSize=256 -Context=Places -Type=Scalable - [scalable/status] -MinSize=1 Size=128 +MinSize=16 MaxSize=256 Context=Status Type=Scalable - -[scalable/stock/chart] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/code] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/data] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/form] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/image] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/io] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/media] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/navigation] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/net] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/object] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/table] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/text] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - ===================================== gajim/data/icons/hicolor/symbolic/apps/org.gajim.Gajim-symbolic.svg → gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim-symbolic.svg ===================================== View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5b9ece54f64bbf38dd9bd55da9972cd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5b9ece54f64bbf38dd9bd55da9972cd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] Profile: Clarify vCard Key entry
by Daniel Brötzmann 07 Jan '21

07 Jan '21

Daniel Brötzmann pushed to branch gajim_1.3 at gajim / gajim Commits: 5b9ece54 by Daniel Brötzmann at 2021-01-07T17:48:12+01:00 Profile: Clarify vCard Key entry - - - - - 2 changed files: - gajim/gtk/profile.py - gajim/gtk/vcard_grid.py Changes: ===================================== gajim/gtk/profile.py ===================================== @@ -36,7 +36,7 @@ 'title': Q_('?profile:Title'), 'role': Q_('?profile:Role'), 'url': _('URL'), - 'key': Q_('?profile:Key'), + 'key': Q_('?profile:Public Encryption Key'), } ===================================== gajim/gtk/vcard_grid.py ===================================== @@ -43,7 +43,7 @@ 'org': _('Organisation'), 'note': Q_('?profile:Note'), 'url': _('URL'), - 'key': Q_('?profile:Key'), + 'key': Q_('?profile:Public Encryption Key'), } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5b9ece54f64bbf38dd9bd55da9972cd2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5b9ece54f64bbf38dd9bd55da9972cd2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] Update Translations
by Philipp Hörist 05 Jan '21

05 Jan '21

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: 75b1e3af by Weblate at 2021-01-05T21:48:12+01:00 Update Translations - - - - - 6 changed files: - po/de.po - po/es.po - po/fr.po - po/it.po - po/ja.po - po/zh_CN.po Changes: ===================================== po/de.po ===================================== @@ -13,10 +13,9 @@ msgstr "" "Project-Id-Version: gajim 0.13\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-01 17:44+0100\n" -"PO-Revision-Date: 2020-12-28 12:14+0000\n" +"PO-Revision-Date: 2021-01-05 13:31+0000\n" "Last-Translator: Daniel Brötzmann <mailtrash(a)posteo.de>\n" -"Language-Team: German <https://translate.gajim.org/projects/gajim/master/de/" -">\n" +"Language-Team: German <https://translate.gajim.org/projects/gajim/1-3/de/>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -4574,7 +4573,7 @@ msgstr "Lesebestätigungen senden" #: gajim/gtk/groupchat_settings.py:77 msgid "Let others know if you read up to this point" -msgstr "Lass deinen Kontakt wissen bis wohin du gelesen hast" +msgstr "Lasse andere Teilnehmer wissen bis wohin du gelesen hast" #: gajim/gtk/groupchat_settings.py:80 msgid "Sync Threshold" @@ -5531,9 +5530,8 @@ msgid "Birthday" msgstr "Geburtstag" #: gajim/gtk/profile.py:30 gajim/gtk/vcard_grid.py:36 -#, fuzzy msgid "Gender" -msgstr "Absender: " +msgstr "Geschlecht" #: gajim/gtk/profile.py:31 gajim/data/gui/groupchat_info_scrolled.ui:16 msgid "Address" @@ -5547,32 +5545,28 @@ msgstr "Telefonnr." #: gajim/gtk/profile.py:35 msgid "?profile:Organisation" -msgstr "" +msgstr "Organisation" #: gajim/gtk/profile.py:36 gajim/gtk/vcard_grid.py:41 msgid "?profile:Title" -msgstr "" +msgstr "Titel" #: gajim/gtk/profile.py:37 gajim/gtk/vcard_grid.py:42 -#, fuzzy msgid "?profile:Role" -msgstr "Profil" +msgstr "Rolle" #: gajim/gtk/profile.py:38 gajim/gtk/vcard_grid.py:45 -#, fuzzy msgid "URL" -msgstr "URL:" +msgstr "URL" #: gajim/gtk/profile.py:39 gajim/gtk/vcard_grid.py:46 -#, fuzzy msgid "?profile:Key" -msgstr "Profil" +msgstr "Schlüssel" #: gajim/gtk/profile.py:299 gajim/gtk/profile.py:301 #: gajim/data/gui/profile.ui:98 gajim/data/gui/profile.ui:110 -#, fuzzy msgid "Everyone" -msgstr "Komplett" +msgstr "Jeder" #: gajim/gtk/profile.py:299 gajim/gtk/profile.py:301 #: gajim/data/gui/shortcuts_window.ui:108 gajim/data/gui/groupchat_invite.ui:83 @@ -5642,32 +5636,28 @@ msgid "Registration failed" msgstr "Registrierung ist fehlgeschlagen" #: gajim/gtk/vcard_grid.py:37 -#, fuzzy msgid "?profile:Address" msgstr "Adresse" #: gajim/gtk/vcard_grid.py:40 -#, fuzzy msgid "IM Address" -msgstr "Adresse" +msgstr "Chat-Adresse" #: gajim/gtk/vcard_grid.py:43 -#, fuzzy msgid "Organisation" -msgstr "Organisation (O)" +msgstr "Organisation" #: gajim/gtk/vcard_grid.py:44 -#, fuzzy msgid "?profile:Note" -msgstr "Profil" +msgstr "Notiz" #: gajim/gtk/vcard_grid.py:51 msgid "Your public key or authentication certificate" -msgstr "" +msgstr "Dein Public-Key oder Authentifizierungszertifikat" #: gajim/gtk/vcard_grid.py:59 msgid "Post Office Box" -msgstr "" +msgstr "Postfach" #: gajim/gtk/vcard_grid.py:60 gajim/data/gui/vcard_information_window.ui:489 #: gajim/data/gui/vcard_information_window.ui:1179 @@ -5675,7 +5665,6 @@ msgid "Street" msgstr "Straße" #: gajim/gtk/vcard_grid.py:61 -#, fuzzy msgid "Extended Address" msgstr "Zusatzadresse" @@ -5701,25 +5690,23 @@ msgstr "Land" #: gajim/gtk/vcard_grid.py:111 msgid "Male" -msgstr "" +msgstr "Männlich" #: gajim/gtk/vcard_grid.py:112 msgid "Female" -msgstr "" +msgstr "Weiblich" #: gajim/gtk/vcard_grid.py:113 msgid "?Gender:Other" -msgstr "" +msgstr "Andere" #: gajim/gtk/vcard_grid.py:114 -#, fuzzy msgid "?Gender:None" -msgstr "Absender: " +msgstr "Keins" #: gajim/gtk/vcard_grid.py:121 gajim/gtk/vcard_grid.py:428 -#, fuzzy msgid "Home" -msgstr "Website" +msgstr "Zuhause" #: gajim/gtk/vcard_grid.py:122 gajim/gtk/vcard_grid.py:429 #: gajim/data/gui/vcard_information_window.ui:1452 @@ -5727,9 +5714,8 @@ msgid "Work" msgstr "Arbeit" #: gajim/gtk/vcard_grid.py:598 -#, fuzzy msgid "YYYY-MM-DD" -msgstr "Format: JJJJ-MM-TT" +msgstr "JJJJ-MM-TT" #: gajim/gtk/adhoc.py:91 msgid "Finish" @@ -8873,42 +8859,40 @@ msgid "_Account" msgstr "K_onto" #: gajim/data/gui/profile.ui:33 -#, fuzzy msgid "Contact Infos" -msgstr "Kontaktinformationen abfragen" +msgstr "Kontaktinformationen" #: gajim/data/gui/profile.ui:45 -#, fuzzy msgid "Picture and Name" -msgstr "Bild, das benutzt werden soll" +msgstr "Profilbild und Name" #: gajim/data/gui/profile.ui:57 msgid "Make your profile visible for everyone or just for your contacts." msgstr "" +"Mache dein Profil für jeden sichtbar oder ausschließlich für deine Kontakte." #: gajim/data/gui/profile.ui:179 msgid "Remove your profile picture" -msgstr "" +msgstr "Dein Profilbild entfernen" #: gajim/data/gui/profile.ui:198 -#, fuzzy msgid "Change your profile picture" -msgstr "Spitzname ändern (Strg+N)" +msgstr "Dein Profilbild ändern" #: gajim/data/gui/profile.ui:229 msgid "" "Enter your nickname. This is how your name is displayed to your contacts." msgstr "" +"Gibt deinen Spitznamen ein. Mit diesem Namen wirst du deinen Kontakten " +"angezeigt." #: gajim/data/gui/profile.ui:298 -#, fuzzy msgid "Add Entry" -msgstr "Eintrag:" +msgstr "Eintrag hinzufügen" #: gajim/data/gui/profile.ui:410 -#, fuzzy msgid "Update" -msgstr "Jetzt _updaten" +msgstr "Aktualisieren" #: gajim/data/gui/manage_proxies.ui:12 msgctxt "proxy configuration" @@ -10283,9 +10267,8 @@ msgstr "Plugin-Verwaltung" # TODO mark as do not translate? #: data/org.gajim.Gajim.appdata.xml.in:61 -#, fuzzy msgid "Gajim Team" -msgstr "Gajim Designs" +msgstr "Gajim-Team" #~ msgid "Retrieving profile…" #~ msgstr "Empfange Profil…" ===================================== po/es.po ===================================== @@ -9,10 +9,9 @@ msgstr "" "Project-Id-Version: gajim 2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-01 17:44+0100\n" -"PO-Revision-Date: 2020-12-28 21:13+0000\n" +"PO-Revision-Date: 2021-01-05 13:31+0000\n" "Last-Translator: El gran Pirujo <boina(a)disroot.org>\n" -"Language-Team: Spanish <https://translate.gajim.org/projects/gajim/master/es/" -">\n" +"Language-Team: Spanish <https://translate.gajim.org/projects/gajim/1-3/es/>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -10166,9 +10165,8 @@ msgid "Plugin manager" msgstr "Administrador de extensiones" #: data/org.gajim.Gajim.appdata.xml.in:61 -#, fuzzy msgid "Gajim Team" -msgstr "Temas Gajim" +msgstr "Equipo Gajim" #~ msgid "org.gajim.Gajim" #~ msgstr "org.gajim.Gajim" ===================================== po/fr.po ===================================== @@ -3,10 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-01 17:44+0100\n" -"PO-Revision-Date: 2020-12-31 15:56+0000\n" -"Last-Translator: Yann Leboulanger <asterix(a)lagaule.org>\n" -"Language-Team: French <https://translate.gajim.org/projects/gajim/master/fr/" -">\n" +"PO-Revision-Date: 2021-01-05 13:31+0000\n" +"Last-Translator: pitchum <pitchum(a)gramaton.org>\n" +"Language-Team: French <https://translate.gajim.org/projects/gajim/1-3/fr/>\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -3601,9 +3600,8 @@ msgid "Remove Setting" msgstr "Supprimer paramètre" #: gajim/gtk/filetransfer_progress.py:62 -#, fuzzy msgid "Upload Failed" -msgstr "Téléverser (via HTTP Upload)" +msgstr "Échec du téléversement" #: gajim/gtk/filetransfer_progress.py:113 #, python-format @@ -5512,9 +5510,8 @@ msgid "Birthday" msgstr "Date de Naissance" #: gajim/gtk/profile.py:30 gajim/gtk/vcard_grid.py:36 -#, fuzzy msgid "Gender" -msgstr "Expéditeur : " +msgstr "Genre" #: gajim/gtk/profile.py:31 gajim/data/gui/groupchat_info_scrolled.ui:16 msgid "Address" @@ -5528,32 +5525,29 @@ msgstr "Numéro de téléphone" #: gajim/gtk/profile.py:35 msgid "?profile:Organisation" -msgstr "" +msgstr "Organisation" #: gajim/gtk/profile.py:36 gajim/gtk/vcard_grid.py:41 msgid "?profile:Title" -msgstr "" +msgstr "Titre" #: gajim/gtk/profile.py:37 gajim/gtk/vcard_grid.py:42 -#, fuzzy msgid "?profile:Role" -msgstr "Profil" +msgstr "Rôle" #: gajim/gtk/profile.py:38 gajim/gtk/vcard_grid.py:45 -#, fuzzy msgid "URL" -msgstr "URL :" +msgstr "URL" #: gajim/gtk/profile.py:39 gajim/gtk/vcard_grid.py:46 #, fuzzy msgid "?profile:Key" -msgstr "Profil" +msgstr "Clef" #: gajim/gtk/profile.py:299 gajim/gtk/profile.py:301 #: gajim/data/gui/profile.ui:98 gajim/data/gui/profile.ui:110 -#, fuzzy msgid "Everyone" -msgstr "Tout" +msgstr "Tout le monde" #: gajim/gtk/profile.py:299 gajim/gtk/profile.py:301 #: gajim/data/gui/shortcuts_window.ui:108 gajim/data/gui/groupchat_invite.ui:83 @@ -5623,32 +5617,28 @@ msgid "Registration failed" msgstr "L'inscription a échoué" #: gajim/gtk/vcard_grid.py:37 -#, fuzzy msgid "?profile:Address" msgstr "Adresse" #: gajim/gtk/vcard_grid.py:40 -#, fuzzy msgid "IM Address" -msgstr "Adresse" +msgstr "Adresse de messagerie instantanée" #: gajim/gtk/vcard_grid.py:43 -#, fuzzy msgid "Organisation" -msgstr "Organisation (O)" +msgstr "Organisation" #: gajim/gtk/vcard_grid.py:44 -#, fuzzy msgid "?profile:Note" -msgstr "Profil" +msgstr "Note" #: gajim/gtk/vcard_grid.py:51 msgid "Your public key or authentication certificate" -msgstr "" +msgstr "Votre clef publique ou certificat d'authentification" #: gajim/gtk/vcard_grid.py:59 msgid "Post Office Box" -msgstr "" +msgstr "Boîte postale" #: gajim/gtk/vcard_grid.py:60 gajim/data/gui/vcard_information_window.ui:489 #: gajim/data/gui/vcard_information_window.ui:1179 @@ -5658,7 +5648,7 @@ msgstr "Rue" #: gajim/gtk/vcard_grid.py:61 #, fuzzy msgid "Extended Address" -msgstr "Adresse 2" +msgstr "Complément d'adresse" #: gajim/gtk/vcard_grid.py:62 gajim/data/gui/vcard_information_window.ui:505 #: gajim/data/gui/vcard_information_window.ui:1195 @@ -5682,25 +5672,23 @@ msgstr "Pays" #: gajim/gtk/vcard_grid.py:111 msgid "Male" -msgstr "" +msgstr "Homme" #: gajim/gtk/vcard_grid.py:112 msgid "Female" -msgstr "" +msgstr "Femme" #: gajim/gtk/vcard_grid.py:113 msgid "?Gender:Other" -msgstr "" +msgstr "Autre" #: gajim/gtk/vcard_grid.py:114 -#, fuzzy msgid "?Gender:None" -msgstr "Expéditeur : " +msgstr "Aucun" #: gajim/gtk/vcard_grid.py:121 gajim/gtk/vcard_grid.py:428 -#, fuzzy msgid "Home" -msgstr "Site perso" +msgstr "Domicile" #: gajim/gtk/vcard_grid.py:122 gajim/gtk/vcard_grid.py:429 #: gajim/data/gui/vcard_information_window.ui:1452 @@ -5708,9 +5696,8 @@ msgid "Work" msgstr "Emploi" #: gajim/gtk/vcard_grid.py:598 -#, fuzzy msgid "YYYY-MM-DD" -msgstr "Format : AAAA-MM-JJ" +msgstr "AAAA-MM-JJ" #: gajim/gtk/adhoc.py:91 msgid "Finish" @@ -8854,42 +8841,43 @@ msgid "_Account" msgstr "_Comptes" #: gajim/data/gui/profile.ui:33 -#, fuzzy msgid "Contact Infos" -msgstr "Obtenir les informations du contact" +msgstr "Informations du contact" #: gajim/data/gui/profile.ui:45 -#, fuzzy msgid "Picture and Name" -msgstr "Image à utiliser" +msgstr "Image et nom" #: gajim/data/gui/profile.ui:57 +#, fuzzy msgid "Make your profile visible for everyone or just for your contacts." msgstr "" +"Rendre votre profil visible par tout le monde ou uniquement par vos contacts." #: gajim/data/gui/profile.ui:179 msgid "Remove your profile picture" -msgstr "" +msgstr "Retirer l'image de votre profil" #: gajim/data/gui/profile.ui:198 -#, fuzzy msgid "Change your profile picture" -msgstr "Changer votre surnom (Ctrl+N)" +msgstr "Changer l'image de votre profil" #: gajim/data/gui/profile.ui:229 msgid "" "Enter your nickname. This is how your name is displayed to your contacts." msgstr "" +"Saisissez votre pseudonyme. C'est votre nom tel qu'il sera présenté à vos " +"contacts." #: gajim/data/gui/profile.ui:298 #, fuzzy msgid "Add Entry" -msgstr "Article :" +msgstr "Ajouter une entrée" #: gajim/data/gui/profile.ui:410 #, fuzzy msgid "Update" -msgstr "_Mettre à Jour Maintenant" +msgstr "Mettre à jour" #: gajim/data/gui/manage_proxies.ui:12 msgctxt "proxy configuration" @@ -10141,8 +10129,9 @@ msgid "" "with your friends or family, easily share pictures and thoughts or discuss " "the news with your groups." msgstr "" -"Discutez avec vos amis ou votre famille, partagez facilement des photos et " -"des pensées, ou discutez des nouvelles avec vos groupes." +"Gajim se veut être un client XMPP facile à utiliser et complet. Discutez " +"simplement avec vos amis ou votre famille, partagez facilement des photos et " +"des pensées ou discutez des actualités avec vos groupes." #: data/org.gajim.Gajim.appdata.xml.in:14 msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP." ===================================== po/it.po ===================================== @@ -12,10 +12,9 @@ msgstr "" "Project-Id-Version: Gajim 2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-01 17:44+0100\n" -"PO-Revision-Date: 2020-12-28 12:14+0000\n" +"PO-Revision-Date: 2021-01-05 13:31+0000\n" "Last-Translator: pjammo <adrianoghr(a)hotmail.it>\n" -"Language-Team: Italian <https://translate.gajim.org/projects/gajim/master/it/" -">\n" +"Language-Team: Italian <https://translate.gajim.org/projects/gajim/1-3/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -5500,9 +5499,8 @@ msgid "Birthday" msgstr "Data di Nascita" #: gajim/gtk/profile.py:30 gajim/gtk/vcard_grid.py:36 -#, fuzzy msgid "Gender" -msgstr "Mittente: " +msgstr "Genere" #: gajim/gtk/profile.py:31 gajim/data/gui/groupchat_info_scrolled.ui:16 msgid "Address" @@ -5516,32 +5514,28 @@ msgstr "n° Telefono" #: gajim/gtk/profile.py:35 msgid "?profile:Organisation" -msgstr "" +msgstr "?profile:Organizzazione" #: gajim/gtk/profile.py:36 gajim/gtk/vcard_grid.py:41 msgid "?profile:Title" -msgstr "" +msgstr "?profile:Titolo" #: gajim/gtk/profile.py:37 gajim/gtk/vcard_grid.py:42 -#, fuzzy msgid "?profile:Role" -msgstr "Profilo" +msgstr "?profile:Ruolo" #: gajim/gtk/profile.py:38 gajim/gtk/vcard_grid.py:45 -#, fuzzy msgid "URL" -msgstr "URL:" +msgstr "URL" #: gajim/gtk/profile.py:39 gajim/gtk/vcard_grid.py:46 -#, fuzzy msgid "?profile:Key" -msgstr "Profilo" +msgstr "?profile:Chiave" #: gajim/gtk/profile.py:299 gajim/gtk/profile.py:301 #: gajim/data/gui/profile.ui:98 gajim/data/gui/profile.ui:110 -#, fuzzy msgid "Everyone" -msgstr "Tutta" +msgstr "Tutti" #: gajim/gtk/profile.py:299 gajim/gtk/profile.py:301 #: gajim/data/gui/shortcuts_window.ui:108 gajim/data/gui/groupchat_invite.ui:83 @@ -5611,32 +5605,28 @@ msgid "Registration failed" msgstr "Registrazione fallita" #: gajim/gtk/vcard_grid.py:37 -#, fuzzy msgid "?profile:Address" -msgstr "Indirizzo" +msgstr "?profile:Indirizzo" #: gajim/gtk/vcard_grid.py:40 -#, fuzzy msgid "IM Address" -msgstr "Indirizzo" +msgstr "Indirizzo IM" #: gajim/gtk/vcard_grid.py:43 -#, fuzzy msgid "Organisation" -msgstr "Organizzazione (O)" +msgstr "Organizzazione" #: gajim/gtk/vcard_grid.py:44 -#, fuzzy msgid "?profile:Note" -msgstr "Profilo" +msgstr "?profile:Note" #: gajim/gtk/vcard_grid.py:51 msgid "Your public key or authentication certificate" -msgstr "" +msgstr "La tua chiave pubblica o il certificato di autenticazione" #: gajim/gtk/vcard_grid.py:59 msgid "Post Office Box" -msgstr "" +msgstr "Casella Postale" #: gajim/gtk/vcard_grid.py:60 gajim/data/gui/vcard_information_window.ui:489 #: gajim/data/gui/vcard_information_window.ui:1179 @@ -5644,9 +5634,8 @@ msgid "Street" msgstr "Via" #: gajim/gtk/vcard_grid.py:61 -#, fuzzy msgid "Extended Address" -msgstr "Indirizzo Secondario" +msgstr "Indirizzo Esteso" #: gajim/gtk/vcard_grid.py:62 gajim/data/gui/vcard_information_window.ui:505 #: gajim/data/gui/vcard_information_window.ui:1195 @@ -5670,23 +5659,21 @@ msgstr "Paese" #: gajim/gtk/vcard_grid.py:111 msgid "Male" -msgstr "" +msgstr "Maschio" #: gajim/gtk/vcard_grid.py:112 msgid "Female" -msgstr "" +msgstr "Femmina" #: gajim/gtk/vcard_grid.py:113 msgid "?Gender:Other" -msgstr "" +msgstr "?Gender:Altro" #: gajim/gtk/vcard_grid.py:114 -#, fuzzy msgid "?Gender:None" -msgstr "Mittente: " +msgstr "?Gender:Nessuno" #: gajim/gtk/vcard_grid.py:121 gajim/gtk/vcard_grid.py:428 -#, fuzzy msgid "Home" msgstr "Sito" @@ -5696,9 +5683,8 @@ msgid "Work" msgstr "Lavoro" #: gajim/gtk/vcard_grid.py:598 -#, fuzzy msgid "YYYY-MM-DD" -msgstr "Formato: YYYY-MM-DD" +msgstr "YYYY-MM-DD" #: gajim/gtk/adhoc.py:91 msgid "Finish" @@ -8825,42 +8811,39 @@ msgid "_Account" msgstr "_Account" #: gajim/data/gui/profile.ui:33 -#, fuzzy msgid "Contact Infos" -msgstr "Richiedi Informazioni Contatto" +msgstr "Informazioni Contatto" #: gajim/data/gui/profile.ui:45 -#, fuzzy msgid "Picture and Name" -msgstr "Immagine da usare" +msgstr "Immagine e Nome" #: gajim/data/gui/profile.ui:57 msgid "Make your profile visible for everyone or just for your contacts." -msgstr "" +msgstr "Il tuo profilo sarà visibile a tutti oppure solo ai tuoi contatti." #: gajim/data/gui/profile.ui:179 msgid "Remove your profile picture" -msgstr "" +msgstr "Elimina l'immagine del profilo" #: gajim/data/gui/profile.ui:198 -#, fuzzy msgid "Change your profile picture" -msgstr "Cambia il tuo soprannome (Ctrl+N)" +msgstr "Cambia l'immagine del profilo" #: gajim/data/gui/profile.ui:229 msgid "" "Enter your nickname. This is how your name is displayed to your contacts." msgstr "" +"Inserisci il tuo soprannome. I tuoi contatti ti visualizzeranno con questo " +"nome." #: gajim/data/gui/profile.ui:298 -#, fuzzy msgid "Add Entry" -msgstr "Voce:" +msgstr "Aggiungi Voce" #: gajim/data/gui/profile.ui:410 -#, fuzzy msgid "Update" -msgstr "_Aggiorna ora" +msgstr "Aggiorna" #: gajim/data/gui/manage_proxies.ui:12 msgctxt "proxy configuration" @@ -10227,9 +10210,8 @@ msgid "Plugin manager" msgstr "Gestione delle estensioni" #: data/org.gajim.Gajim.appdata.xml.in:61 -#, fuzzy msgid "Gajim Team" -msgstr "Temi di Gajim" +msgstr "Team di Gajim" #~ msgid "Retrieving profile…" #~ msgstr "Recupero profilo…" ===================================== po/ja.po ===================================== @@ -3,10 +3,10 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-01 17:44+0100\n" -"PO-Revision-Date: 2020-08-27 21:19+0000\n" +"PO-Revision-Date: 2021-01-05 13:31+0000\n" "Last-Translator: Mako N <mako(a)pasero.net>\n" -"Language-Team: Japanese <https://translate.gajim.org/projects/gajim/master/" -"ja/>\n" +"Language-Team: Japanese <https://translate.gajim.org/projects/gajim/1-3/ja/>" +"\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -305,11 +305,10 @@ msgid "Really block this contact?" msgstr "本当にこの相手先を遮断しますか ?" #: gajim/roster_window.py:2664 gajim/chat_control.py:430 -#, fuzzy msgid "" "You will appear offline for this contact and you will not receive further " "messages." -msgstr "メッセージを受け取りたい相手先の XMPP アドレス" +msgstr "この相手先に対してオフラインと表示され、これ以上のメッセージを受け取りません。" #: gajim/roster_window.py:2666 msgid "_Do not ask again" @@ -718,9 +717,9 @@ msgid "Authorization accepted" msgstr "承認が得られました" #: gajim/gui_interface.py:360 -#, fuzzy, python-format +#, python-format msgid "The contact \"%(jid)s\" has authorized you to see their status." -msgstr "相手先 \"%s\" は、あなたが在席状況を見ることを承認しました。" +msgstr "相手先 \"%(jid)s\" は、あなたが在席状況を見ることを承認しました。" #: gajim/gui_interface.py:370 msgid "Subscription Removed" @@ -760,9 +759,9 @@ msgid "Group Chat Invitation" msgstr "談話室への招待" #: gajim/gui_interface.py:432 -#, fuzzy, python-format +#, python-format msgid "%(contact)s invited you to %(chat)s" -msgstr "{contact_jid} は既にこの談話室に招待されています" +msgstr "%(contact)s は談話室 %(chat)s に招待招待しました" #: gajim/gui_interface.py:453 msgid "Certificate Passphrase Required" @@ -876,9 +875,8 @@ msgstr "OK (_O)" #: gajim/gui_interface.py:988 gajim/chat_control.py:763 #: gajim/chat_control.py:1660 gajim/gtk/notification.py:190 -#, fuzzy msgid "Incoming Call" -msgstr "受信のニックネームの色" +msgstr "通話の着信" #: gajim/gui_interface.py:990 #, python-format @@ -913,41 +911,37 @@ msgid "Gajim: IPython Console" msgstr "Gajim: IPython コンソール" #: gajim/gui_interface.py:1998 -#, fuzzy msgid "Update Check" -msgstr "スペルチェッカー" +msgstr "更新チェック" #: gajim/gui_interface.py:1999 msgid "Gajim Update Check" -msgstr "" +msgstr "Gajim 更新チェック" #: gajim/gui_interface.py:2000 msgid "Search for Gajim updates periodically?" -msgstr "" +msgstr "Gajim の更新を定期的に探索しますか ?" #: gajim/gui_interface.py:2005 msgid "_Search Periodically" -msgstr "" +msgstr "定期的に探索 (_S)" #: gajim/gui_interface.py:2045 -#, fuzzy msgid "Update Available" -msgstr "不在" +msgstr "更新があります" #: gajim/gui_interface.py:2046 -#, fuzzy msgid "Gajim Update Available" -msgstr "不在" +msgstr "Gajim の更新があります" #: gajim/gui_interface.py:2047 -#, fuzzy, python-format +#, python-format msgid "There is an update available for Gajim (latest version: %s)" -msgstr "選択した暗号化に適用できる暗号化方式がありません。" +msgstr "Gajim の更新があります (最新バージョン: %s)" #: gajim/gui_interface.py:2049 -#, fuzzy msgid "_Do not show again" -msgstr "次回から質問しない (_D)" +msgstr "次回から表示しない (_D)" #: gajim/gui_interface.py:2051 gajim/gtk/accounts.py:126 msgid "_Later" @@ -955,7 +949,7 @@ msgstr "後で (_L)" #: gajim/gui_interface.py:2054 msgid "_Update Now" -msgstr "" +msgstr "今すぐ更新 (_U)" #: gajim/gui_menu_builder.py:358 msgid "I would like to add you to my contact list" @@ -994,9 +988,8 @@ msgid "Send File Directly…" msgstr "直接ファイルを送信…" #: gajim/gui_menu_builder.py:520 gajim/gtk/accounts.py:734 -#, fuzzy msgid "Send Read Markers" -msgstr "生存パケットを送信する" +msgstr "既読マークを送信" #: gajim/gui_menu_builder.py:521 gajim/gtk/accounts.py:710 msgid "Send Chatstate" @@ -1016,9 +1009,8 @@ msgid "Block Contact…" msgstr "相手先を遮断…" #: gajim/gui_menu_builder.py:525 gajim/data/gui/chat_control.ui:936 -#, fuzzy msgid "Start Call…" -msgstr "チャットを開始" +msgstr "通話を開始…" #: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:576 #: gajim/gui_menu_builder.py:802 gajim/data/gui/groupchat_control.ui:1334 @@ -1045,9 +1037,8 @@ msgid "All Chat States" msgstr "すべてのチャット状態" #: gajim/gui_menu_builder.py:577 -#, fuzzy msgid "Settings…" -msgstr "設定" +msgstr "設定…" #: gajim/gui_menu_builder.py:578 msgid "Manage Group Chat" @@ -1283,31 +1274,29 @@ msgid "Pong! (%s seconds)" msgstr "Pong! (%s 秒)" #: gajim/chat_control.py:758 -#, fuzzy msgid "Calling…" -msgstr "参加中…" +msgstr "通話…" #: gajim/chat_control.py:783 gajim/chat_control.py:870 -#, fuzzy msgid "Connection Error" -msgstr "接続" +msgstr "接続エラー" #: gajim/chat_control.py:811 gajim/data/gui/chat_control.ui:1185 msgid "Turn Camera on" -msgstr "" +msgstr "カメラをオンにする" #: gajim/chat_control.py:822 msgid "Calling (Video)…" -msgstr "" +msgstr "通話(ビデオ)…" #: gajim/chat_control.py:826 gajim/chat_control.py:834 #: gajim/chat_control.py:864 msgid "Turn Camera off" -msgstr "" +msgstr "カメラをオフにする" #: gajim/chat_control.py:832 msgid "Incoming Call (Video)" -msgstr "" +msgstr "通話着信(ビデオ)" #: gajim/chat_control.py:1020 #, python-format @@ -1385,23 +1374,24 @@ msgid "Open _Folder" msgstr "フォルダを開く (_F)" #: gajim/chat_control.py:1662 -#, fuzzy msgid "" "\n" "Video Call" -msgstr "ビデオチャット" +msgstr "" +"\n" +"ビデオ通話" #: gajim/chat_control.py:1664 -#, fuzzy msgid "" "\n" "Voice Call" -msgstr "音声チャット" +msgstr "" +"\n" +"音声通話" #: gajim/chat_control.py:1666 -#, fuzzy msgid "_Reject" -msgstr "落胆" +msgstr "拒否 (_R)" #: gajim/chat_control.py:1692 gajim/gtk/filetransfer.py:297 msgid "File transfer stopped" @@ -1975,9 +1965,9 @@ msgid "Send File (max. %s MiB)…" msgstr "ファイルを送信 (最大. %s MiB)…" #: gajim/groupchat_control.py:497 -#, fuzzy, python-format +#, python-format msgid "%s has been invited to this group chat" -msgstr "{contact_jid} は既にこの談話室に招待されています" +msgstr "%s は既にこの談話室に招待されています" #: gajim/groupchat_control.py:512 gajim/dialog_messages.py:31 #: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238 @@ -1985,19 +1975,17 @@ msgid "Invalid XMPP Address" msgstr "XMPP アドレスが正しくありません" #: gajim/groupchat_control.py:575 -#, fuzzy msgid "Loading avatar failed" -msgstr "私信の送信に失敗しました" +msgstr "アバターの読込みに失敗しました" #: gajim/groupchat_control.py:595 -#, fuzzy, python-format +#, python-format msgid "Avatar upload failed: %s" -msgstr "アバターのアップロードに失敗しました" +msgstr "アバターのアップロードに失敗しました: %s" #: gajim/groupchat_control.py:598 -#, fuzzy msgid "Avatar upload successful" -msgstr "アバターのアップロードに失敗しました" +msgstr "アバターのアップロードに成功しました" #: gajim/groupchat_control.py:616 #, python-format @@ -2605,9 +2593,8 @@ msgid "Allow a participant to send you public or private messages" msgstr "参加者がメッセージ (私信も含む) を送ってくることを許可します" #: gajim/command_system/implementation/standard.py:432 -#, fuzzy msgid "Unknown nickname" -msgstr "新しいニックネームを入力してください" +msgstr "不明のニックネーム" #: gajim/command_system/implementation/custom.py:114 msgid "The same as using a doc-string, except it supports translation" @@ -2631,7 +2618,7 @@ msgstr "未知の SSL エラー: '%s'" #: gajim/gtk/avatar_selector.py:84 msgid "Select a picture or drop it here" -msgstr "" +msgstr "画像を選択するかここにドロップ" #: gajim/gtk/status_change.py:62 gajim/gtk/preferences.py:627 #: gajim/gtk/preferences.py:655 @@ -2639,19 +2626,17 @@ msgid "Status Message" msgstr "状況メッセージ" #: gajim/gtk/status_change.py:330 -#, fuzzy msgid "No activity" -msgstr "動向:" +msgstr "動向なし" #: gajim/gtk/status_change.py:370 gajim/gtk/status_change.py:383 #: gajim/gtk/status_change.py:488 -#, fuzzy msgid "No mood selected" -msgstr "鍵が選択されていません" +msgstr "気分が選択されていません" #: gajim/gtk/status_change.py:382 msgid "No mood" -msgstr "" +msgstr "気分なし" #: gajim/gtk/status_change.py:439 msgid "Overwrite" @@ -2746,12 +2731,10 @@ msgid "Single window for everything" msgstr "すべてをひとつのウィンドウ" #: gajim/gtk/preferences.py:188 -#, fuzzy msgid "Detached contact list with chats grouped by account" msgstr "相手先一覧は別ウィンドウ、チャットはアカウントでまとめたウィンドウ" #: gajim/gtk/preferences.py:189 -#, fuzzy msgid "Detached contact list with chats grouped by type" msgstr "相手先一覧は別ウィンドウ、チャットは種類でまとめたウィンドウ" @@ -2766,9 +2749,8 @@ msgstr "しない" # 起動時に名簿を表示するか #: gajim/gtk/preferences.py:195 -#, fuzzy msgid "Restore last state" -msgstr "以前の状態" +msgstr "以前の状態を復元" # (Mako)subscription #: gajim/gtk/preferences.py:199 @@ -2788,198 +2770,168 @@ msgid "Right" msgstr "右" #: gajim/gtk/preferences.py:207 -#, fuzzy msgid "Window Layout" -msgstr "ウィンドウの配置 (_W)" +msgstr "ウィンドウの配置" #: gajim/gtk/preferences.py:214 -#, fuzzy msgid "Contact List on Startup" -msgstr "起動時に相手先一覧を表示する (_S)" +msgstr "起動時に相手先一覧を表示する" #: gajim/gtk/preferences.py:218 -#, fuzzy msgid "Show contact list when starting Gajim" -msgstr "起動時に相手先一覧を表示する (_S)" +msgstr "起動時に相手先一覧を表示する" #: gajim/gtk/preferences.py:221 -#, fuzzy msgid "Quit on Close" -msgstr "閉じるボタンで最小化" +msgstr "閉じるボタンで終了" #: gajim/gtk/preferences.py:224 -#, fuzzy msgid "Quit when closing contact list" -msgstr "相手先一覧を閉じると Gajim を終了する (_Q)" +msgstr "相手先一覧を閉じると Gajim を終了する" #: gajim/gtk/preferences.py:227 -#, fuzzy msgid "Tab Position" -msgstr "役職" +msgstr "タブの位置" #: gajim/gtk/preferences.py:231 -#, fuzzy msgid "Placement of chat window tabs" -msgstr "さんはチャットウインドウを閉じました" +msgstr "チャットウインドウのタブの位置" #: gajim/gtk/preferences.py:247 msgid "Merge Accounts" msgstr "アカウントを統合" #: gajim/gtk/preferences.py:253 -#, fuzzy msgid "Enable Metacontacts" -msgstr "メタ相手先を作成" +msgstr "メタ相手先を有効化" #: gajim/gtk/preferences.py:258 -#, fuzzy msgid "Show Avatars" -msgstr "特徴を表示 (_U)" +msgstr "アバターを表示" #: gajim/gtk/preferences.py:264 gajim/gtk/preferences.py:353 -#, fuzzy msgid "Show Status Message" -msgstr "状況メッセージ" +msgstr "状況メッセージを表示" #: gajim/gtk/preferences.py:270 gajim/gtk/preferences.py:411 -#, fuzzy msgid "Sort Contacts by Status" msgstr "相手先を在席状況順に並べる" #: gajim/gtk/preferences.py:276 -#, fuzzy msgid "Show Mood" -msgstr "気分の設定" +msgstr "気分を表示" #: gajim/gtk/preferences.py:281 -#, fuzzy msgid "Show Activity" -msgstr "動向の設定" +msgstr "動向を表示" #: gajim/gtk/preferences.py:286 -#, fuzzy msgid "Show Tune" -msgstr "特徴を表示 (_U)" +msgstr "楽曲名を表示" #: gajim/gtk/preferences.py:323 msgid "Needs gspell to be installed" -msgstr "" +msgstr "gspell がインストールされていることが必要です" #: gajim/gtk/preferences.py:327 -#, fuzzy msgid "Spell Checking" -msgstr "スペルチェッカー" +msgstr "スペルチェック" #: gajim/gtk/preferences.py:335 -#, fuzzy msgid "Message Receipts (✔)" -msgstr "メッセージ受領 (✔) を表示する" +msgstr "メッセージ受領 (✔)" #: gajim/gtk/preferences.py:338 msgid "Add a checkmark to received messages" -msgstr "" +msgstr "受信メッセージにチェックマークを付ける" #: gajim/gtk/preferences.py:341 -#, fuzzy msgid "XHTML Formatting" -msgstr "XHTML 形式を表示する (_S)" +msgstr "XHTML 形式" #: gajim/gtk/preferences.py:344 msgid "Render XHTML styles (colors, etc.) of incoming messages" -msgstr "" +msgstr "受信メッセージを XHTML 形式(色など)で整形" #: gajim/gtk/preferences.py:348 -#, fuzzy msgid "Show Send Message Button" -msgstr "メッセージを送信する" +msgstr "メッセージ送信ボタンを表示" #: gajim/gtk/preferences.py:358 -#, fuzzy msgid "Show Chat State In Tabs" msgstr "チャット状態をタブに表示する" #: gajim/gtk/preferences.py:361 msgid "Show the contact’s chat state (e.g. typing) in the chat’s tab" -msgstr "" +msgstr "チャットのタブに相手先のチャット状態(タイピングなど)を表示" #: gajim/gtk/preferences.py:365 -#, fuzzy msgid "Show Chat State In Banner" msgstr "チャット状態をバナーに表示する" #: gajim/gtk/preferences.py:368 msgid "Show the contact’s chat state (e.g. typing) in the chats tab’s banner" -msgstr "" +msgstr "チャットのタブのバナーに相手先のチャット状態(タイピングなど)を表示" #: gajim/gtk/preferences.py:372 -#, fuzzy msgid "Display Chat State In Contact List" -msgstr "チャット状態通知を表示する (_D)" +msgstr "チャット状態通知を相手先一覧に表示する" #: gajim/gtk/preferences.py:375 -#, fuzzy msgid "Show the contact’s chat state (e.g. typing) in the contact list" -msgstr "チャット状態を相手先一覧に表示する" +msgstr "チャット状態(タイピングなど)を相手先一覧に表示する" #: gajim/gtk/preferences.py:406 -#, fuzzy msgid "Show Subject" -msgstr "題" +msgstr "題を表示する" #: gajim/gtk/preferences.py:417 msgid "Default Sync Threshold" msgstr "デフォルトの同期の制限値" #: gajim/gtk/preferences.py:420 -#, fuzzy msgid "Default for new public group chats" -msgstr "新しい談話室を作成" +msgstr "デフォルトの公開談話室" #: gajim/gtk/preferences.py:424 -#, fuzzy msgid "Show Joined / Left" msgstr "入室/退出を表示" #: gajim/gtk/preferences.py:427 gajim/gtk/preferences.py:438 -#, fuzzy msgid "Default for new group chats" -msgstr "新しい談話室を作成" +msgstr "デフォルトの新しい談話室" # (Mako)あえて訳さない #: gajim/gtk/preferences.py:428 gajim/gtk/preferences.py:439 #: gajim/gtk/accounts.py:715 gajim/gtk/accounts.py:727 #: gajim/gtk/accounts.py:740 -#, fuzzy msgid "Reset" -msgstr "Presets" +msgstr "リセット" #: gajim/gtk/preferences.py:429 gajim/gtk/preferences.py:440 #: gajim/gtk/accounts.py:728 msgid "Reset all group chats to the current default value" -msgstr "" +msgstr "すべての談話室を現在のデフォルト値にリセット" #: gajim/gtk/preferences.py:435 gajim/gtk/groupchat_settings.py:48 msgid "Show Status Changes" msgstr "状況変更を表示" #: gajim/gtk/preferences.py:468 -#, fuzzy msgid "Hide icon" -msgstr "このメニューを表示しない" +msgstr "アイコンを隠す" #: gajim/gtk/preferences.py:469 -#, fuzzy msgid "Only show for pending events" -msgstr "保留イベントがあるときだけ" +msgstr "保留イベントがあるときだけ表示" #: gajim/gtk/preferences.py:470 msgid "Always show icon" -msgstr "" +msgstr "常にアイコンを表示" #: gajim/gtk/preferences.py:475 -#, fuzzy msgid "Notification Area Icon" -msgstr "通知エリアのアイコンを表示する (_N)" +msgstr "通知エリアのアイコン" #: gajim/gtk/preferences.py:482 #, fuzzy @@ -2993,80 +2945,70 @@ msgstr "" "「オンライン」と「チャットできます」の相手先のみを相手先一覧に表示します。" #: gajim/gtk/preferences.py:489 gajim/gtk/preferences.py:512 -#, fuzzy msgid "Show Notifications" -msgstr "通知" +msgstr "通知を表示" #: gajim/gtk/preferences.py:517 -#, fuzzy msgid "Notifications When Away" -msgstr "通知" +msgstr "離席のときも通知" #: gajim/gtk/preferences.py:520 -#, fuzzy msgid "Show notifications even if you are Away, Busy, etc." -msgstr "通知エリアのアイコンを表示する (_N)" +msgstr "離席中、取り込み中などのとき、通知を表示する" #: gajim/gtk/preferences.py:525 gajim/data/gui/preferences.ui:271 msgid "Notifications" msgstr "通知" #: gajim/gtk/preferences.py:534 -#, fuzzy msgid "Play Sounds" msgstr "サウンドを鳴らす" #: gajim/gtk/preferences.py:537 msgid "Play sounds to notify about events" -msgstr "" +msgstr "イベントの通知にサウンドを鳴らす" #: gajim/gtk/preferences.py:542 msgid "Sounds When Away" -msgstr "" +msgstr "離席中でもサウンドを鳴らす" #: gajim/gtk/preferences.py:545 -#, fuzzy msgid "Play sounds even when you are Away, Busy, etc." -msgstr "取り込み中でもサウンドを鳴らします。" +msgstr "離席中や取り込み中でもサウンドを鳴らします。" # (Mako)"Ask status message when I:" に続く語 #: gajim/gtk/preferences.py:560 -#, fuzzy msgid "Sign In" -msgstr "サインインしたとき (_I)" +msgstr "サインインしたとき" # (Mako)"Ask status message when I:" に続く語 #: gajim/gtk/preferences.py:565 -#, fuzzy msgid "Sign Out" -msgstr "サインアウトしたとき (_O)" +msgstr "サインアウトしたとき" #: gajim/gtk/preferences.py:570 -#, fuzzy msgid "Status Change" -msgstr "状況変更を表示" +msgstr "状況変更" #: gajim/gtk/preferences.py:583 gajim/gtk/preferences.py:614 -#, fuzzy msgid "Auto Away" -msgstr "離席中" +msgstr "自動で離席中" #: gajim/gtk/preferences.py:585 msgid "Change your status to 'Away' after a certain amount of time" -msgstr "" +msgstr "一定時間後、在席状況を'離席中'に変える" #: gajim/gtk/preferences.py:590 gajim/gtk/preferences.py:642 -#, fuzzy msgid "Auto Not Available" -msgstr "不在" +msgstr "自動で不在" #: gajim/gtk/preferences.py:592 msgid "Change your status to 'Not Available' after a certain amount of time" -msgstr "" +msgstr "一定時間後、在席状況を'不在'に変える" #: gajim/gtk/preferences.py:619 msgid "Time Until Away" -msgstr "" +msgstr "離席中にするまでの時間" #: gajim/gtk/preferences.py:622 gajim/gtk/preferences.py:650 #, fuzzy @@ -3074,19 +3016,16 @@ msgid "Minutes until your status gets changed" msgstr "状況変更を表示" #: gajim/gtk/preferences.py:633 gajim/gtk/preferences.py:828 -#, fuzzy msgid "Auto Away Settings" -msgstr "談話室の設定" +msgstr "自動離席の設定" #: gajim/gtk/preferences.py:647 -#, fuzzy msgid "Time Until Not Available" -msgstr "不在" +msgstr "不在とするまでの時間" #: gajim/gtk/preferences.py:661 -#, fuzzy msgid "Auto Extended Away Settings" -msgstr "長時間不在です" +msgstr "自動長時間離席の設定" #: gajim/gtk/preferences.py:672 gajim/gtk/accounts.py:680 msgid "Enabled" @@ -3097,109 +3036,96 @@ msgid "System" msgstr "システム" #: gajim/gtk/preferences.py:678 -#, fuzzy msgid "Dark Theme" -msgstr "ダークテーマ (_D)" +msgstr "ダークテーマ" #: gajim/gtk/preferences.py:685 -#, fuzzy msgid "Theme" msgstr "テーマ" #: gajim/gtk/preferences.py:731 -#, fuzzy msgid "Convert ASCII Emojis" -msgstr "ASCII 感情アイコンを変換 (_C)" +msgstr "ASCII 絵文字を変換" #: gajim/gtk/preferences.py:734 msgid "Typing short codes like :-) will display emojis" -msgstr "" +msgstr ":-) などのショートコード入力を絵文字で表示" #: gajim/gtk/preferences.py:741 -#, fuzzy msgid "Emoji Theme" -msgstr "絵文字テーマ (_E)" +msgstr "絵文字テーマ" #: gajim/gtk/preferences.py:744 msgid "Choose from various emoji styles" -msgstr "" +msgstr "絵文字のスタイルを選択" #: gajim/gtk/preferences.py:774 -#, fuzzy msgid "Status Icon Set" -msgstr "状況アイコンセット (_S)" +msgstr "状況アイコンセット" #: gajim/gtk/preferences.py:781 -#, fuzzy msgid "Use Transport Icons" -msgstr "中継先のアイコンを使う (_I)" +msgstr "中継先のアイコンを使う" #: gajim/gtk/preferences.py:784 msgid "Display protocol-specific status icons (ICQ, ..)" -msgstr "" +msgstr "プロトコル固有のアイコン(ICQなど)を表示" #: gajim/gtk/preferences.py:801 gajim/gtk/preferences.py:817 -#, fuzzy msgid "Use Stun Server" -msgstr "サーバーの一覧" +msgstr "STUN サーバーを使う" #: gajim/gtk/preferences.py:803 msgid "Helps to establish calls through firewalls" msgstr "" #: gajim/gtk/preferences.py:822 -#, fuzzy msgid "STUN Server" -msgstr "STUN サーバー (_N)" +msgstr "STUN サーバー" #: gajim/gtk/preferences.py:848 -#, fuzzy msgid "Audio Input Device" -msgstr "音声入力デバイス (_A)" +msgstr "音声入力デバイス" #: gajim/gtk/preferences.py:851 msgid "Select your audio input (e.g. microphone)" -msgstr "" +msgstr "音声入力(たとえばマイク)を選択" #: gajim/gtk/preferences.py:855 -#, fuzzy msgid "Audio Output Device" -msgstr "音声出力デバイス (_U)" +msgstr "音声出力デバイス" #: gajim/gtk/preferences.py:858 msgid "Select an audio output (e.g. speakers, headphones)" -msgstr "" +msgstr "音声出力(たとえばスピーカー、ヘッドホン)を選択" #: gajim/gtk/preferences.py:890 gajim/gtk/preferences.py:898 msgid "Default" msgstr "デフォルト" #: gajim/gtk/preferences.py:906 -#, fuzzy msgid "Video Input Device" -msgstr "ビデオ入力デバイス (_V)" +msgstr "ビデオ入力デバイス" #: gajim/gtk/preferences.py:910 msgid "Select your video input device (e.g. webcam, screen capture)" -msgstr "" +msgstr "ビデオ入力デバイス(たとえばウェブカメラ、スクリーンキャプチャ)を選択" #: gajim/gtk/preferences.py:915 -#, fuzzy msgid "Video Framerate" -msgstr "ビデオのフレームレート (_F)" +msgstr "ビデオのフレームレート" #: gajim/gtk/preferences.py:921 -#, fuzzy msgid "Video Resolution" -msgstr "ビデオ会話" +msgstr "ビデオ解像度" #: gajim/gtk/preferences.py:927 msgid "Show My Video Stream" -msgstr "" +msgstr "自分のビデオストリームを表示" #: gajim/gtk/preferences.py:930 msgid "Show your own video stream in calls" -msgstr "" +msgstr "通話での自分のビデオストリームを表示" #: gajim/gtk/preferences.py:933 gajim/data/gui/video_preview.ui:51 msgid "Live Preview" @@ -3210,9 +3136,8 @@ msgid "Show a live preview to test your video source" msgstr "" #: gajim/gtk/preferences.py:975 -#, fuzzy msgid "Global Proxy" -msgstr "全体ののプロキシ (_G)" +msgstr "全体のプロキシ" #: gajim/gtk/preferences.py:980 gajim/gtk/account_wizard.py:732 #: gajim/gtk/accounts.py:790 @@ -3221,19 +3146,19 @@ msgstr "プロキシなし" #: gajim/gtk/preferences.py:985 msgid "Use System Keyring" -msgstr "" +msgstr "システムの鍵束を使用" #: gajim/gtk/preferences.py:988 msgid "Use your system’s keyring to store passwords" -msgstr "" +msgstr "パスワードの保存にシステムの鍵束を使用します" #: gajim/gtk/preferences.py:994 msgid "Check For Updates" -msgstr "" +msgstr "更新をチェック" #: gajim/gtk/preferences.py:997 gajim/common/config.py:241 msgid "Check for Gajim updates periodically" -msgstr "" +msgstr "定期的に Gajim の更新をチェックします" #: gajim/gtk/preferences.py:1033 #, fuzzy @@ -3248,13 +3173,13 @@ msgstr "メッセージを書いてください…" #: gajim/gtk/settings.py:784 gajim/gtk/settings.py:793 #: gajim/gtk/settings.py:802 gajim/gtk/settings.py:811 msgid "?switch:On" -msgstr "" +msgstr "オン" #: gajim/gtk/settings.py:400 gajim/gtk/settings.py:758 #: gajim/gtk/settings.py:784 gajim/gtk/settings.py:793 #: gajim/gtk/settings.py:802 gajim/gtk/settings.py:811 msgid "?switch:Off" -msgstr "" +msgstr "オフ" #: gajim/gtk/settings.py:538 gajim/gtk/manage_sounds.py:46 #: gajim/gtk/filechoosers.py:89 gajim/gtk/filechoosers.py:140 @@ -3443,7 +3368,7 @@ msgstr "開く" #: gajim/gtk/notification.py:209 msgid "Mark as Read" -msgstr "" +msgstr "既読としてマーク" #: gajim/gtk/notification.py:273 msgid "New E-mail" @@ -3454,13 +3379,12 @@ msgid "OpenGL accelerated" msgstr "OpenGL 高速化" #: gajim/gtk/video_preview.py:120 -#, fuzzy msgid "Not accelerated" msgstr "非高速化" #: gajim/gtk/video_preview.py:127 msgid "Something went wrong. Video feature disabled." -msgstr "" +msgstr "うまくいきませんでした。ビデオ機能が無効です。" #: gajim/gtk/groupchat_invite.py:304 msgid "Invite New Contact" @@ -3648,9 +3572,8 @@ msgid "Remove Setting" msgstr "設定を削除" #: gajim/gtk/filetransfer_progress.py:62 -#, fuzzy msgid "Upload Failed" -msgstr "ファイルをアップロード…" +msgstr "アップロードに失敗しました" #: gajim/gtk/filetransfer_progress.py:113 #, python-format @@ -3698,9 +3621,8 @@ msgid "You cannot add yourself to your contact list." msgstr "自分自身を相手先一覧に追加することはできません。" #: gajim/gtk/add_contact.py:305 -#, fuzzy msgid "Account Offline" -msgstr "オフライン" +msgstr "オフラインのアカウント" #: gajim/gtk/add_contact.py:306 msgid "Your account must be online to add new contacts." @@ -3838,9 +3760,8 @@ msgid "Advanced settings" msgstr "詳細設定" #: gajim/gtk/account_wizard.py:774 -#, fuzzy msgid "Invalid domain name" -msgstr "アカウント名が正しくありません" +msgstr "ドメイン名が正しくありません" #: gajim/gtk/account_wizard.py:791 msgid "Must be a port number" @@ -3880,11 +3801,12 @@ msgid "Account has been added successfully" msgstr "アカウントは無事に追加されました" #: gajim/gtk/groupchat_invitation.py:57 -#, fuzzy msgid "" "has invited you to a group chat.\n" "Do you want to join?" -msgstr "理由を添えて、談話室に招待します" +msgstr "" +"談話室に招待されました。\n" +"参加しますか?" #: gajim/gtk/groupchat_invitation.py:75 gajim/gtk/discovery.py:1706 #: gajim/gtk/groupchat_join.py:68 gajim/data/gui/groupchat_control.ui:899 @@ -4262,14 +4184,14 @@ msgid "You have to be connected to create a group chat." msgstr "談話室を作成するには、接続されている必要があります。" #: gajim/gtk/status_selector.py:121 gajim/gtk/status_selector.py:127 -#, fuzzy, python-format +#, python-format msgid "Status: %s" -msgstr "在席状況: " +msgstr "在席状況: %s" #: gajim/gtk/status_selector.py:125 -#, fuzzy, python-format +#, python-format msgid "%s (desynced)" -msgstr "不揃い" +msgstr "%s (不揃い)" #: gajim/gtk/subscription_request.py:35 msgid "Subscription Request" @@ -4593,7 +4515,6 @@ msgid "Minimize When Joining Automatically" msgstr "自動参加して最小化" #: gajim/gtk/groupchat_settings.py:68 -#, fuzzy msgid "Send Chat State" msgstr "チャット状態を送信" @@ -4615,9 +4536,8 @@ msgid "Manage Proxies" msgstr "プロキシを管理" #: gajim/gtk/manage_sounds.py:40 -#, fuzzy msgid "Manage Sounds" -msgstr "サウンドの管理" +msgstr "サウンドを管理" #: gajim/gtk/manage_sounds.py:51 msgid "Wav Sounds" @@ -4766,9 +4686,8 @@ msgid "Messages are archived on the server" msgstr "メッセージはサーバーに記録されます" #: gajim/gtk/groupchat_info.py:205 -#, fuzzy msgid "Website" -msgstr "ウェブサイトを開く" +msgstr "ウェブサイト" #: gajim/gtk/accounts.py:122 msgid "Re-Login" @@ -4858,14 +4777,11 @@ msgstr "すべてのアカウントの在席状況を同期します" #: gajim/gtk/accounts.py:648 msgid "Remember Last Status" -msgstr "" +msgstr "最後の状態を記憶" #: gajim/gtk/accounts.py:650 -#, fuzzy msgid "Restore status and status message of your last session" -msgstr "" -"チェックをつけると、最後のセッションで用いられた状況と状況メッセージを復元し" -"ます" +msgstr "最後のセッションで用いられた状況と状況メッセージを復元します" #: gajim/gtk/accounts.py:653 msgid "Use file transfer proxies" @@ -4879,29 +4795,25 @@ msgstr "しない" #: gajim/gtk/accounts.py:671 gajim/common/const.py:1110 msgid "1 Day" -msgstr "" +msgstr "1日" #: gajim/gtk/accounts.py:672 gajim/common/const.py:1112 msgid "1 Week" -msgstr "" +msgstr "1週間" #: gajim/gtk/accounts.py:673 gajim/common/const.py:1113 -#, fuzzy msgid "1 Month" msgstr "1か月" #: gajim/gtk/accounts.py:674 -#, fuzzy msgid "3 Months" -msgstr "1か月" +msgstr "3か月" #: gajim/gtk/accounts.py:675 -#, fuzzy msgid "6 Months" -msgstr "1か月" +msgstr "6か月" #: gajim/gtk/accounts.py:676 -#, fuzzy msgid "1 Year" msgstr "1年" @@ -4939,42 +4851,36 @@ msgid "Ignore everything from contacts not in your Roster" msgstr "相手先一覧にない相手先からのすべてを無視します" #: gajim/gtk/accounts.py:705 -#, fuzzy msgid "Send Message Receipts" -msgstr "注目メッセージを受信した" +msgstr "メッセージ受領を送信" #: gajim/gtk/accounts.py:707 msgid "Tell your contacts if you received a message" msgstr "" #: gajim/gtk/accounts.py:713 -#, fuzzy msgid "Default for chats" -msgstr "チャットできます" +msgstr "チャットのデフォルト" #: gajim/gtk/accounts.py:716 gajim/gtk/accounts.py:741 msgid "Reset all chats to the current default value" msgstr "" #: gajim/gtk/accounts.py:722 -#, fuzzy msgid "Send Chatstate in Group Chats" -msgstr "談話室への参加に失敗しました" +msgstr "談話室にチャット状態を送信" #: gajim/gtk/accounts.py:725 -#, fuzzy msgid "Default for group chats" -msgstr "談話室を閉鎖" +msgstr "談話室のデフォルト" #: gajim/gtk/accounts.py:739 -#, fuzzy msgid "Default for chats and private group chats" -msgstr "%s が談話室に参加しました" +msgstr "チャットと非公開談話室のデフォルト" #: gajim/gtk/accounts.py:747 -#, fuzzy msgid "Keep Chat History" -msgstr "会話の履歴" +msgstr "会話の履歴を保持" #: gajim/gtk/accounts.py:751 msgid "How long Gajim should keep your chat history" @@ -5003,25 +4909,20 @@ msgid "Priority" msgstr "優先順位" #: gajim/gtk/accounts.py:804 -#, fuzzy msgid "Use Unencrypted Connection" -msgstr "安全でない接続" +msgstr "暗号化されていない接続を使う" #: gajim/gtk/accounts.py:806 gajim/common/config.py:273 msgid "Use an unencrypted connection to the server" msgstr "サーバーに非暗号化接続を用います" #: gajim/gtk/accounts.py:808 -#, fuzzy msgid "Confirm Unencrypted Connection" -msgstr "安全でない接続" +msgstr "暗号化されていない接続を確認" #: gajim/gtk/accounts.py:811 -#, fuzzy msgid "Show a confirmation dialog before connecting unencrypted" -msgstr "" -"相手先の遮断の確認のダイアログを表示するかどうか。空文字ならダイアログを表示" -"しません。" +msgstr "暗号されていない接続の前に確認のダイアログを表示する" #: gajim/gtk/accounts.py:835 gajim/data/gui/zeroconf_information_window.ui:8 #: gajim/data/gui/vcard_information_window.ui:8 @@ -5031,7 +4932,7 @@ msgstr "相手先の情報" #: gajim/gtk/accounts.py:837 msgid "Request contact information (Mood, Activity, Tune, Location)" -msgstr "" +msgstr "相手先情報を要求(気分、動向、楽曲、位置)" #: gajim/gtk/accounts.py:840 #, fuzzy @@ -5043,26 +4944,20 @@ msgid "Automatically accept all contact requests" msgstr "" #: gajim/gtk/accounts.py:844 -#, fuzzy msgid "Filetransfer Preference" -msgstr "ファイル転送のエラー" +msgstr "ファイル転送の設定" #: gajim/gtk/accounts.py:846 -#, fuzzy msgid "Upload Files" -msgstr "ファイルをアップロード…" +msgstr "ファイルをアップロード" #: gajim/gtk/accounts.py:847 -#, fuzzy msgid "Send Files Directly" -msgstr "直接ファイルを送信…" +msgstr "直接ファイルを送信" #: gajim/gtk/accounts.py:848 -#, fuzzy msgid "Preferred file transfer mechanism for file drag&drop on a chat window" -msgstr "" -"チャットウィンドウへのファイルのドラッグアンドドロップで用いられる転送方" -"法。'httpupload' (デフォルト)または 'jingle'。" +msgstr "チャットウィンドウへのファイルのドラッグアンドドロップで用いられる転送方法" #: gajim/gtk/accounts.py:867 msgid "Use environment variable" @@ -5559,9 +5454,8 @@ msgid "Birthday" msgstr "誕生日" #: gajim/gtk/profile.py:30 gajim/gtk/vcard_grid.py:36 -#, fuzzy msgid "Gender" -msgstr "送信者: " +msgstr "性別" #: gajim/gtk/profile.py:31 gajim/data/gui/groupchat_info_scrolled.ui:16 msgid "Address" @@ -5575,21 +5469,19 @@ msgstr "電話番号" #: gajim/gtk/profile.py:35 msgid "?profile:Organisation" -msgstr "" +msgstr "組織" #: gajim/gtk/profile.py:36 gajim/gtk/vcard_grid.py:41 msgid "?profile:Title" -msgstr "" +msgstr "役職" #: gajim/gtk/profile.py:37 gajim/gtk/vcard_grid.py:42 -#, fuzzy msgid "?profile:Role" -msgstr "プロフィール" +msgstr "役" #: gajim/gtk/profile.py:38 gajim/gtk/vcard_grid.py:45 -#, fuzzy msgid "URL" -msgstr "URL:" +msgstr "URL" #: gajim/gtk/profile.py:39 gajim/gtk/vcard_grid.py:46 #, fuzzy @@ -5670,24 +5562,20 @@ msgid "Registration failed" msgstr "登録に失敗しました" #: gajim/gtk/vcard_grid.py:37 -#, fuzzy msgid "?profile:Address" -msgstr "アドレス" +msgstr "住所" #: gajim/gtk/vcard_grid.py:40 -#, fuzzy msgid "IM Address" -msgstr "アドレス" +msgstr "IM アドレス" #: gajim/gtk/vcard_grid.py:43 -#, fuzzy msgid "Organisation" -msgstr "組織 (O)" +msgstr "組織" #: gajim/gtk/vcard_grid.py:44 -#, fuzzy msgid "?profile:Note" -msgstr "プロフィール" +msgstr "註記" #: gajim/gtk/vcard_grid.py:51 msgid "Your public key or authentication certificate" @@ -5695,7 +5583,7 @@ msgstr "" #: gajim/gtk/vcard_grid.py:59 msgid "Post Office Box" -msgstr "" +msgstr "私書箱" #: gajim/gtk/vcard_grid.py:60 gajim/data/gui/vcard_information_window.ui:489 #: gajim/data/gui/vcard_information_window.ui:1179 @@ -5703,7 +5591,6 @@ msgid "Street" msgstr "町丁名・番地" #: gajim/gtk/vcard_grid.py:61 -#, fuzzy msgid "Extended Address" msgstr "建物名など" @@ -5729,25 +5616,23 @@ msgstr "国" #: gajim/gtk/vcard_grid.py:111 msgid "Male" -msgstr "" +msgstr "男性" #: gajim/gtk/vcard_grid.py:112 msgid "Female" -msgstr "" +msgstr "女性" #: gajim/gtk/vcard_grid.py:113 msgid "?Gender:Other" -msgstr "" +msgstr "その他" #: gajim/gtk/vcard_grid.py:114 -#, fuzzy msgid "?Gender:None" -msgstr "送信者: " +msgstr "なし" #: gajim/gtk/vcard_grid.py:121 gajim/gtk/vcard_grid.py:428 -#, fuzzy msgid "Home" -msgstr "ホームページ" +msgstr "ホーム" #: gajim/gtk/vcard_grid.py:122 gajim/gtk/vcard_grid.py:429 #: gajim/data/gui/vcard_information_window.ui:1452 @@ -5755,9 +5640,8 @@ msgid "Work" msgstr "職業" #: gajim/gtk/vcard_grid.py:598 -#, fuzzy msgid "YYYY-MM-DD" -msgstr "書式: YYYY-MM-DD" +msgstr "YYYY-MM-DD" #: gajim/gtk/adhoc.py:91 msgid "Finish" @@ -5809,7 +5693,7 @@ msgid "%s configuration error" msgstr "%s 設定エラー" #: gajim/common/jingle_rtp.py:134 -#, fuzzy, python-format +#, python-format msgid "" "Couldn’t set up %(text)s. Check your configuration.\n" "Pipeline:\n" @@ -5818,10 +5702,8 @@ msgid "" "%(error)s" msgstr "" "%(text)s を設定できませんでした。設定を見直してください。\n" -"\n" "パイプライン:\n" "%(pipeline)s\n" -"\n" "エラー:\n" "%(error)s" @@ -5844,7 +5726,7 @@ msgstr "睡眠中" #: gajim/common/setting_values.py:301 msgid "ZZZZzzzzzZZZZZ" -msgstr "" +msgstr "ZZZZzzzzzZZZZZ" #: gajim/common/setting_values.py:306 gajim/common/config.py:357 msgid "Back soon" @@ -5860,7 +5742,6 @@ msgid "Eating" msgstr "食事" #: gajim/common/setting_values.py:310 -#, fuzzy msgid "I’m eating." msgstr "食事中です。" @@ -5869,7 +5750,6 @@ msgid "Movie" msgstr "映画" #: gajim/common/setting_values.py:315 -#, fuzzy msgid "I’m watching a movie." msgstr "ただいま映画鑑賞中です。" @@ -5879,7 +5759,6 @@ msgid "Working" msgstr "仕事中" #: gajim/common/setting_values.py:320 -#, fuzzy msgid "I’m working." msgstr "仕事中です。" @@ -5888,7 +5767,6 @@ msgid "Out" msgstr "外出中" #: gajim/common/setting_values.py:325 -#, fuzzy msgid "I’m out enjoying life." msgstr "出かけています。" @@ -6002,13 +5880,10 @@ msgid "If checked, Gajim can be controlled remotely using gajim-remote." msgstr "チェックをつけると、Gajim を gajim-remote を使って遠隔操作できます。" #: gajim/common/setting_values.py:413 -#, fuzzy msgid "" "When not printing time for every message ('print_time'==sometimes, print it " "every x minutes." -msgstr "" -"個々のメッセージに時刻を印すのではない場合 ('print_time'==sometimes (時々))、" -"時刻を印す時間間隔 (単位:分)。" +msgstr "個々のメッセージに時刻を印すのではない場合 ('print_time'==sometimes (時々))、時刻を印す時間間隔 (単位:分)。" #: gajim/common/setting_values.py:414 gajim/common/config.py:153 msgid "Ask before pasting an image." @@ -6723,7 +6598,7 @@ msgstr "「チャットを開始」ダイアログにヒントを表示します #: gajim/common/config.py:242 msgid "Date of the last update check" -msgstr "" +msgstr "最後の更新チェックの日時" #: gajim/common/config.py:260 msgid "" @@ -8007,10 +7882,9 @@ msgstr "" #: gajim/common/const.py:1111 msgid "2 Days" -msgstr "" +msgstr "2日" #: gajim/common/const.py:1114 -#, fuzzy msgid "No Threshold" msgstr "制限なし" @@ -8104,7 +7978,7 @@ msgstr "オンライン" #: gajim/common/modules/adhoc_commands.py:123 msgid "Extended away" -msgstr "長時間不在です" +msgstr "長時間離席です" #: gajim/common/modules/adhoc_commands.py:124 msgid "Do not disturb" @@ -8240,9 +8114,8 @@ msgid "Join Group Chat as…" msgstr "談話室に参加" #: gajim/data/gui/groupchat_nick_chooser.ui:66 -#, fuzzy msgid "Your Nickname" -msgstr "あなたのニックネーム:" +msgstr "あなたのニックネーム" #: gajim/data/gui/groupchat_control.ui:36 #, fuzzy @@ -8282,18 +8155,16 @@ msgid "Show a list of emojis (Alt+M)" msgstr "絵文字の一覧を表示する (Alt+M)" #: gajim/data/gui/groupchat_control.ui:454 gajim/data/gui/chat_control.ui:833 -#, fuzzy msgid "Send Message" -msgstr "メッセージを送信する" +msgstr "メッセージを送信" #: gajim/data/gui/groupchat_control.ui:583 msgid "Joining…" msgstr "参加中…" #: gajim/data/gui/groupchat_control.ui:641 -#, fuzzy msgid "Enter Nickname" -msgstr "ニックネームを挿入" +msgstr "ニックネームをにゅうりょくしてください" #: gajim/data/gui/groupchat_control.ui:691 #: gajim/data/gui/groupchat_control.ui:783 @@ -8306,9 +8177,8 @@ msgid "Change Subject" msgstr "談話室の題を変更" #: gajim/data/gui/groupchat_control.ui:864 -#, fuzzy msgid "Enter Password" -msgstr "新しいパスワードを入力してください:" +msgstr "パスワードを入力してください" #: gajim/data/gui/groupchat_control.ui:1081 #, fuzzy @@ -8320,22 +8190,18 @@ msgid "Gajim will not try to join this group chat again" msgstr "Gajim はもうこの談話室に参加しようとしません" #: gajim/data/gui/groupchat_control.ui:1102 -#, fuzzy msgid "T_ry Again" -msgstr "再試行 (_T)" +msgstr "再試行 (_R)" #: gajim/data/gui/groupchat_control.ui:1156 -#, fuzzy msgid "An Error Occurred" msgstr "エラーが発生しました" #: gajim/data/gui/groupchat_control.ui:1221 -#, fuzzy msgid "_Try Again" msgstr "再試行 (_T)" #: gajim/data/gui/groupchat_control.ui:1398 -#, fuzzy msgid "Kick Participant" msgstr "参加者を蹴り出す" @@ -8358,7 +8224,6 @@ msgid "Reason (optional)" msgstr "理由 (省略可)" #: gajim/data/gui/groupchat_control.ui:1524 -#, fuzzy msgid "Ban Participant" msgstr "参加者を締め出す" @@ -8367,9 +8232,8 @@ msgid "_Ban" msgstr "締め出し (_B)" #: gajim/data/gui/groupchat_control.ui:1650 -#, fuzzy msgid "Destroy This Chat" -msgstr "グループチャットを閉鎖" +msgstr "このチャットを閉鎖" #: gajim/data/gui/groupchat_control.ui:1688 msgid "_Destroy" @@ -8392,18 +8256,16 @@ msgid "Where participants should go" msgstr "" #: gajim/data/gui/groupchat_control.ui:1808 -#, fuzzy msgid "Rename This Chat" -msgstr "談話室から退出" +msgstr "このチャットの名前を変更" #: gajim/data/gui/groupchat_control.ui:1935 msgid "_Invite" msgstr "招待 (_I)" #: gajim/data/gui/groupchat_control.ui:2020 -#, fuzzy msgid "Settings for This Chat" -msgstr "このチャットの履歴を記録" +msgstr "このチャットの設定" #: gajim/data/gui/filetransfers.ui:21 msgid "Pa_use/Resume" @@ -8508,9 +8370,8 @@ msgstr "" "この中継先に接続してください。" #: gajim/data/gui/add_new_contact_window.ui:467 -#, fuzzy msgid "_Add" -msgstr "アドレス (_A)" +msgstr "追加 (_A)" #: gajim/data/gui/account_wizard.ui:16 gajim/data/gui/manage_proxies.ui:206 msgid "_Port" @@ -8867,12 +8728,11 @@ msgstr "" #: gajim/data/gui/profile.ui:179 msgid "Remove your profile picture" -msgstr "" +msgstr "プロフィール画像を削除" #: gajim/data/gui/profile.ui:198 -#, fuzzy msgid "Change your profile picture" -msgstr "ニックネームを変更する (Ctrl+N)" +msgstr "プロフィールの画像を変更" #: gajim/data/gui/profile.ui:229 msgid "" @@ -8880,14 +8740,12 @@ msgid "" msgstr "" #: gajim/data/gui/profile.ui:298 -#, fuzzy msgid "Add Entry" -msgstr "エントリー:" +msgstr "エントリーを追加" #: gajim/data/gui/profile.ui:410 -#, fuzzy msgid "Update" -msgstr "MOTD を更新…" +msgstr "更新" #: gajim/data/gui/manage_proxies.ui:12 msgctxt "proxy configuration" @@ -9214,9 +9072,8 @@ msgid "Close chat" msgstr "チャットを閉じる" #: gajim/data/gui/shortcuts_window.ui:312 -#, fuzzy msgid "Change Nickname" -msgstr "ニックネームを変更…" +msgstr "ニックネームを変更" #: gajim/data/gui/chat_control.ui:48 #, fuzzy @@ -9281,7 +9138,7 @@ msgstr "" #: gajim/data/gui/chat_control.ui:964 msgid "Microphone & Camera" -msgstr "" +msgstr "マイクとカメラ" #: gajim/data/gui/chat_control.ui:1047 msgid "End call" @@ -9548,16 +9405,14 @@ msgid "_Apply" msgstr "適用 (_A)" #: gajim/data/gui/preferences.ui:40 -#, fuzzy msgid "Behaviour of Windows & Tabs" -msgstr "ウィンドウをタブの配置" +msgstr "ウィンドウとタブの挙動" #: gajim/data/gui/preferences.ui:68 msgid "Contact List Appearance" msgstr "相手先一覧の外観" #: gajim/data/gui/preferences.ui:127 gajim/data/gui/preferences.ui:183 -#, fuzzy msgid "Chats" msgstr "チャット" @@ -9571,24 +9426,20 @@ msgstr "サウンド" # (Mako)語順が難しい #: gajim/data/gui/preferences.ui:303 -#, fuzzy msgid "Ask For Status Message on…" -msgstr "状況メッセージを求めるのは、私が" +msgstr "状況メッセージを求めるのは、私が…" #: gajim/data/gui/preferences.ui:331 -#, fuzzy msgid "Automatic Status Change" msgstr "在席状況の自動変更" #: gajim/data/gui/preferences.ui:419 -#, fuzzy msgid "Emoji" msgstr "絵文字" #: gajim/data/gui/preferences.ui:447 -#, fuzzy msgid "Status Icon" -msgstr "状況アイコンセット (_S)" +msgstr "状況アイコン" #: gajim/data/gui/preferences.ui:472 msgid "Style" @@ -9619,23 +9470,20 @@ msgid "Miscellaneous" msgstr "その他の設定" #: gajim/data/gui/preferences.ui:758 -#, fuzzy msgid "Reset Hints" -msgstr "ヒントをリセット (_R)" +msgstr "ヒントをリセット" #: gajim/data/gui/preferences.ui:762 msgid "This will reset all introduction hints" msgstr "" #: gajim/data/gui/preferences.ui:821 -#, fuzzy msgid "Advanced Configuration Editor… " -msgstr "詳細設定エディタ (ACE)" +msgstr "詳細設定エディタ (ACE)… " #: gajim/data/gui/preferences.ui:825 -#, fuzzy msgid "Please use these settings with caution!" -msgstr "注意: これらのオプションの取扱には注意してください。" +msgstr "これらのオプションの取扱には注意してください。" #: gajim/data/gui/server_info.ui:50 msgid "Server Software" @@ -9830,14 +9678,12 @@ msgid "Go" msgstr "移動" #: gajim/data/gui/status_change_window.ui:27 -#, fuzzy msgid "Change Status" msgstr "在席状況を変更する" #: gajim/data/gui/status_change_window.ui:56 -#, fuzzy msgid "Status Presets…" -msgstr "状況の事前設定" +msgstr "状況の事前設定…" #: gajim/data/gui/status_change_window.ui:72 msgid "Save this message as a preset" @@ -9852,24 +9698,20 @@ msgid "M_ood" msgstr "気分 (_O)" #: gajim/data/gui/status_change_window.ui:278 -#, fuzzy msgid "_Change Status" -msgstr "在席状況を変更する" +msgstr "在席状況を変更 (_C)" #: gajim/data/gui/status_change_window.ui:313 -#, fuzzy msgid "Activity" -msgstr "動向:" +msgstr "動向" #: gajim/data/gui/status_change_window.ui:326 -#, fuzzy msgid "_No Activity" -msgstr "動向:" +msgstr "動向なし (_N)" #: gajim/data/gui/status_change_window.ui:729 -#, fuzzy msgid "Mood" -msgstr "きまぐれ" +msgstr "気分" #: gajim/data/gui/groupchat_info_scrolled.ui:48 msgid "Topic" @@ -9888,9 +9730,8 @@ msgid "Group Chat Language" msgstr "談話室の言語" #: gajim/data/gui/groupchat_info_scrolled.ui:303 -#, fuzzy msgid "Copy Address" -msgstr "XMPP アドレスをコピー" +msgstr "アドレスをコピー" #: gajim/data/gui/emoji_chooser.ui:98 msgid "No Results Found" @@ -10067,9 +9908,8 @@ msgid "Subscription:" msgstr "在席通知の承認:" #: gajim/data/gui/advanced_configuration.ui:15 -#, fuzzy msgid "A restart may be required for some settings to take effect" -msgstr "設定を有効にするには Gajim を再起動してください" +msgstr "設定を有効にするには再起動が必要です" #: gajim/data/gui/advanced_configuration.ui:35 msgid "Type to search for values..." @@ -10133,13 +9973,12 @@ msgid "_Connect" msgstr "接続 (_C)" #: data/org.gajim.Gajim.desktop.in:5 -#, fuzzy msgid "XMPP Chat Client" -msgstr "XMPP IM クライアント" +msgstr "XMPP チャットクライアント" #: data/org.gajim.Gajim.desktop.in:6 data/org.gajim.Gajim.appdata.xml.in:8 msgid "A fully-featured XMPP chat client" -msgstr "" +msgstr "機能満載の XMPP チャットクライアント" #: data/org.gajim.Gajim.desktop.in:8 msgid "chat;messaging;im;xmpp;bonjour;voip;" @@ -10150,26 +9989,23 @@ msgid "Show next pending event" msgstr "次のの保留イベントを表示" #: data/org.gajim.Gajim.appdata.xml.in:10 -#, fuzzy msgid "" "Gajim aims to be an easy to use and fully-featured XMPP client. Just chat " "with your friends or family, easily share pictures and thoughts or discuss " "the news with your groups." msgstr "" -"友人や家族とチャットはもちろん、画像を送ったりグループで議論したりもできま" -"す。" +"Gajim は使いやすい機能満載の XMPP " +"クライアントとなることを目指しています。友人や家族とチャットはもちろん、画像を送ったりグループで議論したりもできます。" #: data/org.gajim.Gajim.appdata.xml.in:14 -#, fuzzy msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP." -msgstr "OMEMO または OpenPGP での端末間暗号化による安全なチャット" +msgstr "OMEMO または OpenPGP での端末間暗号化による安全なチャット。" #: data/org.gajim.Gajim.appdata.xml.in:15 -#, fuzzy msgid "" "Gajim integrates well with your other devices: simply continue conversations " "on your mobile device." -msgstr "Gajimは他のデバイスとよく連携します。モバイル端末で送受しても大丈夫。" +msgstr "Gajimは他のデバイスとよく連携します。モバイル端末でも会話が続きます。" #: data/org.gajim.Gajim.appdata.xml.in:17 msgid "Features:" @@ -10220,7 +10056,7 @@ msgstr "チャットウィンドウから直接 Wikipedia や辞書その他の #: data/org.gajim.Gajim.appdata.xml.in:29 msgid "" "Set your activity, tune, and mood to show your friends how you are feeling" -msgstr "友人にどうしているかを知らせるため、動向・聴いている楽曲・気分を設定" +msgstr "どうしているかを友人に知らせるため、動向・聴いている楽曲・気分を設定" #: data/org.gajim.Gajim.appdata.xml.in:30 msgid "Support for multiple accounts" @@ -10267,9 +10103,8 @@ msgid "Plugin manager" msgstr "プラグイン管理" #: data/org.gajim.Gajim.appdata.xml.in:61 -#, fuzzy msgid "Gajim Team" -msgstr "Gajim テーマ" +msgstr "Gajim チーム" #~ msgid "Chat Settings" #~ msgstr "チャットの設定" ===================================== po/zh_CN.po ===================================== @@ -11,10 +11,10 @@ msgstr "" "Project-Id-Version: Gajim\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-01 17:44+0100\n" -"PO-Revision-Date: 2021-01-01 16:03+0000\n" +"PO-Revision-Date: 2021-01-05 13:31+0000\n" "Last-Translator: dalek <sleepy(a)nixnet.email>\n" "Language-Team: Chinese (Simplified) <https://translate.gajim.org/projects/" -"gajim/master/zh_Hans/>\n" +"gajim/1-3/zh_Hans/>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -398,19 +398,16 @@ msgid "_Also remove all contacts of this group from contact list" msgstr "同时从联系人列表删除这个群组的所有联系人" #: gajim/roster_window.py:2864 gajim/roster_window.py:2865 -#, fuzzy msgid "Rename Group Chat" -msgstr "离开聊天室" +msgstr "重命名聊天室" #: gajim/roster_window.py:2866 -#, fuzzy msgid "Please enter a new name for this group chat" -msgstr "请在您本地账户填写新的用户名" +msgstr "请为聊天室输入新名称" #: gajim/roster_window.py:3082 -#, fuzzy msgid "Remove Contact" -msgstr "重命名联系人" +msgstr "移除联系人" #: gajim/roster_window.py:3083 #, fuzzy @@ -418,9 +415,9 @@ msgid "Remove contact from contact list" msgstr "从联系人列表删除联系人" #: gajim/roster_window.py:3084 -#, fuzzy, python-format +#, python-format msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n" -msgstr "您将从您的联系人列表中将 \"%(name)s\" (%(jid)s) 移除。\n" +msgstr "您将从您的联系人列表中将 %(name)s (%(jid)s) 移除。\n" #: gajim/roster_window.py:3093 gajim/roster_window.py:3113 #, fuzzy @@ -444,18 +441,20 @@ msgid "Remove contacts from contact list" msgstr "从联系人列表删除联系人" #: gajim/roster_window.py:3128 -#, fuzzy, python-format +#, python-format msgid "" "By removing the following contacts, you will also remove authorization. This " "means they will see you as offline:\n" "\n" "%s" -msgstr "删除此联系人的同时将删除认证，这将导致对方一直看到您为离线。" +msgstr "" +"删除此联系人的同时将删除认证，这将导致对方一直看到您为离线。\n" +"\n" +"%s" #: gajim/roster_window.py:3132 -#, fuzzy msgid "Remove Contacts" -msgstr "重命名联系人" +msgstr "删除联系人" #: gajim/roster_window.py:3761 #, fuzzy @@ -483,9 +482,8 @@ msgid "_Do not ask me again" msgstr "不再询问(_D)" #: gajim/roster_window.py:3772 gajim/data/gui/groupchat_creation.ui:317 -#, fuzzy msgid "_Create" -msgstr "创造" +msgstr "创建(_C)" #: gajim/roster_window.py:3889 msgid "Invalid file URI:" @@ -508,9 +506,9 @@ msgid "_Send" msgstr "发送(_S)" #: gajim/roster_window.py:4067 -#, fuzzy, python-format +#, python-format msgid "Send %(from)s to %(to)s" -msgstr "发送 %s 给 %s" +msgstr "发送 %(from)s 给 %(to)s" #: gajim/roster_window.py:4080 #, python-format @@ -614,7 +612,7 @@ msgstr "旁观者" #: gajim/roster_window.py:4948 msgid "Observers can see your status, but you are not allowed to see theirs" -msgstr "" +msgstr "旁观者能看见您的状态，但您不能看见他们的" #: gajim/privatechat_control.py:105 gajim/groupchat_control.py:1225 #, python-format @@ -638,7 +636,7 @@ msgstr "{nick} 现在状态是 {show}{status}" #: gajim/privatechat_control.py:199 msgid "Sending private message failed" -msgstr "发送私有消息失败" +msgstr "发送私聊消息失败" #: gajim/privatechat_control.py:201 #, python-format @@ -710,20 +708,17 @@ msgid "Do you accept this request (account: %s)?" msgstr "是否接受这个对账户 %s 的请求?" #: gajim/gui_interface.py:181 -#, fuzzy msgid "Authorization Request" -msgstr "授权发送成功" +msgstr "授权请求" #: gajim/gui_interface.py:182 -#, fuzzy msgid "HTTP Authorization Request" -msgstr "授权发送成功" +msgstr "HTTP 认证请求" #: gajim/gui_interface.py:185 gajim/gui_interface.py:376 #: gajim/gui_interface.py:2002 gajim/gtk/filetransfer.py:339 -#, fuzzy msgid "_No" -msgstr "No" +msgstr "否 (_N)" #: gajim/gui_interface.py:203 gajim/gtk/notification.py:189 #: gajim/gtk/notification.py:216 @@ -737,26 +732,25 @@ msgstr "发送 %(message)s 时出现错误( %(error)s )" #: gajim/gui_interface.py:324 gajim/gtk/notification.py:189 msgid "Subscription request" -msgstr "认证请求" +msgstr "订阅请求" #: gajim/gui_interface.py:359 msgid "Authorization accepted" msgstr "授权被接受" #: gajim/gui_interface.py:360 -#, fuzzy, python-format +#, python-format msgid "The contact \"%(jid)s\" has authorized you to see their status." -msgstr "联系人\"%s\"已授权您查看他/她的状态。" +msgstr "联系人\"%(jid)s\"已授权您查看他/她的状态。" #: gajim/gui_interface.py:370 -#, fuzzy msgid "Subscription Removed" -msgstr "认证请求" +msgstr "订阅已移除" #: gajim/gui_interface.py:371 -#, fuzzy, python-format +#, python-format msgid "%(name)s (%(jid)s) has removed subscription from you" -msgstr "联系人\"%s\"移除了对您的关注" +msgstr "%(name)s (%(jid)s) 移除了对您的关注" #: gajim/gui_interface.py:373 #, fuzzy @@ -769,17 +763,17 @@ msgstr "" #: gajim/gui_interface.py:398 gajim/gtk/notification.py:190 msgid "Unsubscribed" -msgstr "已取消认证的" +msgstr "已取消认证" #: gajim/gui_interface.py:410 #, python-format msgid "%(jid)s declined the invitation: %(reason)s" -msgstr "" +msgstr "%(jid)s 已拒绝邀请：%(reason)s" #: gajim/gui_interface.py:414 #, python-format msgid "%(jid)s declined the invitation" -msgstr "" +msgstr "%(jid)s 已接受邀请" #: gajim/gui_interface.py:431 gajim/chat_control.py:1606 #: gajim/gtk/notification.py:188 gajim/gtk/notification.py:214 @@ -789,14 +783,13 @@ msgid "Group Chat Invitation" msgstr "聊天室邀请" #: gajim/gui_interface.py:432 -#, fuzzy, python-format +#, python-format msgid "%(contact)s invited you to %(chat)s" -msgstr "$Contact 邀请您参加聊天室 %(room_jid)s" +msgstr "%(contact)s 邀请您加入 %(chat)s" #: gajim/gui_interface.py:453 -#, fuzzy msgid "Certificate Passphrase Required" -msgstr "证书已过期" +msgstr "认证请求" #: gajim/gui_interface.py:454 #, python-format @@ -860,14 +853,13 @@ msgid "File Transfer Stopped" msgstr "文件传输已停止" #: gajim/gui_interface.py:746 -#, fuzzy msgid "File Transfer Failed" -msgstr "文件传输完毕" +msgstr "文件传输失败" #: gajim/gui_interface.py:769 -#, fuzzy, python-format +#, python-format msgid "%(filename)s received from %(name)s." -msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。" +msgstr "已接受来自 %(name)s 的文件 %(filename)s 。" #: gajim/gui_interface.py:774 #, python-format @@ -875,14 +867,14 @@ msgid "File transfer of %(filename)s from %(name)s stopped." msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。" #: gajim/gui_interface.py:780 -#, fuzzy, python-format +#, python-format msgid "File transfer of %(filename)s from %(name)s failed." -msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。" +msgstr "账户 %(name)s 接收文件 %(filename)s 失败。" #: gajim/gui_interface.py:795 #, python-format msgid "You successfully sent %(filename)s to %(name)s." -msgstr "您成功的给 %(name)s 发送了文件 %(filename)s。" +msgstr "您已成功发送文件%(filename)s 给 %(name)s 。" #: gajim/gui_interface.py:801 #, python-format @@ -899,9 +891,8 @@ msgid "Username Conflict" msgstr "用户名冲突" #: gajim/gui_interface.py:921 -#, fuzzy msgid "Please enter a new username for your local account" -msgstr "请在您本地账户填写新的用户名" +msgstr "请为您的本地账户填写新用户名" #: gajim/gui_interface.py:925 gajim/gtk/dialogs.py:51 #: gajim/data/gui/passphrase_dialog.ui:44 @@ -925,60 +916,54 @@ msgid "Insecure Connection" msgstr "不安全的连接" #: gajim/gui_interface.py:1073 -#, fuzzy, python-format +#, python-format msgid "" "You are about to connect to the account %(account)s (%(server)s) using an " "insecure connection method. This means conversations will not be encrypted. " "Connecting PLAIN is strongly discouraged." msgstr "" -"您将通过一个不安全的连接连接到帐户 %(account)s (%(server)s)。这意味着您的所有" -"对话都不会被加密。强烈建议您不要这么做。\n" -"您确定要这样做吗？" +"您将通过一个不安全的方式连接到帐户 %(account)s (%(server)s)。这意味着您的所有对话都不会被加密。强烈建议您不要以未加密方式连接。" #: gajim/gui_interface.py:1080 gajim/data/gui/groupchat_control.ui:595 msgid "_Abort" -msgstr "" +msgstr "中止 (_A)" #: gajim/gui_interface.py:1083 -#, fuzzy msgid "_Connect Anyway" -msgstr "正在连接" +msgstr "仍然连接 (_C)" #: gajim/gui_interface.py:1921 msgid "Gajim: IPython Console" -msgstr "" +msgstr "Gajim: IPython 控制台" #: gajim/gui_interface.py:1998 -#, fuzzy msgid "Update Check" -msgstr "拼写检查工具" +msgstr "检查更新" #: gajim/gui_interface.py:1999 msgid "Gajim Update Check" -msgstr "" +msgstr "检查更新 Gajim" #: gajim/gui_interface.py:2000 msgid "Search for Gajim updates periodically?" -msgstr "" +msgstr "定期为 Gajim 搜索更新？" #: gajim/gui_interface.py:2005 msgid "_Search Periodically" -msgstr "" +msgstr "定期搜索 (_S)" #: gajim/gui_interface.py:2045 -#, fuzzy msgid "Update Available" -msgstr "禁止" +msgstr "可用更新" #: gajim/gui_interface.py:2046 -#, fuzzy msgid "Gajim Update Available" -msgstr "禁止" +msgstr "Gajim 有可用更新" #: gajim/gui_interface.py:2047 #, python-format msgid "There is an update available for Gajim (latest version: %s)" -msgstr "" +msgstr "Gajim 有更新可用 (最新版本: %s）" #: gajim/gui_interface.py:2049 #, fuzzy @@ -987,11 +972,11 @@ msgstr "不再询问(_D)" #: gajim/gui_interface.py:2051 gajim/gtk/accounts.py:126 msgid "_Later" -msgstr "" +msgstr "下次再说 (_L)" #: gajim/gui_interface.py:2054 msgid "_Update Now" -msgstr "" +msgstr "立刻更新 (_U)" #: gajim/gui_menu_builder.py:358 #, fuzzy @@ -1594,9 +1579,8 @@ msgid "Prints a list of registered accounts" msgstr "打印注册的账户" #: gajim/gajim_remote.py:97 -#, fuzzy msgid "Changes the status of account(s)" -msgstr "改变一个或多个账户状态" +msgstr "更改账户状态" #: gajim/gajim_remote.py:100 #, fuzzy @@ -1604,13 +1588,10 @@ msgid "?CLI:status" msgstr "状态" #: gajim/gajim_remote.py:100 -#, fuzzy msgid "" "one of: offline, online, chat, away, xa, dnd. If not set, use account's " "previous status" -msgstr "" -"下列之一: offline, online, chat, away, xa, dnd, invisible。如果没有设置, 使用" -"账户先前的状态" +msgstr "下列之一: offline, online, chat, away, xa, dnd。如果没有设置, 使用账户先前的状态" #: gajim/gajim_remote.py:101 gajim/gajim_remote.py:121 #: gajim/gajim_remote.py:132 gajim/gajim_remote.py:141 @@ -1629,9 +1610,8 @@ msgid "" msgstr "改变账户的状态。如果不指明, 将改变设置\"与全局同步\"选项的账户" #: gajim/gajim_remote.py:108 -#, fuzzy msgid "Changes the priority of account(s)" -msgstr "改变一个或多个账户的优先级" +msgstr "改变账户的优先级" #: gajim/gajim_remote.py:110 #, fuzzy @@ -1651,10 +1631,9 @@ msgstr "" "户" #: gajim/gajim_remote.py:118 -#, fuzzy msgid "" "Sends new chat message to a contact in the contact list. Account is optional." -msgstr "向联系人发送文件" +msgstr "给列表中的一个联系人发送新消息。账户自选。" #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130 #, fuzzy @@ -1946,22 +1925,20 @@ msgid " resource with priority " msgstr " 带有优先级的资源 " #: gajim/conversation_textview.py:65 -#, fuzzy msgid "Untrusted" -msgstr "感兴趣" +msgstr "不信任" #: gajim/conversation_textview.py:68 msgid "Trust Not Decided" -msgstr "" +msgstr "待信任" #: gajim/conversation_textview.py:71 msgid "Unverified" -msgstr "" +msgstr "未验证" #: gajim/conversation_textview.py:74 -#, fuzzy msgid "Verified" -msgstr "辨别(_V)" +msgstr "已验证" #: gajim/conversation_textview.py:225 msgid "" @@ -2007,25 +1984,25 @@ msgid "Open as _Link" msgstr "作为链接打开(_L)" #: gajim/conversation_textview.py:770 -#, fuzzy msgid "Invalid URL" -msgstr "无效的 JID" +msgstr "无效 URL" #: gajim/conversation_textview.py:860 msgid "" "Message corrected. Original message:\n" "{}" msgstr "" +"消息已更正。原始内容：\n" +"{}" #: gajim/conversation_textview.py:1031 -#, fuzzy msgid "Not encrypted" -msgstr "未开始" +msgstr "未加密" #: gajim/conversation_textview.py:1034 #, python-format msgid "Encrypted (%s)" -msgstr "" +msgstr "已加密 (%s)" #: gajim/conversation_textview.py:1141 gajim/gtk/history.py:618 #, python-format @@ -2033,14 +2010,12 @@ msgid "Subject: %s\n" msgstr "主题: %s\n" #: gajim/conversation_textview.py:1250 -#, fuzzy msgid "Received" -msgstr "已接收 %s" +msgstr "已接收" #: gajim/conversation_textview.py:1272 -#, fuzzy msgid "?Message state:Read" -msgstr "隐藏 Message stanzas" +msgstr "?Message state:已阅" #: gajim/groupchat_control.py:352 #, python-format @@ -2295,14 +2270,12 @@ msgid "If you close this window, you will leave '%s'." msgstr "如果关闭此窗口, 您将离开聊天室 \"%s\" 。" #: gajim/message_window.py:365 -#, fuzzy msgid "Close Tabs" -msgstr "发送并关闭(_S)" +msgstr "关闭会话" #: gajim/message_window.py:366 -#, fuzzy msgid "You are about to close several tabs" -msgstr "您将要关闭多个标签" +msgstr "您将要关闭多个会话" #: gajim/message_window.py:367 #, fuzzy @@ -2348,12 +2321,11 @@ msgstr "不合法的格式" #: gajim/dialog_messages.py:49 msgid "The form is not filled correctly." -msgstr "表格没有被正确得填写。" +msgstr "表格未正确填写。" #: gajim/dialog_messages.py:53 -#, fuzzy msgid "No Connection Available" -msgstr "连接不可用" +msgstr "无可用连接" #: gajim/dialog_messages.py:54 msgid "Your message can not be sent until you are connected." @@ -2361,7 +2333,7 @@ msgstr "连接之后您的消息才能发送" #: gajim/dialog_messages.py:58 msgid "XMPP Address Already in List" -msgstr "" +msgstr "XMPP 地址已在列表中" #: gajim/dialog_messages.py:59 #, fuzzy @@ -2381,9 +2353,8 @@ msgid "Transport %(name)s answered wrongly to register request: %(error)s" msgstr "服务代理 %(name)s 对注册请求的响应有误: %(error)s" #: gajim/dialog_messages.py:70 -#, fuzzy msgid "Wrong Custom Hostname" -msgstr "使用自定义的主机名/端口" +msgstr "自定义主机名错误" #: gajim/dialog_messages.py:71 #, fuzzy, python-format @@ -2426,13 +2397,12 @@ msgstr "" "调试信息: %s" #: gajim/dialog_messages.py:91 -#, fuzzy msgid "Wrong Host" -msgstr "错误的 uri" +msgstr "错误的主机" #: gajim/dialog_messages.py:92 msgid "Invalid local address? :-O" -msgstr "" +msgstr "无效的本地地址？ :-O" #: gajim/dialog_messages.py:96 #, fuzzy View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/75b1e3afeff3f2a30c8b546a978becad… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/75b1e3afeff3f2a30c8b546a978becad… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits