Changeset 7cf5b21d13c51379f83c4657e38c20e0127efb48

Timestamp:

12/19/10 13:29:58 (2 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

c4119ff60b7a61103faf6ee2f72597f7fa291409

Parents:

0a0a2ff38e385234774ac3f616228931a16000fc, 875f8496f34c03c50ebd077fe94b3f4187dda497

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-12-19T13:29:58Z+0200

Message:

Merge remote branch 'cz/i18n'

Conflicts:

gui/about.c

Files:

• .gitignore (modified) (1 diff)
• gui/about.c (modified) (2 diffs)
• gui/action.c (modified) (1 diff)
• gui/canvas.cpp (modified) (1 diff)
• gui/common.h (modified) (1 diff)
• gui/control.c (modified) (6 diffs)
• gui/create_room_dialog.c (modified) (1 diff)
• gui/dialogs.c (modified) (3 diffs)
• gui/dynmenu.c (modified) (1 diff)
• gui/gladish.ui (modified) (17 diffs)
• gui/help/fr.txt (added)
• gui/jack.c (modified) (7 diffs)
• gui/load_project_dialog.c (modified) (2 diffs)
• gui/main.c (modified) (4 diffs)
• gui/menu.c (modified) (7 diffs)
• gui/project_properties.c (modified) (2 diffs)
• gui/room.c (modified) (2 diffs)
• gui/settings.c (modified) (1 diff)
• gui/studio.c (modified) (12 diffs)
• gui/world_tree.c (modified) (9 diffs)
• po/fr.po (added)
• po/gladish.pot (added)
• po/ru.po (added)
• updatepot (added)
• wscript (modified) (2 diffs)
• AUTHORS (modified) (1 diff)
• daemon/room_load.c (modified) (1 diff)
• gui/gtk_builder.c (modified) (2 diffs)

.gitignore

@@ -16 +16 @@
 *~
 *.pyc
+po/*.mo
+po/*.gmo

gui/about.c

@@ -43 +43 @@
   GtkWidget * dialog;
   GdkPixbuf * pixbuf;
-  const char * authors[] = {"Nedko Arnaudov", "Nikita Zlobin", "Filipe Alexandre Lopes Coelho", NULL};
-  const char * artists[] = {"Lapo Calamandrei", "Nadejda Pancheva-Arnaudova", NULL};
+  const char * authors[] = {_("Nedko Arnaudov"), _("Nikita Zlobin"), _("Filipe Alexandre Lopes Coelho"), NULL};
+  const char * artists[] = {_("Lapo Calamandrei"), _("Nadejda Pancheva-Arnaudova"), NULL};
   char * license;
   struct stat st;
@@ -60 +60 @@
   timestamp_str[24] = 0;
 
-  sprintf(built_str,"gladish is built on %s from %s", timestamp_str, GIT_VERSION);
+  sprintf(built_str, _("gladish is built on %s from %s"), timestamp_str, GIT_VERSION);
 
   gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(dialog), PACKAGE_VERSION);

gui/action.c

@@ -44 +44 @@
   g_clear_xruns_and_max_dsp_action = GTK_ACTION(get_gtk_builder_object("clear_xruns_and_max_dsp_load_action"));
   g_signal_connect(G_OBJECT(g_clear_xruns_and_max_dsp_action), "activate", G_CALLBACK(clear_xruns_and_max_dsp), NULL);
+  gtk_action_set_label(g_clear_xruns_and_max_dsp_action, _("Clear XRuns and Max DSP Load"));
+  gtk_action_set_short_label(g_clear_xruns_and_max_dsp_action, _("Clear"));
 
   g_zoom_100_action = GTK_ACTION(get_gtk_builder_object("zoom_100_action"));
   g_signal_connect(G_OBJECT(g_zoom_100_action), "activate", G_CALLBACK(zoom_100), NULL);
+  gtk_action_set_label(g_zoom_100_action, _("Zoom 100%"));
+  gtk_action_set_short_label(g_zoom_100_action, _("Zoom 100%"));
 
   g_zoom_fit_action = GTK_ACTION(get_gtk_builder_object("zoom_fit_action"));
   g_signal_connect(G_OBJECT(g_zoom_fit_action), "activate", G_CALLBACK(zoom_fit), NULL);
+  gtk_action_set_label(g_zoom_fit_action, _("Zoom to fit"));
+  gtk_action_set_short_label(g_zoom_fit_action, _("Zoom to fit"));
 
   g_zoom_in_action = GTK_ACTION(get_gtk_builder_object("zoom_in_action"));
   g_signal_connect(G_OBJECT(g_zoom_in_action), "activate", G_CALLBACK(zoom_in), NULL);
+  gtk_action_set_label(g_zoom_in_action, _("Zoom in"));
+  gtk_action_set_short_label(g_zoom_in_action, _("Zoom in"));
 
   g_zoom_out_action = GTK_ACTION(get_gtk_builder_object("zoom_out_action"));
   g_signal_connect(G_OBJECT(g_zoom_out_action), "activate", G_CALLBACK(zoom_out), NULL);
+  gtk_action_set_label(g_zoom_out_action, _("Zoom out"));
+  gtk_action_set_short_label(g_zoom_out_action, _("Zoom out"));
 
   struct

gui/canvas.cpp

@@ -111 +111 @@
   {
     _menu = new Gtk::Menu();
-    _menu->items().push_back(Gtk::Menu_Helpers::MenuElem("Disconnect All", sigc::mem_fun(this, &module_cls::menu_disconnect_all)));
+    _menu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Disconnect All"), sigc::mem_fun(this, &module_cls::menu_disconnect_all)));
     void (* fill_module_menu)(GtkMenu * menu, void * module_context) = boost::dynamic_pointer_cast<canvas_cls>(canvas().lock())->m_fill_module_menu;
     if (fill_module_menu != NULL)

gui/common.h

@@ -31 +31 @@
 
 #include <gtk/gtk.h>
+#include <libintl.h>
+
+#define _(s) gettext(s)
 
 void error_message_box(const char * failed_operation);

gui/control.c

@@ -31 +31 @@
 #include "world_tree.h"
 #include "ask_dialog.h"
+
+#include "common.h"
 
 static guint g_ladishd_poll_source_tag;
@@ -134 +136 @@
   if (!control_proxy_exit())
   {
-    error_message_box("Daemon exit command failed, please inspect logs.");
+    error_message_box(_("Daemon exit command failed, please inspect logs."));
   }
 }
@@ -144 +146 @@
   log_info("new studio request");
 
-  if (name_dialog("New studio", "Studio name", "", &new_name))
+  if (name_dialog(_("New studio"), _("Studio name"), "", &new_name))
   {
     if (!control_proxy_new_studio(new_name))
     {
-      error_message_box("Creation of new studio failed, please inspect logs.");
+      error_message_box(_("Creation of new studio failed, please inspect logs."));
     }
 
@@ -161 +163 @@
   if (!control_proxy_load_studio(studio_name))
   {
-    error_message_box("Studio load failed, please inspect logs.");
+    error_message_box(_("Studio load failed, please inspect logs."));
   }
 }
@@ -169 +171 @@
   bool result;
 
-  if (!ask_dialog(&result, "<b><big>Confirm studio delete</big></b>", "Studio \"%s\" will be deleted. Are you sure?", studio_name) || !result)
+  if (!ask_dialog(&result, _("<b><big>Confirm studio delete</big></b>"), _("Studio \"%s\" will be deleted. Are you sure?"), studio_name) || !result)
   {
     return;
@@ -178 +180 @@
   if (!control_proxy_delete_studio(studio_name))
   {
-    error_message_box("Studio delete failed, please inspect logs.");
+    error_message_box(_("Studio delete failed, please inspect logs."));
   }
 }

gui/create_room_dialog.c

@@ -70 +70 @@
 
   col = gtk_tree_view_column_new();
-  gtk_tree_view_column_set_title(col, "Name");
+  gtk_tree_view_column_set_title(col, _("Name"));
   gtk_tree_view_append_column(g_treeview, col);
 

gui/dialogs.c

@@ -56 +56 @@
 
   gtk_window_set_focus(GTK_WINDOW(g_app_dialog), GTK_WIDGET(command_entry));
-  gtk_window_set_title(GTK_WINDOW(g_app_dialog), "New application");
+  gtk_window_set_title(GTK_WINDOW(g_app_dialog), _("New application"));
 
   gtk_widget_show(g_app_dialog);
@@ -94 +94 @@
           level))
     {
-      error_message_box("Execution failed. I know you want to know more for the reson but currently you can only check the log file.");
+      error_message_box(_("Execution failed. I know you want to know more for the reson but currently you can only check the log file."));
     }
   }
@@ -136 +136 @@
   GtkWidget * dialog;
   dialog = get_gtk_builder_widget("error_dialog");
-  gtk_message_dialog_set_markup(GTK_MESSAGE_DIALOG(dialog), "<b><big>Error</big></b>");
+  gtk_message_dialog_set_markup(GTK_MESSAGE_DIALOG(dialog), _("<b><big>Error</big></b>"));
   gtk_message_dialog_format_secondary_markup(GTK_MESSAGE_DIALOG(dialog), "%s", failed_operation);
   gtk_widget_show(dialog);

gui/dynmenu.c

@@ -150 +150 @@
   {
     menu_dynmenu_clear(dynmenu_ptr);
-    prefix = "Error obtaining ";
+    prefix = _("Error obtaining ");
   }
   else if (dynmenu_ptr->count == 0)
   {
-    prefix = "Empty ";
+    prefix = _("Empty ");
   }
   else

gui/gladish.ui

@@ -22 +22 @@
                     <child>
                       <object class="GtkImageMenuItem" id="menu_item_new_studio">
-                        <property name="label">_New Studio...</property>
+                        <property name="label" translatable="yes">_New Studio...</property>
                         <property name="image">image_new_studio</property>
                         <property name="use_stock">False</property>
@@ -32 +32 @@
                     <child>
                       <object class="GtkImageMenuItem" id="menu_item_load_studio">
-                        <property name="label">_Load Studio</property>
+                        <property name="label" translatable="yes">_Load Studio</property>
                         <property name="image">image_load_studio</property>
                         <property name="use_stock">False</property>
@@ -48 +48 @@
                     <child>
                       <object class="GtkImageMenuItem" id="menu_item_start_studio">
-                        <property name="label">Start Studio</property>
+                        <property name="label" translatable="yes">Start Studio</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="image">image_start_studio</property>
@@ -60 +60 @@
                     <child>
                       <object class="GtkImageMenuItem" id="menu_item_stop_studio">
-                        <property name="label">Stop Studio</property>
+                        <property name="label" translatable="yes">Stop Studio</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="image">image_stop_studio</property>
@@ -77 +77 @@
                     <child>
                       <object class="GtkImageMenuItem" id="menu_item_rename_studio">
-                        <property name="label">_Rename Studio...</property>
+                        <property name="label" translatable="yes">_Rename Studio...</property>
                         <property name="image">image_rename_studio</property>
                         <property name="sensitive">False</property>
@@ -88 +88 @@
                     <child>
                       <object class="GtkImageMenuItem" id="menu_item_save_studio">
-                        <property name="label">_Save Studio</property>
+                        <property name="label" translatable="yes">_Save Studio</property>
                         <property name="image">image_save_studio</property>
                         <property name="sensitive">False</property>
@@ -99 +99 @@
                     <child>
                       <object class="GtkImageMenuItem" id="menu_item_save_as_studio">
-                        <property name="label">Save Studio _As...</property>
+                        <property name="label" translatable="yes">Save Studio _As...</property>
                         <property name="image">image_save_studio_as</property>
                         <property name="sensitive">False</property>
@@ -110 +110 @@
                     <child>
                       <object class="GtkImageMenuItem" id="menu_item_unload_studio">
-                        <property name="label">_Unload Studio</property>
+                        <property name="label" translatable="yes">_Unload Studio</property>
                         <property name="image">image_unload_studio</property>
                         <property name="sensitive">False</property>
@@ -121 +121 @@
                     <child>
                       <object class="GtkImageMenuItem" id="menu_item_delete_studio">
-                        <property name="label">_Delete Studio</property>
+                        <property name="label" translatable="yes">_Delete Studio</property>
                         <property name="image">image_delete_studio</property>
                         <property name="use_stock">False</property>
@@ -156 +156 @@
                     <child>
                       <object class="GtkImageMenuItem" id="menu_item_create_room">
-                        <property name="label">_Create Room...</property>
+                        <property name="label" translatable="yes">_Create Room...</property>
                         <property name="image">image_create_room</property>
                         <property name="sensitive">False</property>
@@ -167 +167 @@
                     <child>
                       <object class="GtkImageMenuItem" id="menu_item_destroy_room">
-                        <property name="label">_Destroy Room</property>
+                        <property name="label" translatable="yes">_Destroy Room</property>
                         <property name="image">image_destroy_room</property>
                         <property name="sensitive">False</property>
@@ -190 +190 @@
                     <child>
                       <object class="GtkImageMenuItem" id="menu_item_load_project">
-                        <property name="label">_Load Project...</property>
+                        <property name="label" translatable="yes">_Load Project...</property>
                         <property name="image">image_load_project</property>
                         <property name="sensitive">False</property>
@@ -247 +247 @@
                     <child>
                       <object class="GtkImageMenuItem" id="menu_item_recently_loaded_projects">
-                        <property name="label">R_ecently Loaded</property>
+                        <property name="label" translatable="yes">R_ecently Loaded</property>
                         <property name="sensitive">False</property>
                         <property name="use_stock">False</property>
@@ -268 +268 @@
                     <child>
                       <object class="GtkImageMenuItem" id="menu_item_start_app">
-                        <property name="label">Run...</property>
+                        <property name="label" translatable="yes">Run...</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="image">image_start_app</property>
@@ -343 +343 @@
                     <child>
                       <object class="GtkImageMenuItem" id="menu_item_view_arrange">
-                        <property name="label">_Arrange</property>
+                        <property name="label" translatable="yes">_Arrange</property>
                         <property name="image">image_arrange_canvas</property>
                         <property name="use_stock">False</property>
@@ -386 +386 @@
                     <child>
                       <object class="GtkImageMenuItem" id="menu_item_jack_configure">
-                        <property name="label">_Configure JACK</property>
+                        <property name="label" translatable="yes">_Configure JACK</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="image">image_configure_jack</property>
@@ -396 +396 @@
                     <child>
                       <object class="GtkImageMenuItem" id="menu_item_daemon_exit">
-                        <property name="label">Reactivate ladishd</property>
+                        <property name="label" translatable="yes">Reactivate ladishd</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="image">image_reactivate_ladishd</property>

gui/jack.c

@@ -55 +55 @@
   if (g_jack_view == NULL && g_jack_view_enabled && g_jack_state != JACK_STATE_NA)
   {
-    if (!create_view("Raw JACK", JACKDBUS_SERVICE_NAME, JACKDBUS_OBJECT_PATH, false, false, true, &g_jack_view))
+    if (!create_view(_("Raw JACK"), JACKDBUS_SERVICE_NAME, JACKDBUS_OBJECT_PATH, false, false, true, &g_jack_view))
     {
       log_error("create_view() failed for jack");
@@ -91 +91 @@
     log_info("JACK latency changed: %"PRIu32" samples", size);
 
-    snprintf(buf, sizeof(buf), "%4.1f ms (%"PRIu32")", (float)size / (float)g_sample_rate * 1000.0f, size);
+    snprintf(buf, sizeof(buf), _("%4.1f ms (%"PRIu32")"), (float)size / (float)g_sample_rate * 1000.0f, size);
     set_latency_text(buf);
   }
@@ -119 +119 @@
   if (jack_proxy_get_xruns(&xruns))
   {
-    snprintf(tmp_buf, sizeof(tmp_buf), "%" PRIu32 " dropouts", xruns);
+    snprintf(tmp_buf, sizeof(tmp_buf),
+             ngettext("%"PRIu32" dropout",
+                      "%"PRIu32" dropouts",
+                      xruns), xruns);
+
     set_xruns_text(tmp_buf);
     gtk_progress_bar_set_text(GTK_PROGRESS_BAR(g_xrun_progress_bar), tmp_buf);
@@ -125 +129 @@
   else
   {
-    gtk_progress_bar_set_text(GTK_PROGRESS_BAR(g_xrun_progress_bar), "error");
+    gtk_progress_bar_set_text(GTK_PROGRESS_BAR(g_xrun_progress_bar), _("error"));
     gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(g_xrun_progress_bar), 0.0);
     set_xruns_text("?");
@@ -138 +142 @@
     }
 
-    snprintf(tmp_buf, sizeof(tmp_buf), "DSP: %5.1f%% (%5.1f%%)", (float)load, (float)g_jack_max_dsp_load);
+    snprintf(tmp_buf, sizeof(tmp_buf), _("DSP: %5.1f%% (%5.1f%%)"), (float)load, (float)g_jack_max_dsp_load);
     set_dsp_load_text(tmp_buf);
   }
@@ -254 +258 @@
   {
     dialog = get_gtk_builder_widget("error_dialog");
-    gtk_message_dialog_set_markup(GTK_MESSAGE_DIALOG(dialog), "<b><big>Error executing ladiconf.\nAre LADI Tools installed?</big></b>");
+    gtk_message_dialog_set_markup(GTK_MESSAGE_DIALOG(dialog), _("<b><big>Error executing ladiconf.\nAre LADI Tools installed?</big></b>"));
     gtk_message_dialog_format_secondary_markup(GTK_MESSAGE_DIALOG(dialog), "%s", error_ptr->message);
     gtk_widget_show(dialog);
@@ -309 +313 @@
     if (fmod(g_sample_rate, 1000.0) != 0.0)
     {
-      snprintf(buf, sizeof(buf), "%.1f kHz", (float)g_sample_rate / 1000.0f);
+      snprintf(buf, sizeof(buf), _("%.1f kHz"), (float)g_sample_rate / 1000.0f);
     }
     else
     {
-      snprintf(buf, sizeof(buf), "%u kHz", g_sample_rate / 1000);
+      snprintf(buf, sizeof(buf), _("%u kHz"), g_sample_rate / 1000);
     }
 

gui/load_project_dialog.c

@@ -185 +185 @@
 
   dialog = gtk_file_chooser_dialog_new(
-    "Load project",
+    _("Load project"),
     NULL,
     GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
@@ -209 +209 @@
       GtkWidget * dialog;
       dialog = get_gtk_builder_widget("error_dialog");
-      gtk_message_dialog_set_markup(GTK_MESSAGE_DIALOG(dialog), "<b><big>Not a project dir</big></b>");
+      gtk_message_dialog_set_markup(GTK_MESSAGE_DIALOG(dialog), _("<b><big>Not a project dir</big></b>"));
       gtk_message_dialog_format_secondary_markup(GTK_MESSAGE_DIALOG(dialog), "%s", filename);
       gtk_widget_show(dialog);

gui/main.c

@@ -45 +45 @@
 #include "toolbar.h"
 
+#define GETTEXT_PACKAGE "gladish"
+
+#define ENABLE_NLS 1
+
 GtkWidget * g_main_win;
 
@@ -55 +59 @@
   if (view != NULL)
   {
-    title = catdup(get_view_name(view), " - LADI Session Handler");
+    title = catdup3(get_view_name(view), " - ", _("LADI Session Handler"));
     gtk_window_set_title(GTK_WINDOW(g_main_win), title);
     free(title);
@@ -61 +65 @@
   else
   {
-    gtk_window_set_title(GTK_WINDOW(g_main_win), "LADI Session Handler");
+    gtk_window_set_title(GTK_WINDOW(g_main_win), _("LADI Session Handler"));
   }
 }
@@ -80 +84 @@
 int main(int argc, char** argv)
 {
+  #if ENABLE_NLS
+    bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
+    bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+    textdomain (GETTEXT_PACKAGE);
+  #endif
+
   gtk_init(&argc, &argv);
 

gui/menu.c

@@ -25 +25 @@
  */
 
+#include "common.h"
 #include "internal.h"
 #include "menu.h"
@@ -104 +105 @@
   if (!ladish_room_proxy_load_project(graph_view_get_room(get_current_view()), data))
   {
-    error_message_box("Project load failed, please inspect logs.");
+    error_message_box(_("Project load failed, please inspect logs."));
   }
 }
