Terminal

Merge lp:~ttosttos/pantheon-terminal/fix-989076 into lp:~elementary-apps/pantheon-terminal/trunk

  1. fix-989076
  2. Merge into trunk
Proposed by ttosttos
Status: Merged
Approved by: David Gomes
Approved revision: 218
Merged at revision: 218
Proposed branch: lp:~ttosttos/pantheon-terminal/fix-989076
Merge into: lp:~elementary-apps/pantheon-terminal/trunk
Diff against target: 193 lines (+55/-56)
2 files modified
cmake/Translations.cmake (+3/-3)
po/pantheon-terminal.pot (+52/-53)
To merge this branch: bzr merge lp:~ttosttos/pantheon-terminal/fix-989076
Reviewer Review Type Date Requested Status
David Gomes (community) Approve
Review via email: mp+108783@code.launchpad.net

Description of the change

- Fixes Translations.cmake so entire source tree is searched for strings (fixed applied upstream)
- Generated an updated pantheon-terminal.pot

To post a comment you must log in.
Revision history for this message
David Gomes (davidgomes) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'cmake/Translations.cmake'
--- cmake/Translations.cmake 2012-02-09 15:46:06 +0000
+++ cmake/Translations.cmake 2012-06-05 16:17:21 +0000
@@ -24,11 +24,11 @@
24 set(C_SOURCE "")24 set(C_SOURCE "")
2525
26 foreach(FILES_INPUT ${ARGN})26 foreach(FILES_INPUT ${ARGN})
27 file (GLOB SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.c)27 file (GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.c)
28 foreach(C_FILE ${SOURCE_FILES})28 foreach(C_FILE ${SOURCE_FILES})
29 set(C_SOURCE ${C_SOURCE} ${C_FILE})29 set(C_SOURCE ${C_SOURCE} ${C_FILE})
30 endforeach()30 endforeach()
31 file (GLOB SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.vala)31 file (GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.vala)
32 foreach(C_FILE ${SOURCE_FILES})32 foreach(C_FILE ${SOURCE_FILES})
33 set(C_SOURCE ${C_SOURCE} ${C_FILE})33 set(C_SOURCE ${C_SOURCE} ${C_FILE})
34 endforeach()34 endforeach()
@@ -36,6 +36,6 @@
3636
37 add_custom_command (TARGET pot COMMAND37 add_custom_command (TARGET pot COMMAND
38 ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE} -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot38 ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE} -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
39 ${VALA_SOURCE} ${C_SOURCE} --from-code=UTF-8 --keyword="_" --keyword="N_"39 ${VALA_SOURCE} ${C_SOURCE} --keyword="_" --keyword="N_" --from-code=UTF-8
40 )40 )
41endmacro()41endmacro()
4242
=== modified file 'po/pantheon-terminal.pot'
--- po/pantheon-terminal.pot 2012-05-25 06:15:55 +0000
+++ po/pantheon-terminal.pot 2012-06-05 16:17:21 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2012-05-02 17:05+0200\n"11"POT-Creation-Date: 2012-06-05 09:09-0700\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,103 +17,102 @@
17"Content-Type: text/plain; charset=CHARSET\n"17"Content-Type: text/plain; charset=CHARSET\n"
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
1919
20#: /home/mario/elementary/pantheon-terminal/po/../src/ForegroundProcessDialog.vala:2920#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminal.vala:87
21msgid "There is an active process on this shell!"21msgid "Set shell at launch"
22msgstr ""22msgstr ""
2323
24#: /home/mario/elementary/pantheon-terminal/po/../src/ForegroundProcessDialog.vala:3024#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:78
25#: /home/mario/elementary/pantheon-terminal/po/../src/ForegroundProcessDialog.vala:4425#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:212
26msgid "Do you want to stay on the shell?"
27msgstr ""
28
29#: /home/mario/elementary/pantheon-terminal/po/../src/ForegroundProcessDialog.vala:32
30#: /home/mario/elementary/pantheon-terminal/po/../src/ForegroundProcessDialog.vala:46
31msgid "Stay on this terminal"
32msgstr ""
33
34#: /home/mario/elementary/pantheon-terminal/po/../src/ForegroundProcessDialog.vala:36
35#: /home/mario/elementary/pantheon-terminal/po/../src/ForegroundProcessDialog.vala:50
36msgid "Kill terminal"
37msgstr ""
38
39#: /home/mario/elementary/pantheon-terminal/po/../src/ForegroundProcessDialog.vala:43
40msgid "There are some active process on this shell!"
41msgstr ""
42
43#: /home/mario/elementary/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:76
44#: /home/mario/elementary/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:209
45msgid "Terminal"26msgid "Terminal"
46msgstr ""27msgstr ""
4728
48#: /home/mario/elementary/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:12529#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:127
49msgid "Open a new tab"30msgid "Open a new tab"
50msgstr ""31msgstr ""
5132
52#: /home/mario/elementary/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:33233#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:350
53msgid "Quit"34msgid "Quit"
54msgstr ""35msgstr ""
5536
56#: /home/mario/elementary/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:33337#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:351
57msgid "Close"38msgid "Close"
58msgstr ""39msgstr ""
5940
60#: /home/mario/elementary/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:33441#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:352
61msgid "New Window"42msgid "New Window"
62msgstr ""43msgstr ""
6344
64#: /home/mario/elementary/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:33445#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:352
65msgid "Open a new window"46msgid "Open a new window"
66msgstr ""47msgstr ""
6748
68#: /home/mario/elementary/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:33649#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:354
69msgid "New Tab"50msgid "New Tab"
70msgstr ""51msgstr ""
7152
72#: /home/mario/elementary/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:33653#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:354
73msgid "Create a new tab"54msgid "Create a new tab"
74msgstr ""55msgstr ""
7556
76#: /home/mario/elementary/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:33757#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:355
77msgid "Copy"58msgid "Copy"
78msgstr ""59msgstr ""
7960
80#: /home/mario/elementary/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:33761#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:355
81msgid "Copy the selected text"62msgid "Copy the selected text"
82msgstr ""63msgstr ""
8364
84#: /home/mario/elementary/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:33865#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:356
85msgid "Paste"66msgid "Paste"
86msgstr ""67msgstr ""
8768
88#: /home/mario/elementary/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:33869#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:356
89msgid "Paste some text"70msgid "Paste some text"
90msgstr ""71msgstr ""
9172
92#: /home/mario/elementary/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:33973#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:357
93msgid "Select All"74msgid "Select All"
94msgstr ""75msgstr ""
9576
96#: /home/mario/elementary/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:34077#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:358
97msgid "Select all the text in the terminal"78msgid "Select all the text in the terminal"
98msgstr ""79msgstr ""
9980
100#: /home/mario/elementary/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:34181#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:359
101msgid "About"82msgid "About"
102msgstr ""83msgstr ""
10384
104#: /home/mario/elementary/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:34185#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:359
105msgid "Show about window"86msgid "Show about window"
106msgstr ""87msgstr ""
10788
108#: /home/mario/elementary/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:34489#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:361
109msgid "Tab 1"90msgid "Fullscreen"
110msgstr ""91msgstr ""
11192
112#: /home/mario/elementary/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:34493#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:361
113msgid "Select tab 1"94msgid "Toggle/Untoggle fullscreen"
114msgstr ""95msgstr ""
11596
116#: pantheon-terminal.desktop:397#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/ForegroundProcessDialog.vala:29
117msgid "Use the command line"98#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/ForegroundProcessDialog.vala:43
118msgstr ""99msgid "There is an active process on this terminal!"
119100msgstr ""
101
102#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/ForegroundProcessDialog.vala:30
103msgid "Do you want to stay on the terminal?"
104msgstr ""
105
106#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/ForegroundProcessDialog.vala:32
107#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/ForegroundProcessDialog.vala:46
108msgid "Stay"
109msgstr ""
110
111#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/ForegroundProcessDialog.vala:36
112#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/ForegroundProcessDialog.vala:50
113msgid "Close terminal"
114msgstr ""
115
116#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/ForegroundProcessDialog.vala:44
117msgid "Do you want to close this terminal?"
118msgstr ""

Subscribers

People subscribed via source and target branches