updated pot file, simplified and removed some strings to translate

naxuroqa · Aug 14, 2014 · b65b173 · b65b173
1 parent 7083e0d
commit b65b173
Show file tree

Hide file tree

Showing 10 changed files with 2,037 additions and 2,672 deletions.
diff --git a/po/Venom.pot b/po/Venom.pot
diff --git a/po/de.po b/po/de.po
diff --git a/po/fr.po b/po/fr.po
diff --git a/po/it.po b/po/it.po
diff --git a/po/ru.po b/po/ru.po
diff --git a/src/core/Message.vala b/src/core/Message.vala
@@ -44,7 +44,7 @@ namespace Venom {
      *  Get plain time string
      */
     public virtual string get_time_plain() {
-      return timestamp.format(_("%R:%S"));
+      return timestamp.format("%R:%S");
     }
 
     public abstract string get_notification_header();
@@ -89,7 +89,7 @@ namespace Venom {
       return message;
     }
     public virtual string get_notification_header() {
-      return get_sender_plain() + _(" says:");
+      return _("%s says:").printf(get_sender_plain());
     }
     public Gdk.Pixbuf get_sender_image() {
       return from.image ?? ResourceFactory.instance.default_contact;
@@ -168,7 +168,7 @@ namespace Venom {
       return message;
     }
     public virtual string get_notification_header() {
-      return from_contact.get_name_string() + _(" in ") + from.get_name_string() + _(" says:");
+      return _("%s in %s says:").printf(from_contact.get_name_string(), from.get_name_string());
     }
     public Gdk.Pixbuf get_sender_image() {
       return from.image ?? ResourceFactory.instance.default_groupchat;
@@ -213,7 +213,7 @@ namespace Venom {
       return "%s %s".printf(message_direction == MessageDirection.INCOMING ? from_contact.name : User.instance.name, message);
     }
     public override string get_notification_header() {
-      return from_contact.get_name_string() + _(" in ") + from.get_name_string() + ":";
+      return _("%s in %s:").printf(from_contact.get_name_string(), from.get_name_string());
     }
   }
 }
diff --git a/src/core/MessageLog.vala b/src/core/MessageLog.vala
@@ -176,7 +176,7 @@ namespace Venom {
 
       //create table and index if needed
       if (db.exec (QUERY_TABLE_HISTORY, null, out errmsg) != Sqlite.OK) {
-        throw new SqliteDbError.QUERY(_("Error creating message log table: %s\n"), errmsg);
+        throw new SqliteDbError.QUERY("Error creating message log table: %s\n", errmsg);
       }
 
       //prepare insert statement for adding new history messages

diff --git a/src/ui/ContactListWindow.vala b/src/ui/ContactListWindow.vala
@@ -516,7 +516,7 @@ namespace Venom {
     }
 
     private void set_title_from_status(UserStatus status) {
-      this.our_title = _("Venom (%s)").printf(status.to_string());
+      this.our_title = "Venom (%s)".printf(status.to_string());
       string notify = "";
       if (this.get_urgency_hint()) {
         notify = "* ";
@@ -636,7 +636,7 @@ namespace Venom {
     public void set_urgency () {
       if(!is_active && Settings.instance.enable_urgency_notification) {
         this.set_urgency_hint(true);
-        this.set_title(_("* %s").printf(this.our_title));
+        this.set_title("* %s".printf(this.our_title));
       }
     }
 
@@ -664,7 +664,7 @@ namespace Venom {
                                   Gtk.MessageType.QUESTION,
                                   Gtk.ButtonsType.NONE,
                                   _("New friend request from '%s'.\nDo you want to accept?"), public_key_string);
-      message_dialog.add_buttons("_Cancel", Gtk.ResponseType.CANCEL, "_Accept", Gtk.ResponseType.ACCEPT, null);
+      message_dialog.add_buttons(_("_Cancel"), Gtk.ResponseType.CANCEL, _("_Accept"), Gtk.ResponseType.ACCEPT, null);
       message_dialog.secondary_text = message;
           int response = message_dialog.run();
           message_dialog.destroy();
@@ -1193,7 +1193,7 @@ namespace Venom {
                                   Gtk.DialogFlags.MODAL,
                                   Gtk.MessageType.WARNING,
                                   Gtk.ButtonsType.NONE,
-                                  _("Are you sure you want to delete '%s' from your contact list?"), name);
+                                  _("Are you sure you want to remove '%s' from your contact list?"), name);
       message_dialog.add_buttons("_Cancel", Gtk.ResponseType.CANCEL, "_Delete", Gtk.ResponseType.OK, null);
       int response = message_dialog.run();
       message_dialog.destroy();
@@ -1225,12 +1225,12 @@ namespace Venom {
     public void remove_groupchat(GroupChat g) {
       if(g == null)
         return;
-      string name = _("groupchat #%i").printf(g.group_id);
+      string name = "groupchat #%i".printf(g.group_id);
       Gtk.MessageDialog message_dialog = new Gtk.MessageDialog (this,
                                   Gtk.DialogFlags.MODAL,
                                   Gtk.MessageType.WARNING,
                                   Gtk.ButtonsType.NONE,
-                                  _("Are you sure you want to delete '%s' from your contact list?"), name);
+                                  _("Are you sure you want to remove '%s' from your contact list?"), name);
       message_dialog.add_buttons("_Cancel", Gtk.ResponseType.CANCEL, "_Delete", Gtk.ResponseType.OK, null);
       int response = message_dialog.run();
       message_dialog.destroy();

diff --git a/src/ui/FileTransferChatEntry.vala b/src/ui/FileTransferChatEntry.vala
@@ -70,7 +70,7 @@ namespace Venom {
 
     private void update_progress(uint64 bytes_processed, uint64 file_size) {
       double progress = (double) bytes_processed / file_size;
-      Idle.add( () => {progress_bar.set_fraction(progress);return false;} );
+      Idle.add( () => { progress_bar.set_fraction(progress); return false; } );
     }
 
     private void disable_buttons(){
@@ -152,10 +152,10 @@ namespace Venom {
         return;
       }
 
-      Gtk.FileChooserDialog file_selection_dialog = new Gtk.FileChooserDialog(_("Save file"),null,
+      Gtk.FileChooserDialog file_selection_dialog = new Gtk.FileChooserDialog(_("Save file"), null,
                                                                               Gtk.FileChooserAction.SAVE,
-                                                                              "_Cancel", Gtk.ResponseType.CANCEL,
-                                                                              _("Save"), Gtk.ResponseType.ACCEPT);
+                                                                              _("_Cancel"), Gtk.ResponseType.CANCEL,
+                                                                              _("_Save"), Gtk.ResponseType.ACCEPT);
       file_selection_dialog.do_overwrite_confirmation = true;
       file_selection_dialog.set_current_name(ft.name);
       int res = file_selection_dialog.run();

diff --git a/src/ui/UITools.vala b/src/ui/UITools.vala
@@ -147,9 +147,9 @@ namespace Venom {
         _("Export tox data file"),
         parent,
         Gtk.FileChooserAction.SAVE,
-        "_Cancel",
+        _("_Cancel"),
 				Gtk.ResponseType.CANCEL,
-				"_Save",
+				_("_Save"),
 				Gtk.ResponseType.ACCEPT
       );
       dialog.set_filename(ResourceFactory.instance.data_filename);