Switchboard

Merge lp:~tintou/switchboard/i18n-sanitizer into lp:~elementary-pantheon/switchboard/switchboard

  1. i18n-sanitizer
  2. Merge into switchboard
Proposed by Corentin Noël
Status: Needs review
Proposed branch: lp:~tintou/switchboard/i18n-sanitizer
Merge into: lp:~elementary-pantheon/switchboard/switchboard
Diff against target: 645 lines (+149/-142)
9 files modified
CMakeLists.txt (+7/-0)
cmake/ReleaseHelper.cmake (+39/-0)
cmake/Translations.cmake (+41/-97)
data/org.pantheon.switchboard.desktop.in (+6/-4)
data/switchboard.appdata.xml.in (+4/-4)
po/CMakeLists.txt (+1/-1)
po/extra/LINGUAS (+2/-0)
po/extra/extra.pot (+18/-1)
po/switchboard.pot (+31/-35)
To merge this branch: bzr merge lp:~tintou/switchboard/i18n-sanitizer
Reviewer Review Type Date Requested Status
elementary Pantheon team Pending
Review via email: mp+315060@code.launchpad.net

Commit message

CMake: drop intltool support now that xgettext has matured and add a `make check-release` command

Description of the change

Infrastructure changes:
 - Switch from intltool and xgettext to xgettext only as it now supports more formats
 - Add a `make check-release` command to help checking whereas the app is in a releasable state or not
 - Add comments for translators

To post a comment you must log in.
Revision history for this message
RabbitBot (rabbitbot-a) wrote :

Attempt to merge into lp:switchboard failed due to conflicts:

duplicate in po/extra/el.po.moved

Reply

Unmerged revisions

735. By Corentin Noël

