Merge lp:~ttosttos/scratch/fix-1006040 into lp:~elementary-apps/scratch/scratch

Proposed by ttosttos
Status: Merged
Merge reported by: Mario Guerriero
Merged at revision: not available
Proposed branch: lp:~ttosttos/scratch/fix-1006040
Merge into: lp:~elementary-apps/scratch/scratch
Diff against target: 716 lines (+196/-196)
3 files modified
data/scratch.desktop (+2/-2)
po/scratch.pot (+178/-181)
src/config.vala.cmake (+16/-13)
To merge this branch: bzr merge lp:~ttosttos/scratch/fix-1006040
Reviewer Review Type Date Requested Status
Mario Guerriero (community) Approve
Review via email: mp+107946@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Mario Guerriero (mefrio-g) wrote :

in config.vala.cmake the string: "public const string NEW_DOCUMENT = N_("New Window");" should be fixed replaceing "Window" with "Document"

review: Needs Fixing
lp:~ttosttos/scratch/fix-1006040 updated
733. By ttosttos

Fixed new-doc string

Revision history for this message
Mario Guerriero (mefrio-g) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/scratch.desktop'
--- data/scratch.desktop 2012-05-25 14:56:31 +0000
+++ data/scratch.desktop 2012-05-30 10:31:18 +0000
@@ -17,12 +17,12 @@
17X-GNOME-Gettext-Domain=scratch17X-GNOME-Gettext-Domain=scratch
1818
19[NewDocument Shortcut Group]19[NewDocument Shortcut Group]
20Name=Create a new document20Name=New Document
21Exec=scratch --new-tab21Exec=scratch --new-tab
22TargetEnvironment=Unity22TargetEnvironment=Unity
2323
24[NewWindow Shortcut Group]24[NewWindow Shortcut Group]
25Name=Create a new window25Name=New Window
26Exec=scratch -n26Exec=scratch -n
27TargetEnvironment=Unity27TargetEnvironment=Unity
2828
2929
=== modified file 'po/scratch.pot'
--- po/scratch.pot 2012-05-25 14:56:31 +0000
+++ po/scratch.pot 2012-05-30 10:31:18 +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-25 16:55+0200\n"11"POT-Creation-Date: 2012-05-30 02:49-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,470 +17,467 @@
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/scratch/po/../src/MainWindow.vala:47720#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/config.vala:13
21#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:91521msgid "Edit text files"
22msgstr ""
23
24#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/config.vala:14
25msgid "Text Editor"
26msgstr ""
27
28#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/config.vala:15
29#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/config.vala:16
30msgid "New Window"
31msgstr ""
32
33#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Scratch.vala:177
34msgid "Set of plugins"
35msgstr ""
36
37#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Scratch.vala:178
38msgid "Argument for the set of plugins"
39msgstr ""
40
41#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Scratch.vala:179
42msgid "Create a new instance"
43msgstr ""
44
45#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:477
46#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:915
22msgid "Preferences"47msgid "Preferences"
23msgstr ""48msgstr ""
2449
25#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:53450#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:534
26#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:90051#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:900
27msgid "Open a file"52msgid "Open a file"
28msgstr ""53msgstr ""
2954
30#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:54155#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:541
31msgid "All files"56msgid "All files"
32msgstr ""57msgstr ""
3358
34#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:54459#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:544
35msgid "Text files"60msgid "Text files"
36msgstr ""61msgstr ""
3762
38#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:83463#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:834
39#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:83564#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:835
40msgid "Find..."65msgid "Find..."
41msgstr ""66msgstr ""
4267
43#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:83868#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:838
44#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:83969#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:839
45msgid "Hide search bar"70msgid "Hide search bar"
46msgstr ""71msgstr ""
4772
48#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:84273#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:842
49#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:84374#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:843
50msgid "Go to line..."75msgid "Go to line..."
51msgstr ""76msgstr ""
5277
53#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:84678#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:846
54#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:84779#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:847
55msgid "Quit"80msgid "Quit"
56msgstr ""81msgstr ""
5782
58#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:85083#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:850
59#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:85184#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:851
60msgid "Close"85msgid "Close"
61msgstr ""86msgstr ""
6287
63#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:85488#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:854
64#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:85589#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:855
65msgid "Replace"90msgid "Replace"
66msgstr ""91msgstr ""
6792
68#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:85893#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:858
69#: /home/mario/elementary/scratch/po/../src/Widgets/Notebook.vala:12494#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Widgets/Notebook.vala:124
70#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:17095#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Services/Document.vala:170
71#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:34596#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Services/Document.vala:345
72msgid "New document"97msgid "New document"
73msgstr ""98msgstr ""
7499
75#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:859100#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:859
76msgid "Create a new document in a new tab"101msgid "Create a new document in a new tab"
77msgstr ""102msgstr ""
78103
79#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:862104#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:862
80msgid "Add New View"105msgid "Add New View"
81msgstr ""106msgstr ""
82107
83#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:863108#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:863
84msgid "Add a new view"109msgid "Add a new view"
85msgstr ""110msgstr ""
86111
87#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:867112#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:867
88msgid "Remove Current View"113msgid "Remove Current View"
89msgstr ""114msgstr ""
90115
91#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:868116#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:868
92msgid "Remove this view"117msgid "Remove this view"
93msgstr ""118msgstr ""
94119
95#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:871120#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:871
96msgid "Undo"121msgid "Undo"
97msgstr ""122msgstr ""
98123
99#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:872124#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:872
100msgid "Undo the last action"125msgid "Undo the last action"
101msgstr ""126msgstr ""
102127
103#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:875128#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:875
104msgid "Redo"129msgid "Redo"
105msgstr ""130msgstr ""
106131
107#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:876132#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:876
108msgid "Redo the last undone action"133msgid "Redo the last undone action"
109msgstr ""134msgstr ""
110135
111#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:880136#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:880
112msgid "Revert"137msgid "Revert"
113msgstr ""138msgstr ""
114139
115#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:881140#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:881
116msgid "Restore this file"141msgid "Restore this file"
117msgstr ""142msgstr ""
118143
119#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:885144#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:885
120#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:886145#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:886
121msgid "Next Search"146msgid "Next Search"
122msgstr ""147msgstr ""
123148
124#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:889149#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:889
125#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:890150#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:890
126msgid "Previous Search"151msgid "Previous Search"
127msgstr ""152msgstr ""
128153
129#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:894154#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:894
130#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:895155#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:895
131msgid "Duplicate selected strings"156msgid "Duplicate selected strings"
132msgstr ""157msgstr ""
133158
134#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:899159#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:899
135msgid "Open"160msgid "Open"
136msgstr ""161msgstr ""
137162
138#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:903163#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:903
139msgid "Save"164msgid "Save"
140msgstr ""165msgstr ""
141166
142#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:904167#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:904
143msgid "Save the current file"168msgid "Save the current file"
144msgstr ""169msgstr ""
145170
146#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:907171#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:907
147#: /home/mario/elementary/scratch/po/../src/Widgets/Tab.vala:106172#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Widgets/Tab.vala:106
148#: /home/mario/elementary/scratch/po/../src/Widgets/Tab.vala:173173#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Widgets/Tab.vala:173
149msgid "Save as"174msgid "Save as"
150msgstr ""175msgstr ""
151176
152#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:908177#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:908
153msgid "Save the current file with a different name"178msgid "Save the current file with a different name"
154msgstr ""179msgstr ""
155180
156#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:911181#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:911
157#: /home/mario/elementary/scratch/po/../scratchcore/TemplateManager.vala:123182#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../scratchcore/TemplateManager.vala:123
158msgid "Templates"183msgid "Templates"
159msgstr ""184msgstr ""
160185
161#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:912186#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:912
162msgid "Create a new document from a template"187msgid "Create a new document from a template"
163msgstr ""188msgstr ""
164189
165#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:916190#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:916
166msgid "Change Scratch settings"191msgid "Change Scratch settings"
167msgstr ""192msgstr ""
168193
169#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:922194#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:922
170#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:923195#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:923
171msgid "Fullscreen"196msgid "Fullscreen"
172msgstr ""197msgstr ""
173198
174#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:926199#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:926
175#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:927200#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:927
176msgid "Sidebar"201msgid "Sidebar"
177msgstr ""202msgstr ""
178203
179#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:930204#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:930
180#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:931205#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:931
181msgid "Context View"206msgid "Context View"
182msgstr ""207msgstr ""
183208
184#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:934209#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:934
185#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:935210#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:935
186msgid "Status Bar"211msgid "Status Bar"
187msgstr ""212msgstr ""
188213
189#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:938214#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:938
190#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:939215#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:939
191msgid "Bottom Panel"216msgid "Bottom Panel"
192msgstr ""217msgstr ""
193218
194#: /home/mario/elementary/scratch/po/../src/Scratch.vala:177219#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Widgets/ComboSyntax.vala:38
195msgid "Set of plugins"220#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../scratchcore/SourceView.vala:101
196msgstr ""
197
198#: /home/mario/elementary/scratch/po/../src/Scratch.vala:178
199msgid "Argument for the set of plugins"
200msgstr ""
201
202#: /home/mario/elementary/scratch/po/../src/Scratch.vala:179
203msgid "Create a new instance"
204msgstr ""
205
206#: /home/mario/elementary/scratch/po/../src/config.vala:10
207msgid "Edit text files"
208msgstr ""
209
210#: /home/mario/elementary/scratch/po/../src/config.vala:11
211msgid "Text Editor"
212msgstr ""
213
214#: /home/mario/elementary/scratch/po/../src/config.vala:12
215msgid "Create a new document"
216msgstr ""
217
218#: /home/mario/elementary/scratch/po/../src/config.vala:13
219msgid "Create a new window"
220msgstr ""
221
222#: /home/mario/elementary/scratch/po/../src/Widgets/ShareMenu.vala:56
223msgid "Share"
224msgstr ""
225
226#: /home/mario/elementary/scratch/po/../src/Widgets/ComboSyntax.vala:38
227#: /home/mario/elementary/scratch/po/../scratchcore/SourceView.vala:101
228msgid "Normal text"221msgid "Normal text"
229msgstr ""222msgstr ""
230223
231#: /home/mario/elementary/scratch/po/../src/Widgets/NotificationBar.vala:45224#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Widgets/NotificationBar.vala:45
232msgid "Dismiss"225msgid "Dismiss"
233msgstr ""226msgstr ""
234227
235#: /home/mario/elementary/scratch/po/../src/Widgets/NotificationBar.vala:52228#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Widgets/NotificationBar.vala:52
236msgid "Save as New File"229msgid "Save as New File"
237msgstr ""230msgstr ""
238231
239#: /home/mario/elementary/scratch/po/../src/Widgets/NotificationBar.vala:60232#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Widgets/NotificationBar.vala:60
240msgid "Choose the new location"233msgid "Choose the new location"
241msgstr ""234msgstr ""
242235
243#: /home/mario/elementary/scratch/po/../src/Widgets/Notebook.vala:208236#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Widgets/Notebook.vala:208
244msgid "No files are open."237msgid "No files are open."
245msgstr ""238msgstr ""
246239
247#: /home/mario/elementary/scratch/po/../src/Widgets/Notebook.vala:208240#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Widgets/Notebook.vala:208
248msgid "Open a file to begin editing."241msgid "Open a file to begin editing."
249msgstr ""242msgstr ""
250243
251#: /home/mario/elementary/scratch/po/../src/Widgets/Notebook.vala:210244#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Widgets/Notebook.vala:210
252msgid "Open file"245msgid "Open file"
253msgstr ""246msgstr ""
254247
255#: /home/mario/elementary/scratch/po/../src/Widgets/Notebook.vala:210248#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Widgets/Notebook.vala:210
256msgid "Open a saved file."249msgid "Open a saved file."
257msgstr ""250msgstr ""
258251
259#: /home/mario/elementary/scratch/po/../src/Widgets/Notebook.vala:211252#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Widgets/Notebook.vala:211
260msgid "New file"253msgid "New file"
261msgstr ""254msgstr ""
262255
263#: /home/mario/elementary/scratch/po/../src/Widgets/Notebook.vala:211256#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Widgets/Notebook.vala:211
264msgid "Create a new empty file."257msgid "Create a new empty file."
265msgstr ""258msgstr ""
266259
267#: /home/mario/elementary/scratch/po/../src/Dialogs/SaveOnCloseDialog.vala:39260#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Widgets/ShareMenu.vala:56
268msgid "Save changes to document"261msgid "Share"
269msgstr ""262msgstr ""
270263
271#: /home/mario/elementary/scratch/po/../src/Dialogs/SaveOnCloseDialog.vala:39264#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:69
272msgid "New File"
273msgstr ""
274
275#: /home/mario/elementary/scratch/po/../src/Dialogs/SaveOnCloseDialog.vala:39
276#: /home/mario/elementary/scratch/po/../src/Dialogs/SaveDialog.vala:42
277msgid "before closing?"
278msgstr ""
279
280#: /home/mario/elementary/scratch/po/../src/Dialogs/SaveOnCloseDialog.vala:40
281msgid ""
282"If you don't save, changes from the last 4 seconds will be permanently lost."
283msgstr ""
284
285#: /home/mario/elementary/scratch/po/../src/Dialogs/SaveOnCloseDialog.vala:42
286msgid "Close without saving"
287msgstr ""
288
289#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:69
290msgid "Behavior"265msgid "Behavior"
291msgstr ""266msgstr ""
292267
293#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:73268#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:73
294msgid "Interface"269msgid "Interface"
295msgstr ""270msgstr ""
296271
297#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:78272#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:78
298msgid "Extensions"273msgid "Extensions"
299msgstr ""274msgstr ""
300275
301#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:121276#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:121
302msgid "Show welcome screen"277msgid "Show welcome screen"
303msgstr ""278msgstr ""
304279
305#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:122280#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:122
306msgid "Show last open tabs"281msgid "Show last open tabs"
307msgstr ""282msgstr ""
308283
309#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:138284#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:138
310msgid "General:"285msgid "General:"
311msgstr ""286msgstr ""
312287
313#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:144288#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:144
314msgid "When Scratch starts:"289msgid "When Scratch starts:"
315msgstr ""290msgstr ""
316291
317#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:147292#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:147
318msgid "Save files when changed:"293msgid "Save files when changed:"
319msgstr ""294msgstr ""
320295
321#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:152296#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:152
322msgid "Tabs:"297msgid "Tabs:"
323msgstr ""298msgstr ""
324299
325#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:157300#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:157
326msgid "Automatic indentation:"301msgid "Automatic indentation:"
327msgstr ""302msgstr ""
328303
329#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:160304#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:160
330msgid "Insert spaces instead of tabs:"305msgid "Insert spaces instead of tabs:"
331msgstr ""306msgstr ""
332307
333#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:164308#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:164
334msgid "Tab width:"309msgid "Tab width:"
335msgstr ""310msgstr ""
336311
337#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:194312#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:194
338msgid "Editor:"313msgid "Editor:"
339msgstr ""314msgstr ""
340315
341#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:209316#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:209
342msgid "Highlight current line:"317msgid "Highlight current line:"
343msgstr ""318msgstr ""
344319
345#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:210320#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:210
346msgid "Highlight matching brackets:"321msgid "Highlight matching brackets:"
347msgstr ""322msgstr ""
348323
349#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:211324#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:211
350msgid "Draw spaces:"325msgid "Draw spaces:"
351msgstr ""326msgstr ""
352327
353#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:212328#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:212
354msgid "Show line numbers:"329msgid "Show line numbers:"
355msgstr ""330msgstr ""
356331
357#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:215332#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:215
358msgid "Show margin on right:"333msgid "Show margin on right:"
359msgstr ""334msgstr ""
360335
361#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:222336#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:222
362msgid "Margin width:"337msgid "Margin width:"
363msgstr ""338msgstr ""
364339
365#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:227340#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:227
366msgid "Font and colors:"341msgid "Font and colors:"
367msgstr ""342msgstr ""
368343
369#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:241344#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:241
370msgid "Select font:"345msgid "Select font:"
371msgstr ""346msgstr ""
372347
373#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:244348#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:244
374msgid "Color scheme:"349msgid "Color scheme:"
375msgstr ""350msgstr ""
376351
377#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:249352#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:249
378msgid "Custom font:"353msgid "Custom font:"
379msgstr ""354msgstr ""
380355
381#: /home/mario/elementary/scratch/po/../src/Dialogs/SaveDialog.vala:40356#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/SaveDialog.vala:40
382msgid "Save unsaved changes to file before closing?"357msgid "Save unsaved changes to file before closing?"
383msgstr ""358msgstr ""
384359
385#: /home/mario/elementary/scratch/po/../src/Dialogs/SaveDialog.vala:42360#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/SaveDialog.vala:42
361#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/SaveOnCloseDialog.vala:39
362msgid "before closing?"
363msgstr ""
364
365#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/SaveDialog.vala:42
386msgid "Save unsaved changes to file \""366msgid "Save unsaved changes to file \""
387msgstr ""367msgstr ""
388368
389#: /home/mario/elementary/scratch/po/../src/Dialogs/SaveDialog.vala:45369#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/SaveDialog.vala:45
390msgid "Changes to this file haven't been saved."370msgid "Changes to this file haven't been saved."
391msgstr ""371msgstr ""
392372
393#: /home/mario/elementary/scratch/po/../src/Dialogs/SaveDialog.vala:45373#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/SaveDialog.vala:45
394msgid "Do you want to save changes before closing this file?"374msgid "Do you want to save changes before closing this file?"
395msgstr ""375msgstr ""
396376
397#: /home/mario/elementary/scratch/po/../src/Dialogs/WarnDialog.vala:49377#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/SaveOnCloseDialog.vala:39
398#: /home/mario/elementary/scratch/po/../src/Dialogs/WarnDialog.vala:57378msgid "Save changes to document"
379msgstr ""
380
381#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/SaveOnCloseDialog.vala:39
382msgid "New File"
383msgstr ""
384
385#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/SaveOnCloseDialog.vala:40
386msgid ""
387"If you don't save, changes from the last 4 seconds will be permanently lost."
388msgstr ""
389
390#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/SaveOnCloseDialog.vala:42
391msgid "Close without saving"
392msgstr ""
393
394#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/WarnDialog.vala:49
395#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/WarnDialog.vala:57
399msgid "The file:"396msgid "The file:"
400msgstr ""397msgstr ""
401398
402#: /home/mario/elementary/scratch/po/../src/Dialogs/WarnDialog.vala:50399#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/WarnDialog.vala:50
403msgid "Do you want to reload it?"400msgid "Do you want to reload it?"
404msgstr ""401msgstr ""
405402
406#: /home/mario/elementary/scratch/po/../src/Dialogs/WarnDialog.vala:58403#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/WarnDialog.vala:58
407msgid "Do you want to create it again?"404msgid "Do you want to create it again?"
408msgstr ""405msgstr ""
409406
410#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:265407#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Services/Document.vala:265
411#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:491408#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Services/Document.vala:491
412msgid "You can't save changes to:"409msgid "You can't save changes to:"
413msgstr ""410msgstr ""
414411
415#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:265412#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Services/Document.vala:265
416#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:491413#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Services/Document.vala:491
417msgid "Do you want to save the changes to this file in a different location?"414msgid "Do you want to save the changes to this file in a different location?"
418msgstr ""415msgstr ""
419416
420#: /home/mario/elementary/scratch/po/../scratchcore/SearchManager.vala:66417#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../scratchcore/SourceView.vala:95
418msgid "Syntax Highlighting"
419msgstr ""
420
421#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../scratchcore/SearchManager.vala:66
421msgid "Find"422msgid "Find"
422msgstr ""423msgstr ""
423424
424#: /home/mario/elementary/scratch/po/../scratchcore/SearchManager.vala:67425#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../scratchcore/SearchManager.vala:67
425msgid "Replace With"426msgid "Replace With"
426msgstr ""427msgstr ""
427428
428#: /home/mario/elementary/scratch/po/../scratchcore/SearchManager.vala:82429#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../scratchcore/SearchManager.vala:82
429msgid "Go To Line:"430msgid "Go To Line:"
430msgstr ""431msgstr ""
431432
432#: /home/mario/elementary/scratch/po/../scratchcore/SourceView.vala:95433#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../plugins/pastebin/pastebin_dialog.vala:254
433msgid "Syntax Highlighting"
434msgstr ""
435
436#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:254
437msgid "Share via PasteBin"434msgid "Share via PasteBin"
438msgstr ""435msgstr ""
439436
440#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:273437#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../plugins/pastebin/pastebin_dialog.vala:273
441msgid "Name:"438msgid "Name:"
442msgstr ""439msgstr ""
443440
444#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:279441#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../plugins/pastebin/pastebin_dialog.vala:279
445msgid "Format: "442msgid "Format: "
446msgstr ""443msgstr ""
447444
448#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:281445#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../plugins/pastebin/pastebin_dialog.vala:281
449msgid "Others..."446msgid "Others..."
450msgstr ""447msgstr ""
451448
452#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:306449#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../plugins/pastebin/pastebin_dialog.vala:306
453msgid "Expiry time:"450msgid "Expiry time:"
454msgstr ""451msgstr ""
455452
456#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:311453#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../plugins/pastebin/pastebin_dialog.vala:311
457msgid "Keep this paste private"454msgid "Keep this paste private"
458msgstr ""455msgstr ""
459456
460#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:314457#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../plugins/pastebin/pastebin_dialog.vala:314
461msgid "Upload"458msgid "Upload"
462msgstr ""459msgstr ""
463460
464#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:345461#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../plugins/pastebin/pastebin_dialog.vala:345
465msgid "Other formats"462msgid "Other formats"
466msgstr ""463msgstr ""
467464
468#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:544465#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../plugins/pastebin/pastebin_dialog.vala:544
469msgid "Never"466msgid "Never"
470msgstr ""467msgstr ""
471468
472#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:545469#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../plugins/pastebin/pastebin_dialog.vala:545
473msgid "Ten minutes"470msgid "Ten minutes"
474msgstr ""471msgstr ""
475472
476#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:546473#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../plugins/pastebin/pastebin_dialog.vala:546
477msgid "One hour"474msgid "One hour"
478msgstr ""475msgstr ""
479476
480#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:547477#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../plugins/pastebin/pastebin_dialog.vala:547
481msgid "One day"478msgid "One day"
482msgstr ""479msgstr ""
483480
484#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:548481#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../plugins/pastebin/pastebin_dialog.vala:548
485msgid "One month"482msgid "One month"
486msgstr ""483msgstr ""
487484
=== modified file 'src/config.vala.cmake'
--- src/config.vala.cmake 2012-05-25 14:56:31 +0000
+++ src/config.vala.cmake 2012-05-30 10:31:18 +0000
@@ -1,15 +1,18 @@
1namespace Constants {1namespace Constants {
2public const string DATADIR = "@DATADIR@";2 public const string DATADIR = "@DATADIR@";
3public const string PKGDATADIR = "@PKGDATADIR@";3 public const string PKGDATADIR = "@PKGDATADIR@";
4public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";4 public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";
5public const string RELEASE_NAME = "@RELEASE_NAME@";5 public const string RELEASE_NAME = "@RELEASE_NAME@";
6public const string VERSION = "@VERSION@";6 public const string VERSION = "@VERSION@";
7public const string VERSION_INFO = "@VERSION_INFO@";7 public const string VERSION_INFO = "@VERSION_INFO@";
8public const string PLUGINDIR = "@PLUGINDIR@";8 public const string PLUGINDIR = "@PLUGINDIR@";
9/* Translation template for .desktop file */9
10public const string COMMENT = N_("Edit text files");10 /* Translatable launcher (.desktop) strings to be added to */
11public const string GENERIC = N_("Text Editor");11 /* template (.pot) file. These strings should reflect any */
12public const string NEW_DOCUMENT = N_("Create a new document");12 /* changes in these launcher keys in .desktop file. */
13public const string NEW_WINDOW = N_("Create a new window");13 public const string COMMENT = N_("Edit text files");
14 public const string GENERIC = N_("Text Editor");
15 public const string NEW_DOCUMENT = N_("New Document");
16 public const string NEW_WINDOW = N_("New Window");
14}17}
15
16\ No newline at end of file18\ No newline at end of file
19

Subscribers

People subscribed via source and target branches