@@ -113 +114 @@
   if (!ladish_room_proxy_load_project(graph_view_get_room(get_current_view()), data))
   {
-    error_message_box("Project load failed, please inspect logs.");
+    error_message_box(_("Project load failed, please inspect logs."));
   }
 }
@@ -381 +382 @@
   if (graph_view_get_app_supervisor(view) != NULL)
   {
-    menuitem = gtk_menu_item_new_with_label("Run...");
+    menuitem = gtk_menu_item_new_with_label(_("Run..."));
     g_signal_connect(menuitem, "activate", (GCallback)on_popup_menu_action_start_app, NULL);
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
@@ -401 +402 @@
     }
 
-    menuitem = gtk_menu_item_new_with_label("Load Project...");
+    menuitem = gtk_menu_item_new_with_label(_("Load Project..."));
     g_signal_connect(menuitem, "activate", (GCallback)on_popup_menu_action_load_project, NULL);
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
-    menuitem = gtk_menu_item_new_with_label("Unload Project");
+    menuitem = gtk_menu_item_new_with_label(_("Unload Project"));
     g_signal_connect(menuitem, "activate", (GCallback)on_popup_menu_action_unload_project, NULL);
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
-    menuitem = gtk_menu_item_new_with_label("Save Project...");
+    menuitem = gtk_menu_item_new_with_label(_("Save Project..."));
     g_signal_connect(menuitem, "activate", (GCallback)on_popup_menu_action_save_project, NULL);
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
-    menuitem = gtk_menu_item_new_with_label("Save Project As...");
+    menuitem = gtk_menu_item_new_with_label(_("Save Project As..."));
     g_signal_connect(menuitem, "activate", (GCallback)on_popup_menu_action_save_project_as, NULL);
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
-    menuitem = gtk_menu_item_new_with_label("Project Properties...");
+    menuitem = gtk_menu_item_new_with_label(_("Project Properties..."));
     g_signal_connect(menuitem, "activate", (GCallback)ladish_project_properties_dialog_run, NULL);
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
@@ -424 +425 @@
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
-    menuitem = gtk_menu_item_new_with_label("Destroy Room");
+    menuitem = gtk_menu_item_new_with_label(_("Destroy Room"));
     g_signal_connect(menuitem, "activate", (GCallback)on_popup_menu_action_destroy_room, NULL);
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
@@ -430 +431 @@
   else
   {
-    menuitem = gtk_menu_item_new_with_label("Create Room...");
+    menuitem = gtk_menu_item_new_with_label(_("Create Room..."));
     g_signal_connect(menuitem, "activate", (GCallback)on_popup_menu_action_create_room, NULL);
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);