Sanitize translation

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2016-12-08 17:41:03 +0000
3+++ CMakeLists.txt 2017-01-18 18:26:40 +0000
4@@ -74,6 +74,13 @@
5 install(FILES ${CMAKE_BINARY_DIR}/data/org.pantheon.switchboard.desktop DESTINATION ${DATADIR}/applications)
6 install(FILES ${CMAKE_BINARY_DIR}/data/${CMAKE_PROJECT_NAME}.appdata.xml DESTINATION ${DATADIR}/appdata)
7
8+include (ReleaseHelper)
9+
10+TEST_FILES_FOR_RELEASE(
11+ DESKTOP ${CMAKE_BINARY_DIR}/data/org.pantheon.switchboard.desktop
12+ APPSTREAM ${CMAKE_BINARY_DIR}/data/${CMAKE_PROJECT_NAME}.appdata.xml
13+)
14+
15 add_subdirectory(po)
16
17 #
18
19=== added file 'cmake/ReleaseHelper.cmake'
20--- cmake/ReleaseHelper.cmake 1970-01-01 00:00:00 +0000
21+++ cmake/ReleaseHelper.cmake 2017-01-18 18:26:40 +0000
22@@ -0,0 +1,39 @@
23+#
24+# This program is free software: you can redistribute it and/or modify
25+# it under the terms of the GNU General Public License as published by
26+# the Free Software Foundation, either version 3 of the License, or
27+# (at your option) any later version.
28+#
29+# This program is distributed in the hope that it will be useful,
30+# but WITHOUT ANY WARRANTY; without even the implied warranty of
31+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
32+# GNU General Public License for more details.
33+#
34+# You should have received a copy of the GNU General Public License
35+# along with this program. If not, see <http://www.gnu.org/licenses/>.
36+#
37+
38+FIND_PROGRAM(APPSTREAMCLI_EXECUTABLE NAMES appstreamcli)
39+MARK_AS_ADVANCED(APPSTREAMCLI_EXECUTABLE)
40+
41+FIND_PROGRAM(DESKTOP_FILE_VALIDATE_EXECUTABLE NAMES desktop-file-validate)
42+MARK_AS_ADVANCED(DESKTOP_FILE_VALIDATE_EXECUTABLE)
43+
44+INCLUDE(CMakeParseArguments)
45+
46+FUNCTION(TEST_FILES_FOR_RELEASE)
47+ CMAKE_PARSE_ARGUMENTS(ARGS "" "" "DESKTOP;APPSTREAM" ${ARGN})
48+ add_custom_target("check-release"
49+ ${DESKTOP_FILE_VALIDATE_EXECUTABLE}
50+ ${ARGS_DESKTOP}
51+ COMMAND
52+ ${APPSTREAMCLI_EXECUTABLE}
53+ "validate"
54+ ${ARGS_APPSTREAM}
55+ WORKING_DIRECTORY
56+ ${CMAKE_CURRENT_BINARY_DIR}
57+ DEPENDS
58+ ${ARGS_DESKTOP}
59+ ${ARGS_APPSTREAM}
60+ )
61+ENDFUNCTION(TEST_FILES_FOR_RELEASE)
62
63=== modified file 'cmake/Translations.cmake'
64--- cmake/Translations.cmake 2016-08-02 17:48:19 +0000
65+++ cmake/Translations.cmake 2017-01-18 18:26:40 +0000
66@@ -1,116 +1,69 @@
67-# Translations.cmake, CMake macros written for Marlin, feel free to re-use them
68+# Translations.cmake, elementary translation macro.
69 include(CMakeParseArguments)
70+# be sure that all languages are present
71+# Using all usual languages code from https://www.gnu.org/software/gettext/manual/html_node/Language-Codes.html#Language-Codes
72+# Rare language codes should be added on-demand.
73+set (LANGUAGES_NEEDED aa ab ae af ak am an ar as ast av ay az ba be bg bh bi bm bn bo br bs ca ce ch ckb co cr cs cu cv cy da de dv dz ee el en_AU en_CA en_GB eo es et eu fa ff fi fj fo fr fr_CA fy ga gd gl gn gu gv ha he hi ho hr ht hu hy hz ia id ie ig ii ik io is it iu ja jv ka kg ki kj kk kl km kn ko kr ks ku kv kw ky la lb lg li ln lo lt lu lv mg mh mi mk ml mn mo mr ms mt my na nb nd ne ng nl nn no nr nv ny oc oj om or os pa pi pl ps pt pt_BR qu rm rn ro ru rue rw sa sc sd se sg si sk sl sm sma sn so sq sr ss st su sv sw ta te tg th ti tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa wo xh yi yo za zh zh_CN zh_HK zh_TW zu)
74
75 macro (add_translations_directory NLS_PACKAGE)
76 add_custom_target (i18n ALL COMMENT “Building i18n messages.”)
77 find_program (MSGFMT_EXECUTABLE msgfmt)
78- # be sure that all languages are present
79- # Using all usual languages code from https://www.gnu.org/software/gettext/manual/html_node/Language-Codes.html#Language-Codes
80- # Rare language codes should be added on-demand.
81- set (LANGUAGES_NEEDED aa ab ae af ak am an ar as ast av ay az ba be bg bh bi bm bn bo br bs ca ce ch ckb co cr cs cu cv cy da de dv dz ee el en_AU en_CA en_GB eo es et eu fa ff fi fj fo fr fr_CA fy ga gd gl gn gu gv ha he hi ho hr ht hu hy hz ia id ie ig ii ik io is it iu ja jv ka kg ki kj kk kl km kn ko kr ks ku kv kw ky la lb lg li ln lo lt lu lv mg mh mi mk ml mn mo mr ms mt my na nb nd ne ng nl nn no nr nv ny oc oj om or os pa pi pl ps pt pt_BR qu rm rn ro ru rue rw sa sc sd se sg si sk sl sm sma sn so sq sr ss st su sv sw ta te tg th ti tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa wo xh yi yo za zh zh_CN zh_HK zh_TW zu)
82- foreach (LANGUAGE_NEEDED ${LANGUAGES_NEEDED})
83- create_po_file (${LANGUAGE_NEEDED})
84- endforeach (LANGUAGE_NEEDED ${LANGUAGES_NEEDED})
85+ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/LINGUAS)
86+ string (REPLACE ";" " " LANGUAGES_NEEDED_STR "${LANGUAGES_NEEDED}")
87+ file (APPEND ${CMAKE_CURRENT_SOURCE_DIR}/LINGUAS "\# Set of available languages.\n${LANGUAGES_NEEDED_STR}")
88+ endif ()
89 # generate .mo from .po
90- file (GLOB PO_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.po)
91- foreach (PO_INPUT ${PO_FILES})
92+ foreach (LANGUAGE ${LANGUAGES_NEEDED})
93+ set (PO_INPUT ${CMAKE_CURRENT_SOURCE_DIR}/${LANGUAGE}.po)
94+ if (NOT EXISTS ${PO_INPUT})
95+ file (APPEND ${PO_INPUT} "")
96+ endif ()
97 get_filename_component (PO_INPUT_BASE ${PO_INPUT} NAME_WE)
98 set (MO_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PO_INPUT_BASE}.mo)
99 add_custom_command (TARGET i18n COMMAND ${MSGFMT_EXECUTABLE} -o ${MO_OUTPUT} ${PO_INPUT})
100
101- install (FILES ${MO_OUTPUT} DESTINATION
102- share/locale/${PO_INPUT_BASE}/LC_MESSAGES
103- RENAME ${NLS_PACKAGE}.mo)
104- endforeach (PO_INPUT ${PO_FILES})
105+ install (FILES ${MO_OUTPUT}
106+ DESTINATION share/locale/${PO_INPUT_BASE}/LC_MESSAGES
107+ RENAME ${NLS_PACKAGE}.mo
108+ )
109+ endforeach (LANGUAGE ${LANGUAGES_NEEDED})
110 endmacro (add_translations_directory)
111
112-# Apply the right default template.
113-macro (create_po_file LANGUAGE_NEEDED)
114- set (FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LANGUAGE_NEEDED}.po)
115- if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${LANGUAGE_NEEDED}.po)
116- file (APPEND ${FILE} "msgid \"\"\n")
117- file (APPEND ${FILE} "msgstr \"\"\n")
118- file (APPEND ${FILE} "\"MIME-Version: 1.0\\n\"\n")
119- file (APPEND ${FILE} "\"Content-Type: text/plain; charset=UTF-8\\n\"\n")
120-
121- if ("${LANGUAGE_NEEDED}" STREQUAL "ja"
122- OR "${LANGUAGE_NEEDED}" STREQUAL "vi"
123- OR "${LANGUAGE_NEEDED}" STREQUAL "ko")
124- file (APPEND ${FILE} "\"Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\\n\"\n")
125- elseif ("${LANGUAGE_NEEDED}" STREQUAL "en"
126- OR "${LANGUAGE_NEEDED}" STREQUAL "de"
127- OR "${LANGUAGE_NEEDED}" STREQUAL "nl"
128- OR "${LANGUAGE_NEEDED}" STREQUAL "sv"
129- OR "${LANGUAGE_NEEDED}" STREQUAL "nb"
130- OR "${LANGUAGE_NEEDED}" STREQUAL "nn"
131- OR "${LANGUAGE_NEEDED}" STREQUAL "nb"
132- OR "${LANGUAGE_NEEDED}" STREQUAL "no"
133- OR "${LANGUAGE_NEEDED}" STREQUAL "fo"
134- OR "${LANGUAGE_NEEDED}" STREQUAL "es"
135- OR "${LANGUAGE_NEEDED}" STREQUAL "pt"
136- OR "${LANGUAGE_NEEDED}" STREQUAL "it"
137- OR "${LANGUAGE_NEEDED}" STREQUAL "bg"
138- OR "${LANGUAGE_NEEDED}" STREQUAL "he"
139- OR "${LANGUAGE_NEEDED}" STREQUAL "fi"
140- OR "${LANGUAGE_NEEDED}" STREQUAL "et"
141- OR "${LANGUAGE_NEEDED}" STREQUAL "eo"
142- OR "${LANGUAGE_NEEDED}" STREQUAL "hu"
143- OR "${LANGUAGE_NEEDED}" STREQUAL "tr"
144- OR "${LANGUAGE_NEEDED}" STREQUAL "es")
145- file (APPEND ${FILE} "\"Plural-Forms: nplurals=2; plural=n != 1;\\n\"\n")
146- elseif ("${LANGUAGE_NEEDED}" STREQUAL "fr"
147- OR "${LANGUAGE_NEEDED}" STREQUAL "fr_CA"
148- OR "${LANGUAGE_NEEDED}" STREQUAL "pt_BR")
149- file (APPEND ${FILE} "\"Plural-Forms: nplurals=2; plural=n>1;\\n\"\n")
150- elseif ("${LANGUAGE_NEEDED}" STREQUAL "lv")
151- file (APPEND ${FILE} "\"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\\n\"\n")
152- elseif ("${LANGUAGE_NEEDED}" STREQUAL "ro")
153- file (APPEND ${FILE} "\"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2;\\n\"\n")
154- elseif ("${LANGUAGE_NEEDED}" STREQUAL "lt")
155- file (APPEND ${FILE} "\"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2;\\n\"\n")
156- elseif ("${LANGUAGE_NEEDED}" STREQUAL "ru"
157- OR "${LANGUAGE_NEEDED}" STREQUAL "uk"
158- OR "${LANGUAGE_NEEDED}" STREQUAL "be"
159- OR "${LANGUAGE_NEEDED}" STREQUAL "sr"
160- OR "${LANGUAGE_NEEDED}" STREQUAL "hr")
161- file (APPEND ${FILE} "\"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\\n\"\n")
162- elseif ("${LANGUAGE_NEEDED}" STREQUAL "cs"
163- OR "${LANGUAGE_NEEDED}" STREQUAL "sk")
164- file (APPEND ${FILE} "\"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\\n\"\n")
165- elseif ("${LANGUAGE_NEEDED}" STREQUAL "pl")
166- file (APPEND ${FILE} "\"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\\n\"\n")
167- elseif ("${LANGUAGE_NEEDED}" STREQUAL "sl")
168- file (APPEND ${FILE} "\"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3;\\n\"\n")
169- endif ()
170-
171- endif ()
172-endmacro (create_po_file)
173-
174 macro (configure_file_translation SOURCE RESULT PO_DIR)
175- find_program (INTLTOOL_MERGE_EXECUTABLE intltool-merge)
176+ find_program (MSGFMT_EXECUTABLE msgfmt)
177 set(EXTRA_PO_DIR ${PO_DIR}/extra/)
178 get_filename_component(EXTRA_PO_DIR ${EXTRA_PO_DIR} ABSOLUTE)
179
180- # Intltool can't create a new directory.
181+ # Create the new directory
182 get_filename_component(RESULT_DIRECTORY ${RESULT} DIRECTORY)
183 file(MAKE_DIRECTORY ${RESULT_DIRECTORY})
184
185+ if (NOT EXISTS ${EXTRA_PO_DIR}/LINGUAS)
186+ string (REPLACE ";" " " LANGUAGES_NEEDED_STR "${LANGUAGES_NEEDED}")
187+ file (APPEND ${EXTRA_PO_DIR}/LINGUAS "\# Set of available languages.\n${LANGUAGES_NEEDED_STR}")
188+ endif ()
189+ foreach (LANGUAGE ${LANGUAGES_NEEDED})
190+ set (PO_INPUT ${EXTRA_PO_DIR}/${LANGUAGE}.po)
191+ if (NOT EXISTS ${PO_INPUT})
192+ file (APPEND ${PO_INPUT} "")
193+ endif ()
194+ endforeach ()
195+
196 set (INTLTOOL_FLAG "")
197 if (${SOURCE} MATCHES ".desktop")
198- set (INTLTOOL_FLAG "--desktop-style")
199- elseif (${SOURCE} MATCHES ".gschema")
200- set (INTLTOOL_FLAG "--schemas-style")
201+ set (INTLTOOL_FLAG "--desktop")
202 elseif (${SOURCE} MATCHES ".xml")
203- set (INTLTOOL_FLAG "--xml-style")
204+ set (INTLTOOL_FLAG "--xml")
205 endif ()
206- execute_process (WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${INTLTOOL_MERGE_EXECUTABLE} --quiet ${INTLTOOL_FLAG} ${EXTRA_PO_DIR} ${SOURCE} ${RESULT})
207+ execute_process (WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
208+ COMMAND ${MSGFMT_EXECUTABLE} ${INTLTOOL_FLAG} -d ${EXTRA_PO_DIR} --template ${SOURCE} -o ${RESULT}
209+ )
210 endmacro ()
211
212 macro (add_translations_catalog NLS_PACKAGE)
213 cmake_parse_arguments (ARGS "" "" "DESKTOP_FILES;APPDATA_FILES;SCHEMA_FILES" ${ARGN})
214 add_custom_target (pot COMMENT “Building translation catalog.”)
215 find_program (XGETTEXT_EXECUTABLE xgettext)
216- find_program (INTLTOOL_EXTRACT_EXECUTABLE intltool-extract)
217
218 set(EXTRA_PO_DIR ${CMAKE_CURRENT_SOURCE_DIR}/extra)
219
220@@ -149,10 +102,7 @@
221
222 set(EXTRA_XGETTEXT_COMMAND
223 ${XGETTEXT_EXECUTABLE} -d extra
224- -o ${EXTRA_PO_DIR}/extra.pot --no-location --from-code=UTF-8)
225-
226- set (INTLTOOL_EXTRACT_COMMAND
227- ${INTLTOOL_EXTRACT_EXECUTABLE} --local --srcdir=/)
228+ -o ${EXTRA_PO_DIR}/extra.pot --from-code=UTF-8)
229
230 set(CONTINUE_FLAG "")
231
232@@ -179,25 +129,19 @@
233
234 foreach(DESKTOP_SOURCE ${ARGS_DESKTOP_FILES})
235 get_filename_component(DESKTOP_SOURCE ${DESKTOP_SOURCE} ABSOLUTE)
236- add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${INTLTOOL_EXTRACT_COMMAND} --type=gettext/keys ${DESKTOP_SOURCE})
237- get_filename_component(DESKTOP_SOURCE_NAME ${DESKTOP_SOURCE} NAME)
238- add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${EXTRA_XGETTEXT_COMMAND} ${CONTINUE_FLAG} ${XGETTEXT_C_ARGS} ${CMAKE_CURRENT_BINARY_DIR}/tmp/${DESKTOP_SOURCE_NAME}.h)
239+ add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${EXTRA_XGETTEXT_COMMAND} ${CONTINUE_FLAG} ${DESKTOP_SOURCE} --add-comments="Translators:")
240 set(CONTINUE_FLAG "-j")
241 endforeach()
242
243 foreach(APPDATA_SOURCE ${ARGS_APPDATA_FILES})
244 get_filename_component(APPDATA_SOURCE ${APPDATA_SOURCE} ABSOLUTE)
245- add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${INTLTOOL_EXTRACT_COMMAND} --type=gettext/xml ${APPDATA_SOURCE})
246- get_filename_component(APPDATA_SOURCE_NAME ${APPDATA_SOURCE} NAME)
247- add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${EXTRA_XGETTEXT_COMMAND} ${CONTINUE_FLAG} ${XGETTEXT_C_ARGS} ${CMAKE_CURRENT_BINARY_DIR}/tmp/${APPDATA_SOURCE_NAME}.h)
248+ add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${EXTRA_XGETTEXT_COMMAND} ${CONTINUE_FLAG} ${APPDATA_SOURCE})
249 set(CONTINUE_FLAG "-j")
250 endforeach()
251
252 foreach(SCHEMA_SOURCE ${ARGS_SCHEMA_FILES})
253 get_filename_component(SCHEMA_SOURCE ${SCHEMA_SOURCE} ABSOLUTE)
254- add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${INTLTOOL_EXTRACT_COMMAND} --type=gettext/schemas ${SCHEMA_SOURCE})
255- get_filename_component(SCHEMA_SOURCE_NAME ${SCHEMA_SOURCE} NAME)
256- add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${EXTRA_XGETTEXT_COMMAND} ${CONTINUE_FLAG} ${XGETTEXT_C_ARGS} ${CMAKE_CURRENT_BINARY_DIR}/tmp/${SCHEMA_SOURCE_NAME}.h)
257+ add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${EXTRA_XGETTEXT_COMMAND} ${CONTINUE_FLAG} ${SCHEMA_SOURCE})
258 set(CONTINUE_FLAG "-j")
259 endforeach()
260 endmacro ()
261
262=== modified file 'data/org.pantheon.switchboard.desktop.in'
263--- data/org.pantheon.switchboard.desktop.in 2016-11-04 22:35:50 +0000
264+++ data/org.pantheon.switchboard.desktop.in 2017-01-18 18:26:40 +0000
265@@ -1,16 +1,18 @@
266 [Desktop Entry]
267 Type=Application
268-_Name=System Settings
269-_Comment=Change system and user settings
270+Name=System Settings
271+Comment=Change system and user settings
272 Exec=switchboard %u
273+#Translators: This is the icon name, copy it as it is or leave it untranslated.
274 Icon=preferences-desktop
275 Terminal=false
276 StartupNotify=true
277 Categories=GNOME;GTK;System;
278-_Keywords=Center;Control;Panel;Preferences;System;
279+#Translators: Keep the same kind of semi-colons, always keep a semi-colon on the end of the string (on the start for RTL languages to have it on the right)
280+Keywords=Center;Control;Panel;Preferences;System;
281 MimeType=x-scheme-handler/settings;
282 Actions=AboutDialog;
283
284 [Desktop Action AboutDialog]
285 Exec=switchboard --about
286-_Name=About System Settings
287+Name=About System Settings
288
289=== modified file 'data/switchboard.appdata.xml.in'
290--- data/switchboard.appdata.xml.in 2016-08-03 01:44:26 +0000
291+++ data/switchboard.appdata.xml.in 2017-01-18 18:26:40 +0000
292@@ -5,12 +5,12 @@
293 <metadata_license>CC0-1.0</metadata_license>
294 <project_group>elementary</project_group>
295 <project_license>GPL-3.0+</project_license>
296- <_name>System Settings</_name>
297- <_summary>Change system and user settings</_summary>
298+ <name>System Settings</name>
299+ <summary>Change system and user settings</summary>
300 <description>
301- <_p>
302+ <p>
303 A system settings application that focuses on modularity and simplicity.
304- </_p>
305+ </p>
306 </description>
307 <provides>
308 <binary>switchboard</binary>
309
310=== modified file 'po/CMakeLists.txt'
311--- po/CMakeLists.txt 2016-08-02 18:13:33 +0000
312+++ po/CMakeLists.txt 2017-01-18 18:26:40 +0000
313@@ -3,7 +3,7 @@
314 add_translations_catalog(${CMAKE_PROJECT_NAME}
315 ../src
316 DESKTOP_FILES
317- ${CMAKE_SOURCE_DIR}/data/${CMAKE_PROJECT_NAME}.desktop.in
318+ ${CMAKE_SOURCE_DIR}/data/org.pantheon.switchboard.desktop.in
319 APPDATA_FILES
320 ${CMAKE_SOURCE_DIR}/data/${CMAKE_PROJECT_NAME}.appdata.xml.in
321 )
322
323=== added file 'po/extra/LINGUAS'
324--- po/extra/LINGUAS 1970-01-01 00:00:00 +0000
325+++ po/extra/LINGUAS 2017-01-18 18:26:40 +0000
326@@ -0,0 +1,2 @@
327+# Set of available languages.
328+aa ab ae af ak am an ar as ast av ay az ba be bg bh bi bm bn bo br bs ca ce ch ckb co cr cs cu cv cy da de dv dz ee el en_AU en_CA en_GB eo es et eu fa ff fi fj fo fr fr_CA fy ga gd gl gn gu gv ha he hi ho hr ht hu hy hz ia id ie ig ii ik io is it iu ja jv ka kg ki kj kk kl km kn ko kr ks ku kv kw ky la lb lg li ln lo lt lu lv mg mh mi mk ml mn mo mr ms mt my na nb nd ne ng nl nn no nr nv ny oc oj om or os pa pi pl ps pt pt_BR qu rm rn ro ru rue rw sa sc sd se sg si sk sl sm sma sn so sq sr ss st su sv sw ta te tg th ti tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa wo xh yi yo za zh zh_CN zh_HK zh_TW zu
329\ No newline at end of file
330
331=== added file 'po/extra/aa.po'
332=== added file 'po/extra/ab.po'
333=== added file 'po/extra/ae.po'
334=== added file 'po/extra/af.po'
335=== added file 'po/extra/ak.po'
336=== added file 'po/extra/am.po'
337=== added file 'po/extra/an.po'
338=== added file 'po/extra/ar.po'
339=== added file 'po/extra/as.po'
340=== added file 'po/extra/ast.po'
341=== added file 'po/extra/av.po'
342=== added file 'po/extra/ay.po'
343=== added file 'po/extra/az.po'
344=== added file 'po/extra/ba.po'
345=== added file 'po/extra/be.po'
346=== added file 'po/extra/bh.po'
347=== added file 'po/extra/bi.po'
348=== added file 'po/extra/bm.po'
349=== added file 'po/extra/bn.po'
350=== added file 'po/extra/bo.po'
351=== added file 'po/extra/br.po'
352=== added file 'po/extra/bs.po'
353=== added file 'po/extra/ce.po'
354=== added file 'po/extra/ch.po'
355=== added file 'po/extra/ckb.po'
356=== added file 'po/extra/co.po'
357=== added file 'po/extra/cr.po'
358=== added file 'po/extra/cs.po'
359=== added file 'po/extra/cu.po'
360=== added file 'po/extra/cv.po'
361=== added file 'po/extra/cy.po'
362=== added file 'po/extra/dv.po'
363=== added file 'po/extra/dz.po'
364=== added file 'po/extra/ee.po'
365=== added file 'po/extra/el.po'
366=== added file 'po/extra/en_AU.po'
367=== added file 'po/extra/eo.po'
368=== added file 'po/extra/eu.po'
369=== modified file 'po/extra/extra.pot'
370--- po/extra/extra.pot 2016-10-30 15:20:36 +0000
371+++ po/extra/extra.pot 2017-01-18 18:26:40 +0000
372@@ -8,7 +8,7 @@
373 msgstr ""
374 "Project-Id-Version: PACKAGE VERSION\n"
375 "Report-Msgid-Bugs-To: \n"
376-"POT-Creation-Date: 2016-10-30 15:50+0100\n"
377+"POT-Creation-Date: 2017-01-18 19:22+0100\n"
378 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
379 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
380 "Language-Team: LANGUAGE <LL@li.org>\n"
381@@ -17,18 +17,35 @@
382 "Content-Type: text/plain; charset=CHARSET\n"
383 "Content-Transfer-Encoding: 8bit\n"
384
385+#: /home/tintou/switchboard/data/org.pantheon.switchboard.desktop.in:4
386+#: /home/tintou/switchboard/data/switchboard.appdata.xml.in:8
387 msgid "System Settings"
388 msgstr ""
389
390+#: /home/tintou/switchboard/data/org.pantheon.switchboard.desktop.in:5
391+#: /home/tintou/switchboard/data/switchboard.appdata.xml.in:9
392 msgid "Change system and user settings"
393 msgstr ""
394
395+#. Translators: This is the icon name, copy it as it is or leave it untranslated.
396+#: /home/tintou/switchboard/data/org.pantheon.switchboard.desktop.in:8
397+msgid "preferences-desktop"
398+msgstr ""
399+
400+#. Translators: Keep the same kind of semi-colons, always keep a semi-colon on the end of the string (on the start for RTL languages to have it on the right)
401+#: /home/tintou/switchboard/data/org.pantheon.switchboard.desktop.in:13
402 msgid "Center;Control;Panel;Preferences;System;"
403 msgstr ""
404
405+#: /home/tintou/switchboard/data/org.pantheon.switchboard.desktop.in:19
406 msgid "About System Settings"
407 msgstr ""
408
409+#: /home/tintou/switchboard/data/switchboard.appdata.xml.in:11
410 msgid ""
411 "A system settings application that focuses on modularity and simplicity."
412 msgstr ""
413+
414+#: /home/tintou/switchboard/data/switchboard.appdata.xml.in:18
415+msgid "elementary LLC."
416+msgstr ""
417
418=== added file 'po/extra/fa.po'
419=== added file 'po/extra/ff.po'
420=== added file 'po/extra/fj.po'
421=== added file 'po/extra/fo.po'
422=== added file 'po/extra/fr_CA.po'
423=== added file 'po/extra/fy.po'
424=== added file 'po/extra/ga.po'
425=== added file 'po/extra/gd.po'
426=== added file 'po/extra/gl.po'
427=== added file 'po/extra/gn.po'
428=== added file 'po/extra/gu.po'
429=== added file 'po/extra/gv.po'
430=== added file 'po/extra/ha.po'
431=== added file 'po/extra/hi.po'
432=== added file 'po/extra/ho.po'
433=== added file 'po/extra/ht.po'
434=== added file 'po/extra/hu.po'
435=== added file 'po/extra/hy.po'
436=== added file 'po/extra/hz.po'
437=== added file 'po/extra/ia.po'
438=== added file 'po/extra/id.po'
439=== added file 'po/extra/ie.po'
440=== added file 'po/extra/ig.po'
441=== added file 'po/extra/ii.po'
442=== added file 'po/extra/ik.po'
443=== added file 'po/extra/io.po'
444=== added file 'po/extra/is.po'
445=== added file 'po/extra/iu.po'
446=== added file 'po/extra/jv.po'
447=== added file 'po/extra/ka.po'
448=== added file 'po/extra/kg.po'
449=== added file 'po/extra/ki.po'
450=== added file 'po/extra/kj.po'
451=== added file 'po/extra/kk.po'
452=== added file 'po/extra/kl.po'
453=== added file 'po/extra/km.po'
454=== added file 'po/extra/kn.po'
455=== added file 'po/extra/kr.po'
456=== added file 'po/extra/ks.po'
457=== added file 'po/extra/ku.po'
458=== added file 'po/extra/kv.po'
459=== added file 'po/extra/kw.po'
460=== added file 'po/extra/ky.po'
461=== added file 'po/extra/la.po'
462=== added file 'po/extra/lb.po'
463=== added file 'po/extra/lg.po'
464=== added file 'po/extra/li.po'
465=== added file 'po/extra/ln.po'
466=== added file 'po/extra/lo.po'
467=== added file 'po/extra/lu.po'
468=== added file 'po/extra/lv.po'
469=== added file 'po/extra/mg.po'
470=== added file 'po/extra/mh.po'
471=== added file 'po/extra/mi.po'
472=== added file 'po/extra/mk.po'
473=== added file 'po/extra/ml.po'
474=== added file 'po/extra/mn.po'
475=== added file 'po/extra/mo.po'
476=== added file 'po/extra/mr.po'
477=== added file 'po/extra/ms.po'
478=== added file 'po/extra/mt.po'
479=== added file 'po/extra/my.po'
480=== added file 'po/extra/na.po'
481=== added file 'po/extra/nb.po'
482=== added file 'po/extra/nd.po'
483=== added file 'po/extra/ne.po'
484=== added file 'po/extra/ng.po'
485=== added file 'po/extra/nn.po'
486=== added file 'po/extra/no.po'
487=== added file 'po/extra/nr.po'
488=== added file 'po/extra/nv.po'
489=== added file 'po/extra/ny.po'
490=== added file 'po/extra/oc.po'
491=== added file 'po/extra/oj.po'
492=== added file 'po/extra/om.po'
493=== added file 'po/extra/or.po'
494=== added file 'po/extra/os.po'
495=== added file 'po/extra/pa.po'
496=== added file 'po/extra/pi.po'
497=== added file 'po/extra/ps.po'
498=== added file 'po/extra/qu.po'
499=== added file 'po/extra/rm.po'
500=== added file 'po/extra/rn.po'
501=== added file 'po/extra/ro.po'
502=== added file 'po/extra/rue.po'
503=== added file 'po/extra/rw.po'
504=== added file 'po/extra/sa.po'
505=== added file 'po/extra/sc.po'
506=== added file 'po/extra/sd.po'
507=== added file 'po/extra/se.po'
508=== added file 'po/extra/sg.po'
509=== added file 'po/extra/si.po'
510=== added file 'po/extra/sk.po'
511=== added file 'po/extra/sm.po'
512=== added file 'po/extra/sma.po'
513=== added file 'po/extra/sn.po'
514=== added file 'po/extra/so.po'
515=== added file 'po/extra/sq.po'
516=== added file 'po/extra/ss.po'
517=== added file 'po/extra/st.po'
518=== added file 'po/extra/su.po'
519=== added file 'po/extra/sw.po'
520=== added file 'po/extra/ta.po'
521=== added file 'po/extra/te.po'
522=== added file 'po/extra/tg.po'
523=== added file 'po/extra/th.po'
524=== added file 'po/extra/ti.po'
525=== added file 'po/extra/tk.po'
526=== added file 'po/extra/tn.po'
527=== added file 'po/extra/to.po'
528=== added file 'po/extra/ts.po'
529=== added file 'po/extra/tt.po'
530=== added file 'po/extra/tw.po'
531=== added file 'po/extra/ty.po'
532=== added file 'po/extra/uz.po'
533=== added file 'po/extra/ve.po'
534=== added file 'po/extra/vi.po'
535=== added file 'po/extra/vo.po'
536=== added file 'po/extra/wa.po'
537=== added file 'po/extra/wo.po'
538=== added file 'po/extra/xh.po'
539=== added file 'po/extra/yi.po'
540=== added file 'po/extra/yo.po'
541=== added file 'po/extra/za.po'
542=== added file 'po/extra/zh.po'
543=== added file 'po/extra/zh_HK.po'
544=== added file 'po/extra/zu.po'
545=== modified file 'po/switchboard.pot'
546--- po/switchboard.pot 2016-10-30 15:20:36 +0000
547+++ po/switchboard.pot 2017-01-18 18:26:40 +0000
548@@ -8,7 +8,7 @@
549 msgstr ""
550 "Project-Id-Version: PACKAGE VERSION\n"
551 "Report-Msgid-Bugs-To: \n"
552-"POT-Creation-Date: 2016-10-30 15:50+0100\n"
553+"POT-Creation-Date: 2017-01-18 19:22+0100\n"
554 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
555 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
556 "Language-Team: LANGUAGE <LL@li.org>\n"
557@@ -17,58 +17,54 @@
558 "Content-Type: text/plain; charset=UTF-8\n"
559 "Content-Transfer-Encoding: 8bit\n"
560
561-#: ../src/CategoryView.vala:167
562-msgid "No Results for “%s”"
563-msgstr ""
564-
565-#: ../src/CategoryView.vala:167
566-msgid "Try changing search terms."
567-msgstr ""
568-
569-#: ../src/CategoryView.vala:176
570-msgid "Personal"
571-msgstr ""
572-
573-#: ../src/CategoryView.vala:178
574-msgid "Hardware"
575-msgstr ""
576-
577-#: ../src/CategoryView.vala:180
578-msgid "Network & Wireless"
579-msgstr ""
580-
581-#: ../src/CategoryView.vala:182
582-msgid "Administration"
583-msgstr ""
584-
585 #: ../src/Switchboard.vala:45
586 msgid "All Settings"
587 msgstr ""
588
589-#: ../src/Switchboard.vala:68
590-msgid "Open a plug"
591-msgstr ""
592-
593-#: ../src/Switchboard.vala:74
594+#: ../src/Switchboard.vala:70
595 msgid "System Settings"
596 msgstr ""
597
598-#: ../src/Switchboard.vala:87
599+#: ../src/Switchboard.vala:83
600 msgid "translator-credits"
601 msgstr ""
602
603-#: ../src/Switchboard.vala:117
604+#: ../src/Switchboard.vala:147
605 msgid "Specified link '%s' does not exist, going back to the main panel"
606 msgstr ""
607
608-#: ../src/Switchboard.vala:327
609+#: ../src/Switchboard.vala:340
610 msgid "No Settings Found"
611 msgstr ""
612
613-#: ../src/Switchboard.vala:327
614+#: ../src/Switchboard.vala:340
615 msgid "Install some and re-launch Switchboard."
616 msgstr ""
617
618-#: ../src/Switchboard.vala:450
619+#: ../src/Switchboard.vala:487
620 msgid "Search Settings"
621 msgstr ""
622+
623+#: ../src/CategoryView.vala:214
624+msgid "No Results for “%s”"
625+msgstr ""
626+
627+#: ../src/CategoryView.vala:214
628+msgid "Try changing search terms."
629+msgstr ""
630+
631+#: ../src/CategoryView.vala:221
632+msgid "Personal"
633+msgstr ""
634+
635+#: ../src/CategoryView.vala:223
636+msgid "Hardware"
637+msgstr ""
638+
639+#: ../src/CategoryView.vala:225
640+msgid "Network & Wireless"
641+msgstr ""
642+
643+#: ../src/CategoryView.vala:227
644+msgid "Administration"
645+msgstr ""

Subscribers

People subscribed via source and target branches

to all changes: