Permalink
Browse files

Merge branch 'master' of github.com:linuxmint/Cinnamon

  • Loading branch information...
2 parents f8c7922 + 0159a57 commit 8aba97b50c231f7b44dac2f331fe1a83f23dde9f @glebihan glebihan committed Mar 10, 2012
Showing with 172 additions and 1,624 deletions.
  1. +137 −89 cinnamon.pot
  2. +3 −3 files/usr/lib/cinnamon-menu-editor/Alacarte/MainWindow.py
  3. +0 −3 files/usr/share/cinnamon/applets/a11y@cinnamon.org/applet.js
  4. +4 −0 files/usr/share/cinnamon/applets/keyboard@cinnamon.org/applet.js
  5. +0 −3 files/usr/share/cinnamon/applets/menu@cinnamon.org/applet.js
  6. +6 −6 files/usr/share/cinnamon/applets/panel-launchers@cinnamon.org/applet.js
  7. +0 −2 files/usr/share/cinnamon/applets/removable-drives@cinnamon.org/applet.js
  8. +0 −2 files/usr/share/cinnamon/applets/settings@cinnamon.org/applet.js
  9. +3 −6 files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
  10. +2 −5 files/usr/share/cinnamon/applets/trash@cinnamon.org/applet.js
  11. +9 −12 files/usr/share/cinnamon/applets/window-list@cinnamon.org/applet.js
  12. +1 −3 files/usr/share/cinnamon/applets/xrandr@cinnamon.org/applet.js
  13. BIN files/usr/share/cinnamon/locale/ar/LC_MESSAGES/cinnamon.mo
  14. BIN files/usr/share/cinnamon/locale/bg/LC_MESSAGES/cinnamon.mo
  15. BIN files/usr/share/cinnamon/locale/bs/LC_MESSAGES/cinnamon.mo
  16. BIN files/usr/share/cinnamon/locale/ca/LC_MESSAGES/cinnamon.mo
  17. +0 −1,489 files/usr/share/cinnamon/locale/cinnamon.pot
  18. BIN files/usr/share/cinnamon/locale/cs/LC_MESSAGES/cinnamon.mo
  19. BIN files/usr/share/cinnamon/locale/da/LC_MESSAGES/cinnamon.mo
  20. BIN files/usr/share/cinnamon/locale/de/LC_MESSAGES/cinnamon.mo
  21. BIN files/usr/share/cinnamon/locale/el/LC_MESSAGES/cinnamon.mo
  22. BIN files/usr/share/cinnamon/locale/es/LC_MESSAGES/cinnamon.mo
  23. BIN files/usr/share/cinnamon/locale/et/LC_MESSAGES/cinnamon.mo
  24. BIN files/usr/share/cinnamon/locale/fi/LC_MESSAGES/cinnamon.mo
  25. BIN files/usr/share/cinnamon/locale/fr/LC_MESSAGES/cinnamon.mo
  26. BIN files/usr/share/cinnamon/locale/he/LC_MESSAGES/cinnamon.mo
  27. BIN files/usr/share/cinnamon/locale/hr/LC_MESSAGES/cinnamon.mo
  28. BIN files/usr/share/cinnamon/locale/hu/LC_MESSAGES/cinnamon.mo
  29. BIN files/usr/share/cinnamon/locale/id/LC_MESSAGES/cinnamon.mo
  30. BIN files/usr/share/cinnamon/locale/it/LC_MESSAGES/cinnamon.mo
  31. BIN files/usr/share/cinnamon/locale/ja/LC_MESSAGES/cinnamon.mo
  32. BIN files/usr/share/cinnamon/locale/nl/LC_MESSAGES/cinnamon.mo
  33. BIN files/usr/share/cinnamon/locale/pl/LC_MESSAGES/cinnamon.mo
  34. BIN files/usr/share/cinnamon/locale/pt/LC_MESSAGES/cinnamon.mo
  35. BIN files/usr/share/cinnamon/locale/pt_BR/LC_MESSAGES/cinnamon.mo
  36. BIN files/usr/share/cinnamon/locale/ro/LC_MESSAGES/cinnamon.mo
  37. BIN files/usr/share/cinnamon/locale/ru/LC_MESSAGES/cinnamon.mo
  38. BIN files/usr/share/cinnamon/locale/sk/LC_MESSAGES/cinnamon.mo
  39. BIN files/usr/share/cinnamon/locale/sr/LC_MESSAGES/cinnamon.mo
  40. BIN files/usr/share/cinnamon/locale/sv/LC_MESSAGES/cinnamon.mo
  41. BIN files/usr/share/cinnamon/locale/tr/LC_MESSAGES/cinnamon.mo
  42. BIN files/usr/share/cinnamon/locale/zh_CN/LC_MESSAGES/cinnamon.mo
  43. BIN files/usr/share/cinnamon/locale/zh_HK/LC_MESSAGES/cinnamon.mo
  44. +6 −0 js/ui/main.js
  45. +1 −1 js/ui/placesManager.js