gui/project_properties.c

@@ -71 +71 @@
     if (!ladish_room_proxy_set_project_description(proxy, gtk_entry_get_text(description_entry_ptr)))
     {
-      error_message_box("Setting of project description failed, please inspect logs.");
+      error_message_box(_("Setting of project description failed, please inspect logs."));
     }
     else
@@ -80 +80 @@
       if (!ladish_room_proxy_set_project_notes(proxy, gtk_text_buffer_get_text(notes_buffer, &start, &end, FALSE)))
       {
-        error_message_box("Setting of project description failed, please inspect logs.");
+        error_message_box(_("Setting of project description failed, please inspect logs."));
       }
     }

gui/room.c

@@ -47 +47 @@
     if (!studio_proxy_create_room(name, template))
     {
-      error_message_box("Room creation failed, please inspect logs.");
+      error_message_box(_("Room creation failed, please inspect logs."));
     }
 
@@ -70 +70 @@
   if (!studio_proxy_delete_room(room))
   {
-    error_message_box("Room deletion failed, please inspect logs.");
+    error_message_box(_("Room deletion failed, please inspect logs."));
   }
 }

gui/settings.c

@@ -94 +94 @@
       !conf_set(LADISH_CONF_KEY_DAEMON_TERMINAL, terminal))
   {
-    error_message_box("Storing settings");
+    error_message_box(_("Storing settings"));
   }
 }

