commit 40b7f5935d16901d8e56611f44be3b96e22704dd
Author: Daniele Forsi <dani...@forsi.it>
Date:   Sun Dec 19 12:32:59 2010 +0100

    String fixes
    
    * plugins/playlist_display/plugin.c
    * libgtkpod/misc_playlist.c
     * Change "ipod" and to "iPod" in some command descriptions.
    
    * data/ui/gtkpod.ui
    * src/anjuta-actions.h
     * Change "Anjuta" to "gtkpod" in some command names and descriptions.
    
    * data/glade/gtkpod.glade
    * plugins/core_preferences/core_prefs.xml
    * plugins/media_player/media_player.glade
    * plugins/photo_editor/photo_editor.glade
    * plugins/repository_editor/repository_editor.glade
    * plugins/sorttab_display/sorttab_display.glade
     * Make some strings translatable/not translatable.
    
    * libgtkpod/misc_playlist.c
     * Change "iPOD" to "iPod".
    
    * libgtkpod/gtkpod_app_iface.c
    * po/*.po
     * Remove unneeded space, also in translations.

 data/glade/gtkpod.glade                           |    2 +-
 data/ui/gtkpod.ui                                 |    4 ++--
 libgtkpod/gtkpod_app_iface.c                      |    3 ++-
 libgtkpod/misc_playlist.c                         |    4 ++--
 plugins/core_preferences/core_prefs.xml           |    2 +-
 plugins/media_player/media_player.glade           |    2 +-
 plugins/photo_editor/photo_editor.glade           |   16 ++++++++--------
 plugins/playlist_display/plugin.c                 |   10 +++++-----
 plugins/repository_editor/repository_editor.glade |    4 ++--
 plugins/sorttab_display/sorttab_display.glade     |    2 +-
 po/ca.po                                          |    4 ++--
 po/de.po                                          |    4 ++--
 po/es.po                                          |    4 ++--
 po/fr.po                                          |    4 ++--
 po/he.po                                          |    4 ++--
 po/it.po                                          |    4 ++--
 po/ja.po                                          |    2 +-
 po/ro.po                                          |    4 ++--
 po/ru.po                                          |    4 ++--
 po/sv.po                                          |    4 ++--
 po/zh_CN.po                                       |    4 ++--
 src/anjuta-actions.h                              |   12 ++++++------
 22 files changed, 52 insertions(+), 51 deletions(-)
---
diff --git a/data/glade/gtkpod.glade b/data/glade/gtkpod.glade
index df7cc7a..9b63408 100644
--- a/data/glade/gtkpod.glade
+++ b/data/glade/gtkpod.glade
@@ -41,7 +41,7 @@
                     <property name="can_focus">True</property>
                     <property name="xalign">0</property>
                     <property name="yalign">0</property>
-                    <property name="label" 
translatable="yes">label21</property>
+                    <property name="label">label</property>
                     <property name="wrap">True</property>
                     <property name="selectable">True</property>
                   </widget>
diff --git a/data/ui/gtkpod.ui b/data/ui/gtkpod.ui
index 9a63847..8a8ca22 100755
--- a/data/ui/gtkpod.ui
+++ b/data/ui/gtkpod.ui
@@ -42,14 +42,14 @@
                                </placeholder>
                                <placeholder name="PlaceHolderHelpWeb" >
                                        <separator name="separator1" />
-                                       <menuitem name="AnjutaHome" 
action="ActionHelpAnjutaHome" />
+                                       <menuitem name="GtkpodHome" 
action="ActionHelpGtkpodHome" />
                                        <menuitem name="BugReport" 
action="ActionHelpBugReport" />
                                        <menuitem name="Faq" 
action="ActionHelpFaq" />
                                </placeholder>
                                <placeholder name="PlaceHolderHelpAbout" >
                                        <separator name="separator2" />
                                        <menuitem name="AboutPlugins" 
action="ActionAboutPlugins" />
-                                       <menuitem name="AboutAnjuta" 
action="ActionAboutAnjuta" />
+                                       <menuitem name="AboutGtkpod" 
action="ActionAboutGtkpod" />
                                </placeholder>
                        </menu>
                </placeholder>
diff --git a/libgtkpod/gtkpod_app_iface.c b/libgtkpod/gtkpod_app_iface.c
index 303e0df..542bb49 100644
--- a/libgtkpod/gtkpod_app_iface.c
+++ b/libgtkpod/gtkpod_app_iface.c
@@ -216,7 +216,8 @@ void gtkpod_tracks_statusbar_update(void) {
         gint trknr = g_list_length(pl->members);
         g_return_if_fail (itdb);
 
-        buf = g_strdup_printf(_(" P:%d T:%d/%d"), itdb_playlists_number(itdb) 
- 1, trknr, itdb_tracks_number(itdb));
+        /* Translators: this is total number of playlists ("P") and number of 
tracks ("T") in the selected playlist / total number of tracks */
+        buf = g_strdup_printf(_("P:%d T:%d/%d"), itdb_playlists_number(itdb) - 
1, trknr, itdb_tracks_number(itdb));
     }
     else {
         buf = g_strdup("");
diff --git a/libgtkpod/misc_playlist.c b/libgtkpod/misc_playlist.c
index 03dbc94..b01c109 100644
--- a/libgtkpod/misc_playlist.c
+++ b/libgtkpod/misc_playlist.c
@@ -673,7 +673,7 @@ static void treeValueDestroy(gpointer value) {
 }
 
 /* call back function for traversing what is left from the tree -
- * dangling files - files present in DB but not present physically on iPOD.
+ * dangling files - files present in DB but not present physically on iPod.
  * It adds found tracks to the dandling list so user can see what is missing
  * and then decide on what to do with them */
 gboolean remove_dangling(gpointer key, gpointer value, gpointer pl_dangling) {
@@ -918,7 +918,7 @@ void check_db(iTunesDB *itdb) {
         g_strfreev(tokens);
     }
 
-    gtkpod_statusbar_message(_("Checking iPOD files against known files in 
DB"));
+    gtkpod_statusbar_message(_("Checking iPod files against known files in 
DB"));
     gtkpod_tracks_statusbar_update();
     process_gtk_events_blocked();
 
diff --git a/plugins/core_preferences/core_prefs.xml 
b/plugins/core_preferences/core_prefs.xml
index 9db4d47..9d378fa 100644
--- a/plugins/core_preferences/core_prefs.xml
+++ b/plugins/core_preferences/core_prefs.xml
@@ -57,7 +57,7 @@
     </data>
   </object>
   <object class="GtkTextBuffer" id="textbuffer1">
-    <property name="text">Normally, the encoding specified above will only be 
used when importing new tracks, and for any operations involving existing 
tracks, the encoding specified when the file was first imported will be used. 
You can use the options below to override this behavior, in case you specified 
the encoding incorrectly for the first import.</property>
+    <property name="text" translatable="yes">Normally, the encoding specified 
above will only be used when importing new tracks, and for any operations 
involving existing tracks, the encoding specified when the file was first 
imported will be used. You can use the options below to override this behavior, 
in case you specified the encoding incorrectly for the first import.</property>
   </object>
   <object class="GtkDialog" id="prefs_encoding_dialog">
     <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
diff --git a/plugins/media_player/media_player.glade 
b/plugins/media_player/media_player.glade
index a7edece..8f6d75f 100644
--- a/plugins/media_player/media_player.glade
+++ b/plugins/media_player/media_player.glade
@@ -25,7 +25,7 @@
             <child>
               <widget class="GtkLabel" id="song_time_label">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">00:00:00</property>
+                <property name="label">00:00:00</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
diff --git a/plugins/photo_editor/photo_editor.glade 
b/plugins/photo_editor/photo_editor.glade
index f895ffe..18214a4 100644
--- a/plugins/photo_editor/photo_editor.glade
+++ b/plugins/photo_editor/photo_editor.glade
@@ -32,7 +32,7 @@
                           <widget class="GtkMenu" 
id="photo_album_menuItem_menu">
                             <child>
                               <widget class="GtkImageMenuItem" 
id="photo_add_album_menuItem">
-                                <property name="label">_Add Album</property>
+                                <property name="label" translatable="yes">_Add 
Album</property>
                                 <property name="visible">True</property>
                                 <property name="use_underline">True</property>
                                 <property name="use_stock">False</property>
@@ -47,7 +47,7 @@
                             </child>
                             <child>
                               <widget class="GtkImageMenuItem" 
id="photo_remove_album_menuItem">
-                                <property name="label">_Remove Album</property>
+                                <property name="label" 
translatable="yes">_Remove Album</property>
                                 <property name="visible">True</property>
                                 <property name="use_underline">True</property>
                                 <property name="use_stock">False</property>
@@ -87,7 +87,7 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" 
id="photo_photos_menuitem">
-                        <property name="label">_Photos</property>
+                        <property name="label" 
translatable="yes">_Photos</property>
                         <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">False</property>
@@ -95,7 +95,7 @@
                           <widget class="GtkMenu" 
id="photo_photos_menuitem_menu">
                             <child>
                               <widget class="GtkImageMenuItem" 
id="photo_add_image_menuItem">
-                                <property name="label">_Add Image</property>
+                                <property name="label" translatable="yes">_Add 
Image</property>
                                 <property name="visible">True</property>
                                 <property name="use_underline">True</property>
                                 <property name="use_stock">False</property>
@@ -110,7 +110,7 @@
                             </child>
                             <child>
                               <widget class="GtkImageMenuItem" 
id="photo_add_image_dir_menuItem">
-                                <property name="label">Add Image_s</property>
+                                <property name="label" translatable="yes">Add 
Image_s</property>
                                 <property name="visible">True</property>
                                 <property name="tooltip" 
translatable="yes">Add Images from a Directory</property>
                                 <property name="use_underline">True</property>
@@ -126,7 +126,7 @@
                             </child>
                             <child>
                               <widget class="GtkImageMenuItem" 
id="photo_remove_image_menuItem">
-                                <property name="label">_Remove 
Images</property>
+                                <property name="label" 
translatable="yes">_Remove Images</property>
                                 <property name="visible">True</property>
                                 <property name="use_underline">True</property>
                                 <property name="use_stock">False</property>
@@ -151,7 +151,7 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" 
id="photo_zoom_menuitem">
-                        <property name="label">_Zoom</property>
+                        <property name="label" 
translatable="yes">_Zoom</property>
                         <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">False</property>
@@ -159,7 +159,7 @@
                           <widget class="GtkMenu" 
id="photo_zoom_menuitem_menu">
                             <child>
                               <widget class="GtkImageMenuItem" 
id="photo_view_full_size_menuItem">
-                                <property name="label">_View Full 
Size</property>
+                                <property name="label" 
translatable="yes">_View Full Size</property>
                                 <property name="visible">True</property>
                                 <property name="use_underline">True</property>
                                 <property name="use_stock">False</property>
diff --git a/plugins/playlist_display/plugin.c 
b/plugins/playlist_display/plugin.c
index 79c7b8e..87e3cdc 100644
--- a/plugins/playlist_display/plugin.c
+++ b/plugins/playlist_display/plugin.c
@@ -59,7 +59,7 @@ static GtkActionEntry playlist_actions[] =
             PLAYLIST_DISPLAY_READ_ICON_STOCK_ID, /* Stock icon */
             N_("_Load iPod(s)"), /* Display label */
             NULL, /* short-cut */
-            N_("Load all currently listed ipods"), /* Tooltip */
+            N_("Load all currently listed iPods"), /* Tooltip */
             G_CALLBACK (on_load_ipods_mi) /* callback */
         },
         {
@@ -75,7 +75,7 @@ static GtkActionEntry playlist_actions[] =
             PLAYLIST_DISPLAY_ADD_FILES_ICON_STOCK_ID, /* Stock icon */
             N_("Add _Files"), /* Display label */
             NULL, /* short-cut */
-            N_("Add files to selected ipod"), /* Tooltip */
+            N_("Add files to selected iPod"), /* Tooltip */
             G_CALLBACK (on_create_add_files) /* callback */
         },
         {
@@ -83,7 +83,7 @@ static GtkActionEntry playlist_actions[] =
             PLAYLIST_DISPLAY_ADD_DIRS_ICON_STOCK_ID, /* Stock icon */
             N_("Add Fol_der"), /* Display label */
             NULL, /* short-cut */
-            N_("Add folder contents to selected ipod"), /* Tooltip */
+            N_("Add folder contents to selected iPod"), /* Tooltip */
             G_CALLBACK (on_create_add_directory) /* callback */
         },
         {
@@ -91,7 +91,7 @@ static GtkActionEntry playlist_actions[] =
             PLAYLIST_DISPLAY_ADD_PLAYLISTS_ICON_STOCK_ID, /* Stock icon */
             N_("Add _Playlist"), /* Display label */
             NULL, /* short-cut */
-            N_("Add playlist to selected ipod"), /* Tooltip */
+            N_("Add playlist to selected iPod"), /* Tooltip */
             G_CALLBACK (on_create_add_playlists) /* callback */
         },
         {
@@ -317,7 +317,7 @@ static gboolean activate_plugin(AnjutaPlugin *plugin) {
         = anjuta_ui_add_action_group_entries(ui, "ActionGroupPlaylistDisplay", 
_("Playlist Display"), playlist_actions, G_N_ELEMENTS (playlist_actions), 
GETTEXT_PACKAGE, TRUE, plugin);
     playlist_display_plugin->action_group = action_group;
 
-    new_playlist_action = tool_menu_action_new (ACTION_NEW_PLAYLIST, _("New 
Playlist"), N_("Create a new playlist for the selected ipod"), GTK_STOCK_NEW);
+    new_playlist_action = tool_menu_action_new (ACTION_NEW_PLAYLIST, _("New 
Playlist"), N_("Create a new playlist for the selected iPod"), GTK_STOCK_NEW);
     g_signal_connect(new_playlist_action, "activate", 
G_CALLBACK(on_new_playlist_activate), NULL);
     gtk_action_group_add_action (playlist_display_plugin->action_group, 
GTK_ACTION (new_playlist_action));
 
diff --git a/plugins/repository_editor/repository_editor.glade 
b/plugins/repository_editor/repository_editor.glade
index 1feffde..54d2f7e 100644
--- a/plugins/repository_editor/repository_editor.glade
+++ b/plugins/repository_editor/repository_editor.glade
@@ -32,7 +32,7 @@
                 <child>
                   <widget class="GtkLabel" id="repository_type_label">
                     <property name="visible">True</property>
-                    <property name="label">&lt;i&gt;Repository 
type&lt;/i&gt;</property>
+                    <property name="label" 
translatable="yes">&lt;i&gt;Repository type&lt;/i&gt;</property>
                     <property name="use_markup">True</property>
                   </widget>
                   <packing>
@@ -814,7 +814,7 @@
                         <child>
                           <widget class="GtkLabel" id="playlist_type_label">
                             <property name="visible">True</property>
-                            <property name="label">&lt;i&gt;Playlist 
type&lt;/i&gt;</property>
+                            <property name="label" 
translatable="yes">&lt;i&gt;Playlist type&lt;/i&gt;</property>
                             <property name="use_markup">True</property>
                           </widget>
                           <packing>
diff --git a/plugins/sorttab_display/sorttab_display.glade 
b/plugins/sorttab_display/sorttab_display.glade
index 54fea42..b4bd57f 100644
--- a/plugins/sorttab_display/sorttab_display.glade
+++ b/plugins/sorttab_display/sorttab_display.glade
@@ -457,7 +457,7 @@ Added
     </child>
   </widget>
   <widget class="GtkWindow" id="special_sorttab">
-    <property name="title" translatable="yes">special_sorttab -- Don't 
translate!</property>
+    <property name="title">special_sorttab -- Don't translate!</property>
     <child>
       <widget class="GtkViewport" id="special_viewport">
         <property name="visible">True</property>
diff --git a/po/ca.po b/po/ca.po
index 6909f05..9551dc0 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -2913,8 +2913,8 @@ msgstr "Salir sin guardar"
 
 #: ../libgtkpod/gtkpod_app_iface.c:219
 #, c-format
-msgid " P:%d T:%d/%d"
-msgstr " P:%d T:%d/%d"
+msgid "P:%d T:%d/%d"
+msgstr "P:%d T:%d/%d"
 
 #. ID
 #. modal,
diff --git a/po/de.po b/po/de.po
index 91b31c9..707571b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2919,8 +2919,8 @@ msgstr "Beende ohne zu speichern"
 
 #: ../libgtkpod/gtkpod_app_iface.c:219
 #, c-format
-msgid " P:%d T:%d/%d"
-msgstr " P:%d S:%d/%d"
+msgid "P:%d T:%d/%d"
+msgstr "P:%d S:%d/%d"
 
 #. ID
 #. modal,
diff --git a/po/es.po b/po/es.po
index 2a7ac67..da673cc 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2916,8 +2916,8 @@ msgstr "Salir sin guardar"
 
 #: ../libgtkpod/gtkpod_app_iface.c:219
 #, c-format
-msgid " P:%d T:%d/%d"
-msgstr " P:%d T:%d/%d"
+msgid "P:%d T:%d/%d"
+msgstr "P:%d T:%d/%d"
 
 #. ID
 #. modal,
diff --git a/po/fr.po b/po/fr.po
index 43fddcc..cca273e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2914,8 +2914,8 @@ msgstr "Quitter sans enregistrer"
 
 #: ../libgtkpod/gtkpod_app_iface.c:219
 #, c-format
-msgid " P:%d T:%d/%d"
-msgstr " L : %d M : %d/%d"
+msgid "P:%d T:%d/%d"
+msgstr "L : %d M : %d/%d"
 
 #. ID
 #. modal,
diff --git a/po/he.po b/po/he.po
index 855f8e6..2d072af 100644
--- a/po/he.po
+++ b/po/he.po
@@ -2866,8 +2866,8 @@ msgstr "יציאה ללא שמירה"
 
 #: ../libgtkpod/gtkpod_app_iface.c:219
 #, c-format
-msgid " P:%d T:%d/%d"
-msgstr " P:%d T:%d/%d"
+msgid "P:%d T:%d/%d"
+msgstr "P:%d T:%d/%d"
 
 #. ID
 #. modal,
diff --git a/po/it.po b/po/it.po
index 256a195..3436b21 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2906,8 +2906,8 @@ msgstr "Chiudi senza salvare"
 
 #: ../libgtkpod/gtkpod_app_iface.c:219
 #, c-format
-msgid " P:%d T:%d/%d"
-msgstr " P:%d T:%d/%d"
+msgid "P:%d T:%d/%d"
+msgstr "P:%d T:%d/%d"
 
 #. ID
 #. modal,
diff --git a/po/ja.po b/po/ja.po
index 6ffdbb7..401c4fc 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2886,7 +2886,7 @@ msgstr ""
 
 #: ../libgtkpod/gtkpod_app_iface.c:219
 #, c-format
-msgid " P:%d T:%d/%d"
+msgid "P:%d T:%d/%d"
 msgstr ""
 
 #. ID
diff --git a/po/ro.po b/po/ro.po
index d23efa1..2a508b4 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2944,8 +2944,8 @@ msgstr ""
 
 #: ../libgtkpod/gtkpod_app_iface.c:219
 #, c-format
-msgid " P:%d T:%d/%d"
-msgstr " L:%d P:%d/%d"
+msgid "P:%d T:%d/%d"
+msgstr "L:%d P:%d/%d"
 
 #. ID
 #. modal,
diff --git a/po/ru.po b/po/ru.po
index c0a4f26..5dc824b 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2936,8 +2936,8 @@ msgstr "Выйти без сохранения"
 
 #: ../libgtkpod/gtkpod_app_iface.c:219
 #, c-format
-msgid " P:%d T:%d/%d"
-msgstr " P:%d T:%d/%d"
+msgid "P:%d T:%d/%d"
+msgstr "P:%d T:%d/%d"
 
 #. ID
 #. modal,
diff --git a/po/sv.po b/po/sv.po
index 679cbee..a24e32f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2880,8 +2880,8 @@ msgstr "Avsluta utan att spara"
 
 #: ../libgtkpod/gtkpod_app_iface.c:219
 #, c-format
-msgid " P:%d T:%d/%d"
-msgstr " L:%d S:%d/%d"
+msgid "P:%d T:%d/%d"
+msgstr "L:%d S:%d/%d"
 
 #. ID
 #. modal,
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ee4152e..68b4322 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2846,8 +2846,8 @@ msgstr "退出并且不保存改动"
 
 #: ../libgtkpod/gtkpod_app_iface.c:219
 #, c-format
-msgid " P:%d T:%d/%d"
-msgstr " P:%d T:%d/%d"
+msgid "P:%d T:%d/%d"
+msgstr "P:%d T:%d/%d"
 
 #. ID
 #. modal,
diff --git a/src/anjuta-actions.h b/src/anjuta-actions.h
index ef54780..5dc49b6 100644
--- a/src/anjuta-actions.h
+++ b/src/anjuta-actions.h
@@ -100,26 +100,26 @@ static GtkActionEntry menu_entries_help[] = {
   { "ActionMenuHelp", NULL, N_("_Help")},
   { "ActionHelpUserManual", GTK_STOCK_HELP,
     N_("_User's Manual"), "F1",
-       N_("Anjuta user's manual"),
+       N_("gtkpod user's manual"),
     G_CALLBACK (on_help_manual_activate)},
-  { "ActionHelpAnjutaHome", GTK_STOCK_HOME,
+  { "ActionHelpGtkpodHome", GTK_STOCK_HOME,
     N_("gtkpod _Home Page"), NULL,
        N_("Online documentation and resources"),
     G_CALLBACK (on_url_home_activate)},
   { "ActionHelpBugReport", NULL,
     N_("Report _Bugs/Patches/Requests"), NULL,
-       N_("Submit a bug report, patch or feature request for Anjuta"),
+       N_("Submit a bug report, patch or feature request for gtkpod"),
     G_CALLBACK (on_url_bugs_activate)},
   { "ActionHelpFaq", NULL,
     N_("Ask a _Question"), NULL,
        N_("Submit a question for FAQs"),
     G_CALLBACK (on_url_faqs_activate)},
-  { "ActionAboutAnjuta", GTK_STOCK_ABOUT,
+  { "ActionAboutGtkpod", GTK_STOCK_ABOUT,
     N_("_About"), NULL,
-       N_("About Anjuta"),
+       N_("About gtkpod"),
     G_CALLBACK (on_about_activate)},
   { "ActionAboutPlugins", GTK_STOCK_ABOUT,
     N_("About External _Plugins"), NULL,
-       N_("About third party Anjuta plugins"),
+       N_("About third party gtkpod plugins"),
     NULL}
 };

------------------------------------------------------------------------------
Forrester recently released a report on the Return on Investment (ROI) of
Google Apps. They found a 300% ROI, 38%-56% cost savings, and break-even
within 7 months.  Over 3 million businesses have gone Google with Google Apps:
an online email calendar, and document program that's accessible from your 
browser. Read the Forrester report: http://p.sf.net/sfu/googleapps-sfnew
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2

Reply via email to