View

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -159,7 +159,7 @@ def findMenu(self, menus, path, iter, menu_id):
def setupMenuTree(self):
self.menu_store = gtk.TreeStore(gtk.gdk.Pixbuf, str, object)
menus = self.tree.get_object('menu_tree')
- column = gtk.TreeViewColumn(_('Name'))
+ column = gtk.TreeViewColumn(_("Name"))
column.set_spacing(4)
cell = gtk.CellRendererPixbuf()
column.pack_start(cell, False)
@@ -175,15 +175,15 @@ def setupMenuTree(self):
def setupItemTree(self):
items = self.tree.get_object('item_tree')
- column = gtk.TreeViewColumn(_('Show'))
+ column = gtk.TreeViewColumn(_("Show"))
cell = gtk.CellRendererToggle()
cell.connect('toggled', self.on_item_tree_show_toggled)
column.pack_start(cell, True)
column.set_attributes(cell, active=0)
#hide toggle for separators
column.set_cell_data_func(cell, self._cell_data_toggle_func)
items.append_column(column)
- column = gtk.TreeViewColumn(_('Item'))
+ column = gtk.TreeViewColumn(_("Item"))
column.set_spacing(4)
cell = gtk.CellRendererPixbuf()
column.pack_start(cell, False)
@@ -4,9 +4,6 @@ const Lang = imports.lang;
const Applet = imports.ui.applet;
const GConf = imports.gi.GConf;
-const Gettext = imports.gettext.domain('cinnamon-applets');
-const _ = Gettext.gettext;
-
const A11Y_SCHEMA = 'org.gnome.desktop.a11y.keyboard';
const KEY_STICKY_KEYS_ENABLED = 'stickykeys-enable';
const KEY_BOUNCE_KEYS_ENABLED = 'bouncekeys-enable';
@@ -67,6 +67,10 @@ MyApplet.prototype = {
this.menu.addAction(_("Show Keyboard Layout"), Lang.bind(this, function() {
Main.overview.hide();
Util.spawn(['gkbd-keyboard-display', '-g', String(this._config.get_current_group() + 1)]);
+ }));
+ this.menu.addAction(_("Show Character Table"), Lang.bind(this, function() {
+ Main.overview.hide();
+ Util.spawn(['gucharmap']);
}));
}
this.menu.addSettingsAction(_("Region and Language Settings"), 'gnome-region-panel.desktop');
@@ -19,9 +19,6 @@ const Tweener = imports.ui.tweener;
const DND = imports.ui.dnd;
const Meta = imports.gi.Meta;
-const Gettext = imports.gettext.domain('cinnamon-extensions');
-const _ = Gettext.gettext;
-
const ICON_SIZE = 16;
const MAX_FAV_ICON_SIZE = 32;
const CATEGORY_ICON_SIZE = 22;
@@ -30,19 +30,19 @@ PanelAppLauncherMenu.prototype = {
Main.uiGroup.add_actor(this.actor);
this.actor.hide();
- this.launchItem = new PopupMenu.PopupMenuItem(_('Launch'));
+ this.launchItem = new PopupMenu.PopupMenuItem(_("Launch"));
this.addMenuItem(this.launchItem);
this.launchItem.connect('activate', Lang.bind(this, this._onLaunchActivate));
- this.addItem = new PopupMenu.PopupMenuItem(_('Add'));
+ this.addItem = new PopupMenu.PopupMenuItem(_("Add"));
this.addMenuItem(this.addItem);
this.addItem.connect('activate', Lang.bind(this, this._onAddActivate));
- this.editItem = new PopupMenu.PopupMenuItem(_('Edit'));
+ this.editItem = new PopupMenu.PopupMenuItem(_("Edit"));
this.addMenuItem(this.editItem);
this.editItem.connect('activate', Lang.bind(this, this._onEditActivate));
- this.removeItem = new PopupMenu.PopupMenuItem(_('Remove'));
+ this.removeItem = new PopupMenu.PopupMenuItem(_("Remove"));
this.addMenuItem(this.removeItem);
this.removeItem.connect('activate', Lang.bind(this, this._onRemoveActivate));
},
@@ -284,12 +284,12 @@ AddLauncherDialog.prototype = {
_validateAdd: function() {
if (this._nameEntry.clutter_text.get_text()==""){
- this._errorMessage.clutter_text.set_text(_('Name cannot be empty !'));
+ this._errorMessage.clutter_text.set_text(_("Name cannot be empty!"));
this._errorBox.show();
return false;
}
if (this._commandEntry.clutter_text.get_text()==""){
- this._errorMessage.clutter_text.set_text(_('Command cannot be empty !'));
+ this._errorMessage.clutter_text.set_text(_("Command cannot be empty!"));
this._errorBox.show();
return false;
}
@@ -2,8 +2,6 @@ const Lang = imports.lang;
const St = imports.gi.St;
const Cinnamon = imports.gi.Cinnamon;
const Applet = imports.ui.applet;
-const Gettext = imports.gettext.domain('cinnamon-extensions');
-const _ = Gettext.gettext;
const Main = imports.ui.main;
const PopupMenu = imports.ui.popupMenu;
@@ -2,8 +2,6 @@ const Lang = imports.lang;
const St = imports.gi.St;
const Cinnamon = imports.gi.Cinnamon;
const Applet = imports.ui.applet;
-const Gettext = imports.gettext.domain('cinnamon-extensions');
-const _ = Gettext.gettext;
const Main = imports.ui.main;
const PopupMenu = imports.ui.popupMenu;
const Util = imports.misc.util;
@@ -10,9 +10,6 @@ const PopupMenu = imports.ui.popupMenu;
const GLib = imports.gi.GLib;
const Gvc = imports.gi.Gvc;
-const Gettext = imports.gettext.domain('cinnamon-extension-mediaplayer');
-const _ = Gettext.gettext;
-
const PropIFace = {
name: 'org.freedesktop.DBus.Properties',
signals: [{ name: 'PropertiesChanged',
@@ -367,9 +364,9 @@ Player.prototype = {
this.addActor(mainBox);
this.infos = new St.BoxLayout({vertical: true});
- this._artist = new TrackInfo(_('Unknown Artist'), "system-users");
- this._album = new TrackInfo(_('Unknown Album'), "media-optical");
- this._title = new TrackInfo(_('Unknown Title'), "audio-x-generic");
+ this._artist = new TrackInfo(_("Unknown Artist"), "system-users");
+ this._album = new TrackInfo(_("Unknown Album"), "media-optical");
+ this._title = new TrackInfo(_("Unknown Title"), "audio-x-generic");
this._time = new TrackInfo("0:00 / 0:00", "document-open-recent");
this.infos.add_actor(this._artist.getActor());
this.infos.add_actor(this._album.getActor());
@@ -5,8 +5,6 @@ const Gtk = imports.gi.Gtk;
const Lang = imports.lang;
const Clutter = imports.gi.Clutter;
const Applet = imports.ui.applet;
-const Gettext = imports.gettext.domain('cinnamon-applets');
-const _ = Gettext.gettext;
function MyApplet(orientation) {
this._init(orientation);
@@ -111,7 +109,7 @@ ConfirmEmptyTrashDialog.prototype = {
messageBox.add(this._subjectLabel, { y_fill: false, y_align: St.Align.START });
this._descriptionLabel = new St.Label({ style_class: 'polkit-dialog-description',
- text: Gettext.gettext(MESSAGE) });
+ text: MESSAGE });
messageBox.add(this._descriptionLabel, { y_fill: true, y_align: St.Align.START });
@@ -134,8 +132,7 @@ ConfirmEmptyTrashDialog.prototype = {
}
};
-function main(metadata, orientation) {
- imports.gettext.bindtextdomain('cinnamon-applets', metadata.localedir);
+function main(metadata, orientation) {
let myApplet = new MyApplet(orientation);
return myApplet;
}
@@ -11,9 +11,6 @@ const Meta = imports.gi.Meta;
const Tooltips = imports.ui.tooltips;
const DND = imports.ui.dnd;
-const Gettext = imports.gettext.domain('cinnamon-extensions');
-const _ = Gettext.gettext;
-
const PANEL_ICON_SIZE = 24;
const SPINNER_ANIMATION_TIME = 1;
@@ -38,25 +35,25 @@ AppMenuButtonRightClickMenu.prototype = {
this.metaWindow = metaWindow;
- this.itemCloseWindow = new PopupMenu.PopupMenuItem('Close');
+ this.itemCloseWindow = new PopupMenu.PopupMenuItem(_("Close"));
this.itemCloseWindow.connect('activate', Lang.bind(this, this._onCloseWindowActivate));
if (metaWindow.minimized)
- this.itemMinimizeWindow = new PopupMenu.PopupMenuItem('Restore');
+ this.itemMinimizeWindow = new PopupMenu.PopupMenuItem(_("Restore"));
else
- this.itemMinimizeWindow = new PopupMenu.PopupMenuItem('Minimize');
+ this.itemMinimizeWindow = new PopupMenu.PopupMenuItem(_("Minimize"));
this.itemMinimizeWindow.connect('activate', Lang.bind(this, this._onMinimizeWindowActivate));
- this.itemMaximizeWindow = new PopupMenu.PopupMenuItem(_('Maximize'));
+ this.itemMaximizeWindow = new PopupMenu.PopupMenuItem(_("Maximize"));
this.itemMaximizeWindow.connect('activate', Lang.bind(this, this._onMaximizeWindowActivate));
- this.itemMoveToLeftWorkspace = new PopupMenu.PopupMenuItem(_('Move to left workspace'));
+ this.itemMoveToLeftWorkspace = new PopupMenu.PopupMenuItem(_("Move to left workspace"));
this.itemMoveToLeftWorkspace.connect('activate', Lang.bind(this, this._onMoveToLeftWorkspace));
- this.itemMoveToRightWorkspace = new PopupMenu.PopupMenuItem(_('Move to right workspace'));
+ this.itemMoveToRightWorkspace = new PopupMenu.PopupMenuItem(_("Move to right workspace"));
this.itemMoveToRightWorkspace.connect('activate', Lang.bind(this, this._onMoveToRightWorkspace));
- this.itemOnAllWorkspaces = new PopupMenu.PopupMenuItem(_('Visible on all workspaces'));
+ this.itemOnAllWorkspaces = new PopupMenu.PopupMenuItem(_("Visible on all workspaces"));
this.itemOnAllWorkspaces.connect('activate', Lang.bind(this, this._toggleOnAllWorkspaces));
if (orientation == St.Side.BOTTOM) {
@@ -84,11 +81,11 @@ AppMenuButtonRightClickMenu.prototype = {
return;
if (this.metaWindow.is_on_all_workspaces()) {
- this.itemOnAllWorkspaces.label.set_text(_('Only on this workspace'));
+ this.itemOnAllWorkspaces.label.set_text(_("Only on this workspace"));
this.itemMoveToLeftWorkspace.actor.hide();
this.itemMoveToRightWorkspace.actor.hide();
} else {
- this.itemOnAllWorkspaces.label.set_text(_('Visible on all workspaces'));
+ this.itemOnAllWorkspaces.label.set_text(_("Visible on all workspaces"));
if (this.metaWindow.get_workspace().get_neighbor(Meta.MotionDirection.LEFT) != this.metaWindow.get_workspace())
this.itemMoveToLeftWorkspace.actor.show();
else
@@ -8,8 +8,6 @@ const Lang = imports.lang;
const Applet = imports.ui.applet;
const PopupMenu = imports.ui.popupMenu;
-const Gettext = imports.gettext.domain('cinnamon-applets');
-const _ = Gettext.gettext;
const N_ = function(e) { return e };
const possibleRotations = [ GnomeDesktop.RRRotation.ROTATION_0,
@@ -104,7 +102,7 @@ MyApplet.prototype = {
for (let i = 0; i < rotations.length; i++) {
let [bitmask, name] = rotations[i];
if (bitmask & allowedRotations) {
- let item = new PopupMenu.PopupMenuItem(Gettext.gettext(name));
+ let item = new PopupMenu.PopupMenuItem(_(name));
if (bitmask & currentRotation)
item.setShowDot(true);
item.connect('activate', Lang.bind(this, function(item, event) {
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Oops, something went wrong.

0 comments on commit 8aba97b

Please sign in to comment.