gui/studio.c

@@ -95 +95 @@
   {
   case JACK_STATE_NA:
-    tooltip = status = "JACK is sick";
+    tooltip = status = _("JACK is sick");
     status_image_path = STATUS_ICON_ERROR;
     break;
   case JACK_STATE_STOPPED:
-    status = "Stopped";
+    status = _("Stopped");
     break;
   case JACK_STATE_STARTED:
-    status = "xruns";
+    status = _("xruns");
     break;
   default:
     status = "???";
-    tooltip = "Internal error - unknown jack state";
+    tooltip = _("Internal error - unknown jack state");
     status_image_path = STATUS_ICON_ERROR;
   }
@@ -115 +115 @@
   {
   case STUDIO_STATE_NA:
-    name = "ladishd is down";
+    name = _("ladishd is down");
     status_image_path = STATUS_ICON_DOWN;
     break;
   case STUDIO_STATE_SICK:
   case STUDIO_STATE_UNKNOWN:
-    tooltip = name = "ladishd is sick";
+    tooltip = name = _("ladishd is sick");
     status_image_path = STATUS_ICON_ERROR;
     break;
   case STUDIO_STATE_UNLOADED:
-    name = "No studio loaded";
+    name = _("No studio loaded");
     status_image_path = STATUS_ICON_UNLOADED;
     break;
   case STUDIO_STATE_CRASHED:
-    status = "Crashed";
-    tooltip = "Crashed studio, save your work if you can and unload the studio";
+    status = _("Crashed");
+    tooltip = _("Crashed studio, save your work if you can and unload the studio");
     status_image_path = STATUS_ICON_ERROR;
     /* fall through */
@@ -136 +136 @@
     if (!studio_proxy_get_name(&buffer))
     {
-      tooltip = "failed to get studio name";
-      log_error("%s", tooltip);
+      tooltip = _("failed to get studio name");
+      log_error("failed to get studio name");
       status_image_path = STATUS_ICON_ERROR;
     }
@@ -147 +147 @@
       case STUDIO_STATE_STARTED:
         status_image_path = jack_xruns() ? STATUS_ICON_WARNING : STATUS_ICON_STARTED;
-        tooltip = "Studio is started";
+        tooltip = _("Studio is started");
         break;
       case STUDIO_STATE_STOPPED:
         status_image_path = STATUS_ICON_STOPPED;
-        tooltip = "Studio is stopped";
+        tooltip = _("Studio is stopped");
         break;
       }
