Merge lp:~xapantu/scratch/translations into lp:~registry/scratch/scratch

[xapantu]

Change the translations system, it uses macro and it is easier to maintain.

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2011-08-28 09:55:23 +0000
@@ -0,0 +1,1 @@
+build

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-08-22 22:04:04 +0000
+++ CMakeLists.txt	2011-08-28 09:55:23 +0000
@@ -14,6 +14,7 @@
 
 
 list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/vala)
+list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
 
 # Configure file
@@ -70,20 +71,7 @@
 )
 
 # tranlation stuff
-find_package (Gettext REQUIRED)
-
-add_custom_command (OUTPUT ${CMAKE_SOURCE_DIR}/po/scratch.pot
-        COMMAND xgettext -c --files-from ${CMAKE_SOURCE_DIR}/po/POTFILES.in --keyword=_ -o ${CMAKE_SOURCE_DIR}/po/scratch.pot --no-wrap --no-location
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-        )
-
-if (${GETTEXT_FOUND} STREQUAL "TRUE")
-        set (HAVE_GETTEXT true)
-        file (GLOB _translations ${CMAKE_SOURCE_DIR}/po/*.po)
-        GETTEXT_CREATE_TRANSLATIONS (${CMAKE_SOURCE_DIR}/po/${PROJECT_NAME}.pot
-                ALL ${_translations})
-endif (${GETTEXT_FOUND} STREQUAL "TRUE")
-
+add_subdirectory(po)
 # add_definitions (${CFLAGS} -Wall -Winit-self -Wwrite-strings -Wunreachable-code -Wstrict-prototypes )
 add_executable (scratch ${VALA_C})
 

=== added file 'cmake/Translations.cmake'
--- cmake/Translations.cmake	1970-01-01 00:00:00 +0000
+++ cmake/Translations.cmake	2011-08-28 09:55:23 +0000
@@ -0,0 +1,41 @@
+# Translations.cmake, CMake macros written for Marlin, feel free to re-use them
+
+macro(add_translations_directory NLS_PACKAGE)
+    add_custom_target (i18n ALL COMMENT “Building i18n messages.”)
+    find_program (MSGFMT_EXECUTABLE msgfmt)
+    file (GLOB PO_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.po)
+    foreach (PO_INPUT ${PO_FILES})
+        get_filename_component (PO_INPUT_BASE ${PO_INPUT} NAME_WE)
+        set (MO_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PO_INPUT_BASE}.mo)
+        add_custom_command (TARGET i18n COMMAND ${MSGFMT_EXECUTABLE} -o ${MO_OUTPUT} ${PO_INPUT})
+
+        install (FILES ${MO_OUTPUT} DESTINATION
+            share/locale/${PO_INPUT_BASE}/LC_MESSAGES
+            RENAME ${NLS_PACKAGE}.mo)
+    endforeach (PO_INPUT ${PO_FILES})
+endmacro(add_translations_directory)
+
+
+macro(add_translations_catalog NLS_PACKAGE)
+    add_custom_target (pot COMMENT “Building translation catalog.”)
+    find_program (XGETTEXT_EXECUTABLE xgettext)
+
+
+    set(C_SOURCE "")
+
+    foreach(FILES_INPUT ${ARGN})
+        file (GLOB SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.c)
+        foreach(C_FILE ${SOURCE_FILES})
+            set(C_SOURCE ${C_SOURCE} ${C_FILE})
+        endforeach()
+        file (GLOB SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.vala)
+        foreach(C_FILE ${SOURCE_FILES})
+            set(C_SOURCE ${C_SOURCE} ${C_FILE})
+        endforeach()
+    endforeach()
+
+    add_custom_command (TARGET pot COMMAND
+        ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE} -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
+        ${VALA_SOURCE} ${C_SOURCE} --keyword="_" --from-code=UTF-8
+        )
+endmacro()

=== modified file 'org.elementary.scratch.gschema.xml'
--- org.elementary.scratch.gschema.xml	2011-08-02 22:17:19 +0000
+++ org.elementary.scratch.gschema.xml	2011-08-28 09:55:23 +0000
@@ -4,7 +4,7 @@
 		<value nick="Maximized" value="1" />
 		<value nick="Fullscreen" value="2" />
 	</enum>
-	<schema path="/apps/scratch/savedstate/" id="org.elementary.Scratch.SavedState" gettext-domain="scratch">
+	<schema path="/apps/scratch/savedstate/" id="org.elementary.scratch.savedstate" gettext-domain="scratch">
 		<key name="window-width" type="i">
 			<default>850</default>
 			<summary>The saved width of the window.</summary>

=== added file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ po/CMakeLists.txt	2011-08-28 09:55:23 +0000
@@ -0,0 +1,6 @@
+include(Translations)
+add_translations_directory("scratch")
+add_translations_catalog("scratch"
+    ../src/Widgets
+    ../src/Dialogs
+)

=== removed file 'po/POTFILES.in'
--- po/POTFILES.in	2011-08-10 17:52:09 +0000
+++ po/POTFILES.in	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-src/Widgets/notebook.vala
-src/Widgets/menu.vala
-src/Widgets/share_menu.vala
-src/Widgets/toolbar.vala
-src/Dialogs/pastebin_dialog.vala
-src/Dialogs/preferences_dialog.vala
-src/Dialogs/save_dialog.vala
-src/Dialogs/save_on_close_dialog.vala

=== modified file 'po/scratch.pot'
--- po/scratch.pot	2011-08-23 09:35:34 +0000
+++ po/scratch.pot	2011-08-28 09:55:23 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-23 11:31+0200\n"
+"POT-Creation-Date: 2011-08-28 11:52+0200\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,138 +17,183 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: /home/xapantu/scratch/po/../src/Widgets/menu.vala:42
+msgid "Add a new view"
+msgstr ""
+
+#: /home/xapantu/scratch/po/../src/Widgets/menu.vala:44
+msgid "Remove current view"
+msgstr ""
+
+#: /home/xapantu/scratch/po/../src/Widgets/menu.vala:47
+msgid "Fullscreen"
+msgstr ""
+
+#: /home/xapantu/scratch/po/../src/Widgets/notebook.vala:262
+#: /home/xapantu/scratch/po/../src/Widgets/notebook.vala:313
 msgid "New file"
 msgstr ""
 
+#: /home/xapantu/scratch/po/../src/Widgets/notebook.vala:308
 msgid "No files opened."
 msgstr ""
 
+#: /home/xapantu/scratch/po/../src/Widgets/notebook.vala:308
 msgid "Open a file to start editing"
 msgstr ""
 
+#: /home/xapantu/scratch/po/../src/Widgets/notebook.vala:312
 msgid "Open file"
 msgstr ""
 
+#: /home/xapantu/scratch/po/../src/Widgets/notebook.vala:312
 msgid "open a saved file"
 msgstr ""
 
+#: /home/xapantu/scratch/po/../src/Widgets/notebook.vala:313
 msgid "create an new empty file"
 msgstr ""
 
-msgid "Add a new view"
-msgstr ""
-
-msgid "Remove current view"
-msgstr ""
-
-msgid "Fullscreen"
-msgstr ""
-
-msgid "Upload to Pastebin..."
-msgstr ""
-
-msgid "Share via email..."
-msgstr ""
-
+#: /home/xapantu/scratch/po/../src/Widgets/toolbar.vala:78
 msgid "Search in the text..."
 msgstr ""
 
-#. combobox.append (_("File language"));
+#: /home/xapantu/scratch/po/../src/Widgets/toolbar.vala:121
 msgid "Normal Text"
 msgstr ""
 
+#: /home/xapantu/scratch/po/../src/Widgets/toolbar.vala:151
 msgid "Create a new file in a new tab"
 msgstr ""
 
+#: /home/xapantu/scratch/po/../src/Widgets/toolbar.vala:152
 msgid "Open an existing file"
 msgstr ""
 
+#: /home/xapantu/scratch/po/../src/Widgets/toolbar.vala:153
 msgid "Save the current file"
 msgstr ""
 
+#: /home/xapantu/scratch/po/../src/Widgets/toolbar.vala:154
 msgid "Cancel the last operation"
 msgstr ""
 
+#: /home/xapantu/scratch/po/../src/Widgets/toolbar.vala:155
 msgid "Repeat the last cancelled operation"
 msgstr ""
 
+#: /home/xapantu/scratch/po/../src/Widgets/toolbar.vala:156
 msgid "Share this file with others"
 msgstr ""
 
+#: /home/xapantu/scratch/po/../src/Widgets/share_menu.vala:38
+msgid "Upload to Pastebin..."
+msgstr ""
+
+#: /home/xapantu/scratch/po/../src/Widgets/share_menu.vala:39
+msgid "Share via email..."
+msgstr ""
+
+#: /home/xapantu/scratch/po/../src/Dialogs/preferences_dialog.vala:75
+msgid "Show line numbers"
+msgstr ""
+
+#: /home/xapantu/scratch/po/../src/Dialogs/preferences_dialog.vala:78
+msgid "Highlight current line"
+msgstr ""
+
+#: /home/xapantu/scratch/po/../src/Dialogs/preferences_dialog.vala:81
+msgid "Use spaces instead of tabs"
+msgstr ""
+
+#: /home/xapantu/scratch/po/../src/Dialogs/preferences_dialog.vala:86
+msgid "Tab width:"
+msgstr ""
+
+#: /home/xapantu/scratch/po/../src/Dialogs/preferences_dialog.vala:94
+msgid "Style scheme:"
+msgstr ""
+
+#: /home/xapantu/scratch/po/../src/Dialogs/preferences_dialog.vala:100
+msgid "Use the system fixed width font ("
+msgstr ""
+
+#: /home/xapantu/scratch/po/../src/Dialogs/preferences_dialog.vala:109
+msgid "Select font:"
+msgstr ""
+
+#: /home/xapantu/scratch/po/../src/Dialogs/preferences_dialog.vala:115
+msgid "Close"
+msgstr ""
+
+#: /home/xapantu/scratch/po/../src/Dialogs/save_dialog.vala:44
+msgid "Changes on this file aren't saved."
+msgstr ""
+
+#: /home/xapantu/scratch/po/../src/Dialogs/save_dialog.vala:44
+msgid "Do you want to save changes before close this file?"
+msgstr ""
+
+#: /home/xapantu/scratch/po/../src/Dialogs/pastebin_dialog.vala:249
 msgid "Share via PasteBin"
 msgstr ""
 
+#: /home/xapantu/scratch/po/../src/Dialogs/pastebin_dialog.vala:268
 msgid "Name:"
 msgstr ""
 
-msgid "Code highlight:"
+#: /home/xapantu/scratch/po/../src/Dialogs/pastebin_dialog.vala:289
+msgid "Format:"
 msgstr ""
 
+#: /home/xapantu/scratch/po/../src/Dialogs/pastebin_dialog.vala:297
 msgid "Expiry time:"
 msgstr ""
 
+#: /home/xapantu/scratch/po/../src/Dialogs/pastebin_dialog.vala:302
 msgid "Keep this paste private"
 msgstr ""
 
+#: /home/xapantu/scratch/po/../src/Dialogs/pastebin_dialog.vala:408
 msgid "The text is void!"
 msgstr ""
 
+#: /home/xapantu/scratch/po/../src/Dialogs/pastebin_dialog.vala:412
 msgid "The text format doesn't exist"
 msgstr ""
 
+#: /home/xapantu/scratch/po/../src/Dialogs/pastebin_dialog.vala:416
 msgid "An error occured"
 msgstr ""
 
+#: /home/xapantu/scratch/po/../src/Dialogs/pastebin_dialog.vala:421
 msgid "The text is sended"
 msgstr ""
 
+#: /home/xapantu/scratch/po/../src/Dialogs/pastebin_dialog.vala:469
 msgid "Never"
 msgstr ""
 
+#: /home/xapantu/scratch/po/../src/Dialogs/pastebin_dialog.vala:470
 msgid "Ten minutes"
 msgstr ""
 
+#: /home/xapantu/scratch/po/../src/Dialogs/pastebin_dialog.vala:471
 msgid "One hour"
 msgstr ""
 
+#: /home/xapantu/scratch/po/../src/Dialogs/pastebin_dialog.vala:472
 msgid "One day"
 msgstr ""
 
+#: /home/xapantu/scratch/po/../src/Dialogs/pastebin_dialog.vala:473
 msgid "One month"
 msgstr ""
 
-msgid "Show line numbers"
-msgstr ""
-
-msgid "Highlight current line"
-msgstr ""
-
-msgid "Use spaces instead of tabs"
-msgstr ""
-
-msgid "Tab width:"
-msgstr ""
-
-msgid "Style scheme:"
-msgstr ""
-
-msgid "Use the system fixed width font ("
-msgstr ""
-
-msgid "Select font:"
-msgstr ""
-
-msgid "Close"
-msgstr ""
-
-msgid "Changes on this file aren't saved."
-msgstr ""
-
-msgid "Do you want to save changes before close this file?"
-msgstr ""
-
+#: /home/xapantu/scratch/po/../src/Dialogs/save_on_close_dialog.vala:35
 msgid "Save this file? "
 msgstr ""
 
+#: /home/xapantu/scratch/po/../src/Dialogs/save_on_close_dialog.vala:36
 msgid "All your work will be lost!"
 msgstr ""

=== removed file 'pot-generator.sh'
--- pot-generator.sh	2011-08-14 17:02:29 +0000
+++ pot-generator.sh	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-#used to create the pot file
-xgettext -c --files-from ./po/POTFILES.in --keyword=_ -o ./po/scratch.pot --no-wrap --no-location

=== modified file 'src/settings.vala'
--- src/settings.vala	2011-08-19 10:42:12 +0000
+++ src/settings.vala	2011-08-28 09:55:23 +0000
@@ -34,7 +34,7 @@
 		public ScratchWindowState window_state { get; set; }
 				
 		public SavedState () {
-			base ("org.elementary.Scratch.SavedState");
+			base ("org.elementary.scratch.savedstate");
 		}
 	
 	}