Merge lp:~jaapz-b/switchboard-plug-about/fix-1072795 into lp:~elementary-apps/switchboard-plug-about/trunk

[Jaap Broekhuizen]

[lp:~jaapz-b/switchboard-plug-about/fix-1072795]

37. By Jaap Broekhuizen on 2012-11-07

Fix some translation issues.

[Cody Garver (codygarver)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-10-23 08:00:36 +0000
+++ CMakeLists.txt	2012-11-07 20:27:24 +0000
@@ -24,7 +24,7 @@
 
 set (DATADIR "${CMAKE_INSTALL_PREFIX}/lib/plugs")
 set (PKGDATADIR "${DATADIR}/pantheon/${PLUGNAME}")
-set (GETTEXT_PACKAGE "plug-${PLUGNAME}")
+set (GETTEXT_PACKAGE "${PLUGNAME}-plug")
 
 list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 

=== modified file 'plug.plug'
--- plug.plug	2012-10-24 17:53:56 +0000
+++ plug.plug	2012-11-07 20:27:24 +0000
@@ -3,4 +3,4 @@
 icon=@PLUGICON@
 title=@PLUGTITLE@
 category=@PLUGCATEGORY@
-X-GNOME-Gettext-Domain=granite
\ No newline at end of file
+X-GNOME-Gettext-Domain=@GETTEXT_PACKAGE@
\ No newline at end of file

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2012-09-22 19:00:59 +0000
+++ po/CMakeLists.txt	2012-11-07 20:27:24 +0000
@@ -1,5 +1,5 @@
-include (Translations) # Replace plug-name with the correct name of your plug
-add_translations_directory("plug-about")
-add_translations_catalog("plug-about"
+include (Translations)
+add_translations_directory("${GETTEXT_PACKAGE}")
+add_translations_catalog("${GETTEXT_PACKAGE}"
     ../src/
 )

=== renamed file 'po/plug-about.pot' => 'po/about-plug.pot'
--- po/plug-about.pot	2012-10-26 17:28:44 +0000
+++ po/about-plug.pot	2012-11-07 20:27:24 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-26 19:22+0200\n"
+"POT-Creation-Date: 2012-11-07 21:23+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,39 +17,43 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: /home/noelco/switchboard-plug-about/po/../src//about-plug.vala:112
+#: /home/jaapz/Programmeren/Elementary/switchboard-plug-about/po/../src//about-plug.vala:163
 msgid "Version"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-about/po/../src//about-plug.vala:134
+#: /home/jaapz/Programmeren/Elementary/switchboard-plug-about/po/../src//about-plug.vala:185
 #, c-format
 msgid "Hardware:"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-about/po/../src//about-plug.vala:138
+#: /home/jaapz/Programmeren/Elementary/switchboard-plug-about/po/../src//about-plug.vala:189
 msgid "Processor:"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-about/po/../src//about-plug.vala:141
+#: /home/jaapz/Programmeren/Elementary/switchboard-plug-about/po/../src//about-plug.vala:192
 msgid "Memory:"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-about/po/../src//about-plug.vala:144
+#: /home/jaapz/Programmeren/Elementary/switchboard-plug-about/po/../src//about-plug.vala:195
 msgid "Graphics:"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-about/po/../src//about-plug.vala:147
+#: /home/jaapz/Programmeren/Elementary/switchboard-plug-about/po/../src//about-plug.vala:198
 msgid "Hard Drive:"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-about/po/../src//about-plug.vala:203
+#: /home/jaapz/Programmeren/Elementary/switchboard-plug-about/po/../src//about-plug.vala:256
 msgid "Translate"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-about/po/../src//about-plug.vala:207
+#: /home/jaapz/Programmeren/Elementary/switchboard-plug-about/po/../src//about-plug.vala:260
 msgid "Report a Problem"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-about/po/../src//about-plug.vala:211
+#: /home/jaapz/Programmeren/Elementary/switchboard-plug-about/po/../src//about-plug.vala:264
 msgid "Check for Upgrades"
 msgstr ""
+
+#: /home/jaapz/Programmeren/Elementary/switchboard-plug-about/po/../src//about-plug.vala:303
+msgid "About"
+msgstr ""

=== modified file 'src/about-plug.vala'
--- src/about-plug.vala	2012-10-26 18:16:12 +0000
+++ src/about-plug.vala	2012-11-07 20:27:24 +0000
@@ -298,3 +298,7 @@
     Gtk.main ();
     return 0;
 }
+
+public static void translations () {
+    string plug_name = _("About");
+}