@@ -158 +158 @@
   default:
     name = "???";
-    tooltip = "Internal error - unknown studio state";
+    tooltip = _("Internal error - unknown studio state");
     status_image_path = STATUS_ICON_ERROR;
   }
@@ -223 +223 @@
   g_studio_state = STUDIO_STATE_CRASHED;
   studio_state_changed(NULL);
-  error_message_box("JACK crashed or stopped unexpectedly. Save your work, then unload and reload the studio.");
+  error_message_box(_("JACK crashed or stopped unexpectedly. Save your work, then unload and reload the studio."));
 }
 
@@ -240 +240 @@
   if (!studio_proxy_save())
   {
-    error_message_box("Studio save failed, please inspect logs.");
+    error_message_box(_("Studio save failed, please inspect logs."));
   }
 }
@@ -250 +250 @@
   log_info("save as studio request");
 
-  if (name_dialog("Save studio as", "Studio name", "", &new_name))
+  if (name_dialog(_("Save studio as"), _("Studio name"), "", &new_name))
   {
     if (!studio_proxy_save_as(new_name))
     {
-      error_message_box("Saving of studio failed, please inspect logs.");
+      error_message_box(_("Saving of studio failed, please inspect logs."));
     }
 
@@ -266 +266 @@
   if (!studio_proxy_start())
   {
-    error_message_box("Studio start failed, please inspect logs.");
+    error_message_box(_("Studio start failed, please inspect logs."));
   }
 }
