localization updates

5 files changed, 28 insertions, 20 deletions

diff --git a/deadbeef.desktop.in b/deadbeef.desktop.in
index e08bb5a8..b85e009a 100644
--- a/deadbeef.desktop.in
+++ b/deadbeef.desktop.in
@@ -1,10 +1,13 @@
 [Desktop Entry]
+Encoding=UTF-8
 Name=DeaDBeeF
 GenericName=Audio Player
-Comment=Play music
+Comment=Listen to music
 Exec=deadbeef %F
 MimeType=application/ogg;audio/x-vorbis+ogg;application/x-ogg;audio/mp3;audio/prs.sid;audio/x-flac;audio/mpeg;audio/x-mpeg;audio/x-mod;audio/x-it;audio/x-s3m;audio/x-xm
 Categories=AudioVideo;Player
 Terminal=false
 Type=Application
 Icon=deadbeef
+GenericName[ru]=Аудио плеер
+Comment[ru]=Слушай музыку
diff --git a/plugins/gtkui/callbacks.c b/plugins/gtkui/callbacks.c
index 4d967bc7..81183a66 100644
--- a/plugins/gtkui/callbacks.c
+++ b/plugins/gtkui/callbacks.c
@@ -661,7 +661,7 @@ void
 on_help1_activate                      (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-    show_info_window (DOCDIR "/help.txt", "Help", &helpwindow);
+    show_info_window (DOCDIR "/help.txt", _("Help"), &helpwindow);
 }
 
 static GtkWidget *aboutwindow;
@@ -670,7 +670,9 @@ void
 on_about1_activate                     (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-    show_info_window (DOCDIR "/about.txt", "About DeaDBeeF " VERSION, &aboutwindow);
+    char s[200];
+    snprintf (s, sizeof (s), _("About DeaDBeeF %s"), VERSION);
+    show_info_window (DOCDIR "/about.txt", s, &aboutwindow);
 }
 
 static GtkWidget *changelogwindow;
@@ -679,7 +681,9 @@ void
 on_changelog1_activate                 (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-    show_info_window (DOCDIR "/ChangeLog", "DeaDBeeF " VERSION " ChangeLog", &changelogwindow);
+    char s[200];
+    snprintf (s, sizeof (s), _("DeaDBeeF %s ChangeLog"), VERSION);
+    show_info_window (DOCDIR "/ChangeLog", s, &changelogwindow);
 }
 
 static GtkWidget *gplwindow;
diff --git a/plugins/gtkui/deadbeef.glade b/plugins/gtkui/deadbeef.glade
index 9252035f..593fcdb8 100644
--- a/plugins/gtkui/deadbeef.glade
+++ b/plugins/gtkui/deadbeef.glade
@@ -6,7 +6,7 @@
 <widget class="GtkWindow" id="mainwin">
   <property name="visible">True</property>
   <property name="events">GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK</property>
-  <property name="title" translatable="yes">DeaDBeeF</property>
+  <property name="title">DeaDBeeF</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
@@ -594,7 +594,7 @@
 		  <child>
 		    <widget class="GtkMenuItem" id="gpl1">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_GPLv2</property>
+		      <property name="label">_GPLv2</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_gpl1_activate" last_modification_time="Wed, 06 Jan 2010 20:30:20 GMT"/>
 		    </widget>
@@ -603,7 +603,7 @@
 		  <child>
 		    <widget class="GtkMenuItem" id="lgpl1">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_LGPLv2.1</property>
+		      <property name="label">_LGPLv2.1</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_lgpl1_activate" last_modification_time="Wed, 06 Jan 2010 20:30:20 GMT"/>
 		    </widget>
@@ -1893,7 +1893,7 @@
 		      <child>
 			<widget class="GtkLabel" id="label86">
 			  <property name="visible">True</property>
-			  <property name="label">_Cancel</property>
+			  <property name="label" translatable="yes">_Cancel</property>
 			  <property name="use_underline">True</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1968,7 +1968,7 @@
 		      <child>
 			<widget class="GtkLabel" id="label85">
 			  <property name="visible">True</property>
-			  <property name="label">_OK</property>
+			  <property name="label" translatable="yes">_OK</property>
 			  <property name="use_underline">True</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2361,7 +2361,7 @@ Example: %a - %t [%l]</property>
 		      <child>
 			<widget class="GtkLabel" id="label91">
 			  <property name="visible">True</property>
-			  <property name="label">_Close</property>
+			  <property name="label" translatable="yes">_Close</property>
 			  <property name="use_underline">True</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3772,7 +3772,7 @@ Album</property>
 		  <child>
 		    <widget class="GtkComboBox" id="pref_network_proxytype">
 		      <property name="visible">True</property>
-		      <property name="items" translatable="yes">HTTP
+		      <property name="items">HTTP
 HTTP_1_0
 SOCKS4
 SOCKS5
@@ -4239,7 +4239,7 @@ SOCKS5_HOSTNAME</property>
 		  <child>
 		    <widget class="GtkLabel" id="label68">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;MP3&lt;/b&gt;</property>
+		      <property name="label">&lt;b&gt;MP3&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4411,7 +4411,7 @@ SOCKS5_HOSTNAME</property>
 		      <child>
 			<widget class="GtkLabel" id="label70">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">&lt;b&gt;APE&lt;/b&gt;</property>
+			  <property name="label">&lt;b&gt;APE&lt;/b&gt;</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">True</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4577,7 +4577,7 @@ SOCKS5_HOSTNAME</property>
 		      <child>
 			<widget class="GtkLabel" id="label79">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">&lt;b&gt;WavPack&lt;/b&gt;</property>
+			  <property name="label">&lt;b&gt;WavPack&lt;/b&gt;</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">True</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -5126,7 +5126,7 @@ SOCKS5_HOSTNAME</property>
 		      <child>
 			<widget class="GtkLabel" id="label94">
 			  <property name="visible">True</property>
-			  <property name="label">_Cancel</property>
+			  <property name="label" translatable="yes">_Cancel</property>
 			  <property name="use_underline">True</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -5201,7 +5201,7 @@ SOCKS5_HOSTNAME</property>
 		      <child>
 			<widget class="GtkLabel" id="label93">
 			  <property name="visible">True</property>
-			  <property name="label">_OK</property>
+			  <property name="label" translatable="yes">_OK</property>
 			  <property name="use_underline">True</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -5387,7 +5387,7 @@ SOCKS5_HOSTNAME</property>
 		      <child>
 			<widget class="GtkLabel" id="label95">
 			  <property name="visible">True</property>
-			  <property name="label">_Cancel</property>
+			  <property name="label" translatable="yes">_Cancel</property>
 			  <property name="use_underline">True</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -5462,7 +5462,7 @@ SOCKS5_HOSTNAME</property>
 		      <child>
 			<widget class="GtkLabel" id="label96">
 			  <property name="visible">True</property>
-			  <property name="label">_OK</property>
+			  <property name="label" translatable="yes">_OK</property>
 			  <property name="use_underline">True</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
diff --git a/po/POTFILES b/po/POTFILES
index d75151a1..1d0fae8c 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -12,4 +12,5 @@
      ../plugins/gtkui/trkproperties.c \
      ../main.c \
      ../playlist.c \
-     ../plugins.c
+     ../plugins.c \
+     ../deadbeef.desktop.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 34260080..45a2a59b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -13,4 +13,4 @@ plugins/gtkui/trkproperties.c
 main.c
 playlist.c
 plugins.c
-
+deadbeef.desktop.in