@@ -275 +275 @@
   if (!studio_proxy_stop())
   {
-    error_message_box("Studio stop failed, please inspect logs.");
+    error_message_box(_("Studio stop failed, please inspect logs."));
   }
 }
@@ -284 +284 @@
   if (!studio_proxy_unload())
   {
-    error_message_box("Studio unload failed, please inspect logs.");
+    error_message_box(_("Studio unload failed, please inspect logs."));
   }
 }
@@ -292 +292 @@
   char * new_name;
 
-  if (name_dialog("Rename studio", "Studio name", get_view_name(g_studio_view), &new_name))
+  if (name_dialog(_("Rename studio"), _("Studio name"), get_view_name(g_studio_view), &new_name))
   {
     if (!studio_proxy_rename(new_name))
     {
-      error_message_box("Studio rename failed, please inspect logs.");
+      error_message_box(_("Studio rename failed, please inspect logs."));
     }
 

gui/world_tree.c

@@ -31 +31 @@
 #include "menu.h"
 
+#include <libintl.h>
+
 enum entry_type
 {
@@ -251 +253 @@
   if (!ladish_app_supervisor_get_app_properties(proxy, id, &name, &command, &running, &terminal, &level))
   {
-    error_message_box("Cannot get app properties");
+    error_message_box(_("Cannot get app properties"));
     return;
   }
@@ -290 +292 @@
 
   gtk_window_set_focus(GTK_WINDOW(g_app_dialog), running ? GTK_WIDGET(name_entry) : GTK_WIDGET(command_entry));
-  gtk_window_set_title(GTK_WINDOW(g_app_dialog), "App properties");
+  gtk_window_set_title(GTK_WINDOW(g_app_dialog), _("App properties"));
 
   gtk_widget_show(g_app_dialog);
@@ -323 +325 @@
     if (!ladish_app_supervisor_set_app_properties(proxy, id, gtk_entry_get_text(name_entry), gtk_entry_get_text(command_entry), gtk_toggle_button_get_active(terminal_button), level))
     {
-      error_message_box("Cannot set app properties.");
+      error_message_box(_("Cannot set app properties."));
     }
   }
@@ -366 +368 @@
     if (running)
     {
-      menuitem = gtk_menu_item_new_with_label("Stop");
+      menuitem = gtk_menu_item_new_with_label(_("Stop"));
       g_signal_connect(menuitem, "activate", (GCallback)on_popup_menu_action_app_stop, NULL);
       gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
-      menuitem = gtk_menu_item_new_with_label("Kill");
+      menuitem = gtk_menu_item_new_with_label(_("Kill"));
       g_signal_connect(menuitem, "activate", (GCallback)on_popup_menu_action_app_kill, NULL);
       gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
@@ -376 +378 @@
     else
     {
-      menuitem = gtk_menu_item_new_with_label("Start");
+      menuitem = gtk_menu_item_new_with_label(_("Start"));
       g_signal_connect(menuitem, "activate", (GCallback)on_popup_menu_action_app_start, NULL);
       gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
     }
 
-    menuitem = gtk_menu_item_new_with_label("Properties");
+    menuitem = gtk_menu_item_new_with_label(_("Properties"));
     g_signal_connect(menuitem, "activate", (GCallback)on_popup_menu_action_app_properties, NULL);
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
@@ -388 +390 @@
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
-    menuitem = gtk_menu_item_new_with_label("Remove");
+    menuitem = gtk_menu_item_new_with_label(_("Remove"));
     g_signal_connect(menuitem, "activate", (GCallback)on_popup_menu_action_app_remove, NULL);
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
@@ -490 +492 @@
 
   col = gtk_tree_view_column_new();
-  gtk_tree_view_column_set_title(col, "Name");
+  gtk_tree_view_column_set_title(col, _("Name"));
   gtk_tree_view_append_column(GTK_TREE_VIEW(g_world_tree_widget), col);
   renderer = gtk_cell_renderer_text_new();
@@ -650 +652 @@
   }
 
-  app_name_with_status = catdup3(level_string, running ? " " : " (inactive) ", app_name);
+  app_name_with_status = catdup3(level_string, running ? " " : _(" (inactive) "), app_name);
   if (app_name_with_status == NULL)
   {

wscript

@@ -221 +221 @@
 
     conf.env['DATA_DIR'] = os.path.normpath(os.path.join(conf.env['PREFIX'], 'share', APPNAME))
+    conf.env['LOCALE_DIR'] = os.path.normpath(os.path.join(conf.env['PREFIX'], 'share', 'locale'))
 
     # write some parts of the configure environment to the config.h file
     conf.define('DATA_DIR', conf.env['DATA_DIR'])
+    conf.define('LOCALE_DIR', conf.env['LOCALE_DIR'])
     conf.define('PACKAGE_VERSION', VERSION)
     conf.define('DBUS_NAME_BASE', DBUS_NAME_BASE)
@@ -589 +591 @@
                 pprint('CYAN', "doxygen documentation already built.")
 
+    # Translations
+    # TODO: Rewrite using waf functionality
+    po_list = os.listdir('./po')
+    if po_list.__len__() > 0:
+      for po_list_item in po_list:
+        item = po_list_item.rsplit('.', 1)
+        if item[1] == "po":
+          pprint('CYAN', "Preparing translation '"+item[0]+"'")
+          os.system("msgfmt ./po/"+po_list_item+" -o ./po/"+item[0]+".mo")
+          bld.install_as(('${LOCALE_DIR}/'+item[0]+'/LC_MESSAGES/gladish.mo'), ('./po/'+item[0]+".mo"))
+
 def get_tags_dirs():
     source_root = os.path.dirname(Utils.g_module.root_path)

AUTHORS

@@ -1 +1 @@
 Nedko Arnaudov <nedko@arnaudov.name>
 Nikita Zlobin <cook60020tmp@mail.ru>
+Filipe Alexandre Lopes Coelho <falktx@gmail.com>
 
 This project borrowed code that was written/modified by:

daemon/room_load.c

@@ -387 +387 @@
         if (context_ptr->port == NULL)
         {
-          log_info("app port \"%s\" with uuid %s not found in the jack graph", name_dup, uuid_str);
+          log_error("app port \"%s\" with uuid %s not found in the jack graph", name_dup, uuid_str);
           context_ptr->error = XML_TRUE;
           ladish_graph_dump(ladish_studio_get_jack_graph());

gui/gtk_builder.c

@@ -32 +32 @@
 
 GtkBuilder * g_builder;
+
+void set_main_window_icon(void)
+{
+  GError * error;
+
+  gtk_window_set_icon_from_file(GTK_WINDOW(get_gtk_builder_widget("main_win")),
+                                DATA_DIR "/ladish-logo-128x128.png",
+                                &error);
+}
 
 bool init_gtk_builder(void)
@@ -73 +82 @@
   }
 
+  set_main_window_icon();
+
   return true;
 }