summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md4
-rw-r--r--gtk/gtksortlistmodel.c2
-rw-r--r--gtk/meson.build2
-rw-r--r--gtk/timsort/COPYING202
-rw-r--r--gtk/timsort/README.md8
-rw-r--r--gtk/timsort/gtktimsort-impl.c (renamed from gtk/gtktimsort-impl.c)0
-rw-r--r--gtk/timsort/gtktimsort.c (renamed from gtk/gtktimsort.c)0
-rw-r--r--gtk/timsort/gtktimsortprivate.h (renamed from gtk/gtktimsortprivate.h)0
-rw-r--r--po/gl.po149
-rw-r--r--po/hr.po231
-rw-r--r--po/lt.po152
-rw-r--r--testsuite/gtk/meson.build2
-rw-r--r--testsuite/gtk/timsort.c2
13 files changed, 535 insertions, 219 deletions
diff --git a/README.md b/README.md
index 50d6a3d9ee..cbe7809f58 100644
--- a/README.md
+++ b/README.md
@@ -161,3 +161,7 @@ version 2.1 or, at your option, any later version, as published by the Free
Software Foundation.
Please, see the [`COPYING`](./COPYING) file for further information.
+
+GTK includes a small number of source files under the Apache license:
+- A fork of the roaring bitmaps implementation in [gtk/roaring](./gtk/roaring)
+- An adaptation of timsort from python in [gtk/timsort](./gtk/timsort)
diff --git a/gtk/gtksortlistmodel.c b/gtk/gtksortlistmodel.c
index 8f758d46cf..d9559b3ad4 100644
--- a/gtk/gtksortlistmodel.c
+++ b/gtk/gtksortlistmodel.c
@@ -25,7 +25,7 @@
#include "gtkintl.h"
#include "gtkprivate.h"
#include "gtksorterprivate.h"
-#include "gtktimsortprivate.h"
+#include "timsort/gtktimsortprivate.h"
/* The maximum amount of items to merge for a single merge step
*
diff --git a/gtk/meson.build b/gtk/meson.build
index 0f55ece382..13bdd71d61 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -142,7 +142,7 @@ gtk_private_sources = files([
'gtktextbtree.c',
'gtktexthistory.c',
'gtktextviewchild.c',
- 'gtktimsort.c',
+ 'timsort/gtktimsort.c',
'gtktrashmonitor.c',
'gtktreedatalist.c',
])
diff --git a/gtk/timsort/COPYING b/gtk/timsort/COPYING
new file mode 100644
index 0000000000..d645695673
--- /dev/null
+++ b/gtk/timsort/COPYING
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/gtk/timsort/README.md b/gtk/timsort/README.md
new file mode 100644
index 0000000000..5123860306
--- /dev/null
+++ b/gtk/timsort/README.md
@@ -0,0 +1,8 @@
+Timsort implementation
+======================
+
+This directory contains code modified for GTK, based on the timsort
+implementation in python, and its Java adaptation by Joshua Bloch.
+
+See the source files for copyright and licensing information, and the
+`COPYING` file for the full text of the Apache license, version 2.0.
diff --git a/gtk/gtktimsort-impl.c b/gtk/timsort/gtktimsort-impl.c
index 3e60706b21..3e60706b21 100644
--- a/gtk/gtktimsort-impl.c
+++ b/gtk/timsort/gtktimsort-impl.c
diff --git a/gtk/gtktimsort.c b/gtk/timsort/gtktimsort.c
index 7aadef0dda..7aadef0dda 100644
--- a/gtk/gtktimsort.c
+++ b/gtk/timsort/gtktimsort.c
diff --git a/gtk/gtktimsortprivate.h b/gtk/timsort/gtktimsortprivate.h
index 1fcadbd9a6..1fcadbd9a6 100644
--- a/gtk/gtktimsortprivate.h
+++ b/gtk/timsort/gtktimsortprivate.h
diff --git a/po/gl.po b/po/gl.po
index ce592fca05..ffb4c20223 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -13,16 +13,16 @@
# Antón Méixome <meixome@certima.net>, 2009, 2010.
# Fran Diéguez <frandieguez@gnome.org>, 2009, 2010, 2011, 2012.
# Leandro Regueiro <leandro.regueiro@gmail.com>, 2012.
-# Fran Dieguez <frandieguez@gnome.org>, 2012-2020.
+# Fran Dieguez <frandieguez@gnome.gl>, 2012-2020.
#
msgid ""
msgstr ""
"Project-Id-Version: gtk+-master-po-gl-77922___.merged\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-25 18:30+0000\n"
-"PO-Revision-Date: 2020-08-26 17:40+0200\n"
-"Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
-"Language-Team: Galician <proxecto@trasno.gal>\n"
+"POT-Creation-Date: 2020-08-31 16:17+0000\n"
+"PO-Revision-Date: 2020-09-01 21:07+0200\n"
+"Last-Translator: Fran Dieguez <frandieguez@gnome.gl>\n"
+"Language-Team: Galician <Proxecto Trasno <proxecto@trasno.gal>>\n"
"Language: gl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -1024,7 +1024,7 @@ msgstr "Razón non especificada"
msgid "%s does not exist in the bookmarks list"
msgstr "%s non existe na lista de marcadores"
-#: gtk/gtkbookmarksmanager.c:406
+#: gtk/gtkbookmarksmanager.c:412
#, c-format
msgid "%s already exists in the bookmarks list"
msgstr "%s xa existe na lista de marcadores"
@@ -1345,15 +1345,15 @@ msgid "Margins from Printer…"
msgstr "Marxes da impresora…"
#. And show the custom paper dialog
-#: gtk/gtkcustompaperunixdialog.c:402 gtk/gtkprintunixdialog.c:2993
+#: gtk/gtkcustompaperunixdialog.c:402 gtk/gtkprintunixdialog.c:2992
msgid "Manage Custom Sizes"
msgstr "Xestionar tamaños personalizados"
-#: gtk/gtkcustompaperunixdialog.c:466 gtk/gtkpagesetupunixdialog.c:704
+#: gtk/gtkcustompaperunixdialog.c:466 gtk/gtkpagesetupunixdialog.c:719
msgid "inch"
msgstr "polgadas"
-#: gtk/gtkcustompaperunixdialog.c:468 gtk/gtkpagesetupunixdialog.c:702
+#: gtk/gtkcustompaperunixdialog.c:468 gtk/gtkpagesetupunixdialog.c:717
msgid "mm"
msgstr "mm"
@@ -1477,7 +1477,7 @@ msgstr "Xa existe un ficheiro con ese nome"
#: gtk/gtkfilechoosernative.c:505 gtk/gtkfilechoosernative.c:576
#: gtk/gtkfilechooserwidget.c:1212 gtk/gtkfilechooserwidget.c:5755
#: gtk/gtkmessagedialog.c:742 gtk/gtkmessagedialog.c:751
-#: gtk/gtkmountoperation.c:608 gtk/gtkpagesetupunixdialog.c:281
+#: gtk/gtkmountoperation.c:608 gtk/gtkpagesetupunixdialog.c:284
#: gtk/gtkprintbackend.c:643 gtk/gtkprinteroptionwidget.c:713
#: gtk/gtkprintunixdialog.c:627 gtk/gtkprintunixdialog.c:782
#: gtk/gtkwindow.c:6649 gtk/inspector/css-editor.c:248
@@ -1746,7 +1746,6 @@ msgstr "Folla de cálculo"
#. Translators: We don't know whether this printer is
#. * available to print to.
#: gtk/gtkfilechooserwidget.c:4349 gtk/gtkfilechooserwidget.c:4536
-#: gtk/inspector/prop-editor.c:1468
#: modules/printbackends/gtkprintbackendcloudprint.c:729
msgid "Unknown"
msgstr "Descoñecido"
@@ -1796,51 +1795,51 @@ msgctxt "font"
msgid "None"
msgstr "Ningún"
-#: gtk/gtkfontchooserwidget.c:1072
+#: gtk/gtkfontchooserwidget.c:1111
msgid "Width"
msgstr "Anchura"
-#: gtk/gtkfontchooserwidget.c:1073
+#: gtk/gtkfontchooserwidget.c:1112
msgid "Weight"
msgstr "Peso"
-#: gtk/gtkfontchooserwidget.c:1074
+#: gtk/gtkfontchooserwidget.c:1113
msgid "Italic"
msgstr "Cursiva"
-#: gtk/gtkfontchooserwidget.c:1075
+#: gtk/gtkfontchooserwidget.c:1114
msgid "Slant"
msgstr "Inclinación"
-#: gtk/gtkfontchooserwidget.c:1076
+#: gtk/gtkfontchooserwidget.c:1115
msgid "Optical Size"
msgstr "Tamaño óptico"
-#: gtk/gtkfontchooserwidget.c:1614 gtk/inspector/prop-editor.c:1455
+#: gtk/gtkfontchooserwidget.c:1653
msgid "Default"
msgstr "Por omisión"
-#: gtk/gtkfontchooserwidget.c:1658
+#: gtk/gtkfontchooserwidget.c:1697
msgid "Ligatures"
msgstr "Ligaduras"
-#: gtk/gtkfontchooserwidget.c:1659
+#: gtk/gtkfontchooserwidget.c:1698
msgid "Letter Case"
msgstr "Letra maiúscula"
-#: gtk/gtkfontchooserwidget.c:1660
+#: gtk/gtkfontchooserwidget.c:1699
msgid "Number Case"
msgstr "Maiúsculas e minúsculas de números"
-#: gtk/gtkfontchooserwidget.c:1661
+#: gtk/gtkfontchooserwidget.c:1700
msgid "Number Spacing"
msgstr "Espaciado de números"
-#: gtk/gtkfontchooserwidget.c:1662
+#: gtk/gtkfontchooserwidget.c:1701
msgid "Number Formatting"
msgstr "Formato numérico"
-#: gtk/gtkfontchooserwidget.c:1663
+#: gtk/gtkfontchooserwidget.c:1702
msgid "Character Variants"
msgstr "Variantes de carácter"
@@ -2097,23 +2096,23 @@ msgstr "Páxina %u"
msgid "Not a valid page setup file"
msgstr "Non é un ficheiro válido de configuración de páxina"
-#: gtk/gtkpagesetupunixdialog.c:200 gtk/gtkprintunixdialog.c:712
+#: gtk/gtkpagesetupunixdialog.c:202 gtk/gtkprintunixdialog.c:712
msgid "Manage Custom Sizes…"
msgstr "Xestionar tamaños personalizados…"
-#: gtk/gtkpagesetupunixdialog.c:282 gtk/ui/gtkassistant.ui:98
+#: gtk/gtkpagesetupunixdialog.c:285 gtk/ui/gtkassistant.ui:98
msgid "_Apply"
msgstr "_Aplicar"
-#: gtk/gtkpagesetupunixdialog.c:316 gtk/gtkpagesetupunixdialog.c:567
+#: gtk/gtkpagesetupunixdialog.c:319 gtk/gtkpagesetupunixdialog.c:571
msgid "Any Printer"
msgstr "Calquera impresora"
-#: gtk/gtkpagesetupunixdialog.c:317
+#: gtk/gtkpagesetupunixdialog.c:320
msgid "For portable documents"
msgstr "Para documentos portábeis"
-#: gtk/gtkpagesetupunixdialog.c:722
+#: gtk/gtkpagesetupunixdialog.c:737
#, c-format
msgid ""
"Margins:\n"
@@ -2128,7 +2127,7 @@ msgstr ""
" Superior: %s %s\n"
" Inferior: %s %s"
-#: gtk/gtkpagesetupunixdialog.c:768 gtk/ui/gtkpagesetupunixdialog.ui:5
+#: gtk/gtkpagesetupunixdialog.c:783 gtk/ui/gtkpagesetupunixdialog.ui:5
#: gtk/ui/gtkprintunixdialog.ui:711
msgid "Page Setup"
msgstr "Configuración de páxina"
@@ -2563,12 +2562,11 @@ msgstr ""
#. window
#: gtk/gtkprintoperation-portal.c:236 gtk/gtkprintoperation-portal.c:554
-#: gtk/gtkprintoperation-portal.c:623 gtk/gtkprintunixdialog.c:3033
+#: gtk/gtkprintoperation-portal.c:623 gtk/gtkprintunixdialog.c:3032
msgid "Print"
msgstr "Imprimir"
#: gtk/gtkprintoperation-unix.c:479 gtk/gtkprintoperation-win32.c:1503
-#: gtk/inspector/prop-editor.c:1465
msgid "Application"
msgstr "Aplicación"
@@ -2899,7 +2897,7 @@ msgid "Attribute"
msgstr "Atributo"
#: gtk/inspector/a11y.ui:54 gtk/inspector/css-node-tree.ui:119
-#: gtk/inspector/prop-list.ui:56 gtk/inspector/recorder.ui:115
+#: gtk/inspector/prop-list.ui:56 gtk/inspector/recorder.ui:123
msgid "Value"
msgstr "Valor"
@@ -3120,8 +3118,8 @@ msgid "Surface"
msgstr "Superficie"
#: gtk/inspector/misc-info.ui:316 gtk/inspector/misc-info.ui:355
-#: gtk/inspector/misc-info.ui:394 gtk/inspector/prop-editor.c:1039
-#: gtk/inspector/prop-editor.c:1396 gtk/inspector/window.ui:418
+#: gtk/inspector/misc-info.ui:394 gtk/inspector/prop-editor.c:1054
+#: gtk/inspector/prop-editor.c:1414 gtk/inspector/window.ui:418
msgid "Properties"
msgstr "Propiedades"
@@ -3166,70 +3164,104 @@ msgstr "Fillo visíbel"
msgid "Pointer: %p"
msgstr "Punteiro: %p"
-#: gtk/inspector/prop-editor.c:785
+#. Translators: %s is a type name, for example
+#. * GtkPropertyExpression with value \"2.5\"
+#.
+#: gtk/inspector/prop-editor.c:788
#, c-format
msgid "%s with value \"%s\""
msgstr "%s con valor \"%s\""
-#: gtk/inspector/prop-editor.c:793
+#. Translators: Both %s are type names, for example
+#. * GtkPropertyExpression with type GObject
+#.
+#: gtk/inspector/prop-editor.c:799
#, c-format
msgid "%s with type %s"
msgstr "%s con tipo %s"
-#: gtk/inspector/prop-editor.c:803
+#. Translators: Both %s are type names, for example
+#. * GtkObjectExpression for GtkStringObject 0x23456789
+#.
+#: gtk/inspector/prop-editor.c:812
#, c-format
msgid "%s for %s %p"
msgstr "%s para %s %p"
-#: gtk/inspector/prop-editor.c:807
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: gtk/inspector/prop-editor.c:827
+#. Translators: Both %s are type names, for example
+#. * GtkPropertyExpression with value type: gchararray
+#.
+#: gtk/inspector/prop-editor.c:842
#, c-format
msgid "%s with value type %s"
msgstr "%s con tipo de valor %s"
-#: gtk/inspector/prop-editor.c:1107
+#: gtk/inspector/prop-editor.c:1122
#, c-format
msgid "Uneditable property type: %s"
msgstr "Tipo de propiedade non editábel: %s"
-#: gtk/inspector/prop-editor.c:1251
+#: gtk/inspector/prop-editor.c:1266
+#| msgid "None"
+msgctxt "column number"
msgid "None"
msgstr "Ningún"
-#: gtk/inspector/prop-editor.c:1288
+#: gtk/inspector/prop-editor.c:1303
msgid "Attribute:"
msgstr "Atributo:"
-#: gtk/inspector/prop-editor.c:1291
+#: gtk/inspector/prop-editor.c:1306
msgid "Model"
msgstr "Modelo"
-#: gtk/inspector/prop-editor.c:1296
+#: gtk/inspector/prop-editor.c:1311
msgid "Column:"
msgstr "Columna:"
-#: gtk/inspector/prop-editor.c:1392
+#. Translators: %s is a type name, for example
+#. * Action from 0x2345678 (GtkApplicationWindow)
+#.
+#: gtk/inspector/prop-editor.c:1410
#, c-format
msgid "Action from: %p (%s)"
msgstr "Acción desde: %p (%s)"
-#: gtk/inspector/prop-editor.c:1447
+#: gtk/inspector/prop-editor.c:1465
msgid "Reset"
msgstr "Restabelecer"
-#: gtk/inspector/prop-editor.c:1458
+#: gtk/inspector/prop-editor.c:1473
+#| msgid "Default"
+msgctxt "GtkSettings source"
+msgid "Default"
+msgstr "Por omisión"
+
+#: gtk/inspector/prop-editor.c:1476
+#| msgid "Theme"
+msgctxt "GtkSettings source"
msgid "Theme"
msgstr "Tema"
-#: gtk/inspector/prop-editor.c:1461
+#: gtk/inspector/prop-editor.c:1479
+#| msgid "XSettings"
+msgctxt "GtkSettings source"
msgid "XSettings"
msgstr "XSettings"
-#: gtk/inspector/prop-editor.c:1471
+#: gtk/inspector/prop-editor.c:1483
+#| msgid "Application"
+msgctxt "GtkSettings source"
+msgid "Application"
+msgstr "Aplicación"
+
+#: gtk/inspector/prop-editor.c:1486
+#| msgid "Unknown"
+msgctxt "GtkSettings source"
+msgid "Unknown"
+msgstr "Descoñecido"
+
+#: gtk/inspector/prop-editor.c:1489
msgid "Source:"
msgstr "Orixe:"
@@ -3254,11 +3286,15 @@ msgstr "Limpar marcos gravados"
msgid "Add debug nodes"
msgstr "Engadir nodos de depuración"
-#: gtk/inspector/recorder.ui:45
+#: gtk/inspector/recorder.ui:44
+msgid "Use a dark background"
+msgstr "Usar o fondo escuro"
+
+#: gtk/inspector/recorder.ui:53
msgid "Save selected node"
msgstr "Gardar o nodo seleccionado"
-#: gtk/inspector/recorder.ui:102
+#: gtk/inspector/recorder.ui:110
msgid "Property"
msgstr "Propiedade"
@@ -7203,6 +7239,9 @@ msgstr "Non hai un perfil dispoñíbel"
msgid "Unspecified profile"
msgstr "Perfil non especificado"
+#~ msgid "%s"
+#~ msgstr "%s"
+
#~ msgid "Not implemented on OS X"
#~ msgstr "Non implementado en OS X"
diff --git a/po/hr.po b/po/hr.po
index d12f86827e..8bc731f21d 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -5,9 +5,9 @@ msgid ""
msgstr ""
"Project-Id-Version: gtk+ 0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 11:48+0000\n"
-"PO-Revision-Date: 2020-08-23 13:13+0200\n"
-"Last-Translator: gogo <linux.hr@protonmail.com>\n"
+"POT-Creation-Date: 2020-08-31 16:17+0000\n"
+"PO-Revision-Date: 2020-09-01 23:13+0200\n"
+"Last-Translator: gogo <trebelnik2@gmail.com>\n"
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
"Language: hr\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"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"
"X-Launchpad-Export-Date: 2017-04-10 20:36+0000\n"
-"X-Generator: Poedit 2.4.1\n"
+"X-Generator: Poedit 2.3\n"
#: gdk/broadway/gdkbroadway-server.c:133
#, c-format
@@ -1017,7 +1017,7 @@ msgstr "Razlog nije naveden"
msgid "%s does not exist in the bookmarks list"
msgstr "%s ne postoji u popisu zabilješki"
-#: gtk/gtkbookmarksmanager.c:406
+#: gtk/gtkbookmarksmanager.c:412
#, c-format
msgid "%s already exists in the bookmarks list"
msgstr "%s već postoji u popisu zabilješki"
@@ -1134,188 +1134,188 @@ msgstr "%d %%"
msgid "Pick a Color"
msgstr "Odaberi boju"
-#: gtk/gtkcolorchooserwidget.c:382
+#: gtk/gtkcolorchooserwidget.c:383
msgctxt "Color name"
msgid "Light Scarlet Red"
msgstr "Svjetlo grimizno crvena"
-#: gtk/gtkcolorchooserwidget.c:383
+#: gtk/gtkcolorchooserwidget.c:384
msgctxt "Color name"
msgid "Scarlet Red"
msgstr "Grimizno crvena"
-#: gtk/gtkcolorchooserwidget.c:384
+#: gtk/gtkcolorchooserwidget.c:385
msgctxt "Color name"
msgid "Dark Scarlet Red"
msgstr "Tamno grimizno crvena"
-#: gtk/gtkcolorchooserwidget.c:385
+#: gtk/gtkcolorchooserwidget.c:386
msgctxt "Color name"
msgid "Light Orange"
msgstr "Svjetlo narančasta"
-#: gtk/gtkcolorchooserwidget.c:386
+#: gtk/gtkcolorchooserwidget.c:387
msgctxt "Color name"
msgid "Orange"
msgstr "Narančasta"
-#: gtk/gtkcolorchooserwidget.c:387
+#: gtk/gtkcolorchooserwidget.c:388
msgctxt "Color name"
msgid "Dark Orange"
msgstr "Tamno narančasta"
-#: gtk/gtkcolorchooserwidget.c:388
+#: gtk/gtkcolorchooserwidget.c:389
msgctxt "Color name"
msgid "Light Butter"
msgstr "Svjetlo maslo"
-#: gtk/gtkcolorchooserwidget.c:389
+#: gtk/gtkcolorchooserwidget.c:390
msgctxt "Color name"
msgid "Butter"
msgstr "Maslo"
-#: gtk/gtkcolorchooserwidget.c:390
+#: gtk/gtkcolorchooserwidget.c:391
msgctxt "Color name"
msgid "Dark Butter"
msgstr "Tamno maslo"
-#: gtk/gtkcolorchooserwidget.c:391
+#: gtk/gtkcolorchooserwidget.c:392
msgctxt "Color name"
msgid "Light Chameleon"
msgstr "Svjetli kameleon"
-#: gtk/gtkcolorchooserwidget.c:392
+#: gtk/gtkcolorchooserwidget.c:393
msgctxt "Color name"
msgid "Chameleon"
msgstr "Kameleon"
-#: gtk/gtkcolorchooserwidget.c:393
+#: gtk/gtkcolorchooserwidget.c:394
msgctxt "Color name"
msgid "Dark Chameleon"
msgstr "Tamni kameleon"
-#: gtk/gtkcolorchooserwidget.c:394
+#: gtk/gtkcolorchooserwidget.c:395
msgctxt "Color name"
msgid "Light Sky Blue"
msgstr "Svjetlo nebesko plava"
-#: gtk/gtkcolorchooserwidget.c:395
+#: gtk/gtkcolorchooserwidget.c:396
msgctxt "Color name"
msgid "Sky Blue"
msgstr "Nebesko plava"
-#: gtk/gtkcolorchooserwidget.c:396
+#: gtk/gtkcolorchooserwidget.c:397
msgctxt "Color name"
msgid "Dark Sky Blue"
msgstr "Tamno nebesko plava"
-#: gtk/gtkcolorchooserwidget.c:397
+#: gtk/gtkcolorchooserwidget.c:398
msgctxt "Color name"
msgid "Light Plum"
msgstr "Svjetla šljiva"
-#: gtk/gtkcolorchooserwidget.c:398
+#: gtk/gtkcolorchooserwidget.c:399
msgctxt "Color name"
msgid "Plum"
msgstr "Šljiva"
-#: gtk/gtkcolorchooserwidget.c:399
+#: gtk/gtkcolorchooserwidget.c:400
msgctxt "Color name"
msgid "Dark Plum"
msgstr "Tamna šljiva"
-#: gtk/gtkcolorchooserwidget.c:400
+#: gtk/gtkcolorchooserwidget.c:401
msgctxt "Color name"
msgid "Light Chocolate"
msgstr "Svjetla čokolada"
-#: gtk/gtkcolorchooserwidget.c:401
+#: gtk/gtkcolorchooserwidget.c:402
msgctxt "Color name"
msgid "Chocolate"
msgstr "Čokolada"
-#: gtk/gtkcolorchooserwidget.c:402
+#: gtk/gtkcolorchooserwidget.c:403
msgctxt "Color name"
msgid "Dark Chocolate"
msgstr "Tamna čokolada"
-#: gtk/gtkcolorchooserwidget.c:403
+#: gtk/gtkcolorchooserwidget.c:404
msgctxt "Color name"
msgid "Light Aluminum 1"
msgstr "Svjetla aluminijska 1"
-#: gtk/gtkcolorchooserwidget.c:404
+#: gtk/gtkcolorchooserwidget.c:405
msgctxt "Color name"
msgid "Aluminum 1"
msgstr "Aluminijska 1"
-#: gtk/gtkcolorchooserwidget.c:405
+#: gtk/gtkcolorchooserwidget.c:406
msgctxt "Color name"
msgid "Dark Aluminum 1"
msgstr "Tamna aluminijska 1"
-#: gtk/gtkcolorchooserwidget.c:406
+#: gtk/gtkcolorchooserwidget.c:407
msgctxt "Color name"
msgid "Light Aluminum 2"
msgstr "Svjetla aluminijska 2"
-#: gtk/gtkcolorchooserwidget.c:407
+#: gtk/gtkcolorchooserwidget.c:408
msgctxt "Color name"
msgid "Aluminum 2"
msgstr "Aluminijska 2"
-#: gtk/gtkcolorchooserwidget.c:408
+#: gtk/gtkcolorchooserwidget.c:409
msgctxt "Color name"
msgid "Dark Aluminum 2"
msgstr "Tamna aluminijska 2"
-#: gtk/gtkcolorchooserwidget.c:422
+#: gtk/gtkcolorchooserwidget.c:423
msgctxt "Color name"
msgid "Black"
msgstr "Crna"
-#: gtk/gtkcolorchooserwidget.c:423
+#: gtk/gtkcolorchooserwidget.c:424
msgctxt "Color name"
msgid "Very Dark Gray"
msgstr "Vrlo tamno siva"
-#: gtk/gtkcolorchooserwidget.c:424
+#: gtk/gtkcolorchooserwidget.c:425
msgctxt "Color name"
msgid "Darker Gray"
msgstr "Tamnije siva"
-#: gtk/gtkcolorchooserwidget.c:425
+#: gtk/gtkcolorchooserwidget.c:426
msgctxt "Color name"
msgid "Dark Gray"
msgstr "Tamno siva"
-#: gtk/gtkcolorchooserwidget.c:426
+#: gtk/gtkcolorchooserwidget.c:427
msgctxt "Color name"
msgid "Medium Gray"
msgstr "Srednje siva"
-#: gtk/gtkcolorchooserwidget.c:427
+#: gtk/gtkcolorchooserwidget.c:428
msgctxt "Color name"
msgid "Light Gray"
msgstr "Svjetlo siva"
-#: gtk/gtkcolorchooserwidget.c:428
+#: gtk/gtkcolorchooserwidget.c:429
msgctxt "Color name"
msgid "Lighter Gray"
msgstr "Svjetlije siva"
-#: gtk/gtkcolorchooserwidget.c:429
+#: gtk/gtkcolorchooserwidget.c:430
msgctxt "Color name"
msgid "Very Light Gray"
msgstr "Vrlo svjetlo siva"
-#: gtk/gtkcolorchooserwidget.c:430
+#: gtk/gtkcolorchooserwidget.c:431
msgctxt "Color name"
msgid "White"
msgstr "Bijela"
#. translators: label for the custom section in the color chooser
-#: gtk/gtkcolorchooserwidget.c:511
+#: gtk/gtkcolorchooserwidget.c:512
msgid "Custom"
msgstr "Prilagođena"
@@ -1338,15 +1338,15 @@ msgid "Margins from Printer…"
msgstr "Rubovi iz pisača…"
#. And show the custom paper dialog
-#: gtk/gtkcustompaperunixdialog.c:402 gtk/gtkprintunixdialog.c:2993
+#: gtk/gtkcustompaperunixdialog.c:402 gtk/gtkprintunixdialog.c:2992
msgid "Manage Custom Sizes"
msgstr "Upravljaj prilagođenim veličinama"
-#: gtk/gtkcustompaperunixdialog.c:466 gtk/gtkpagesetupunixdialog.c:704
+#: gtk/gtkcustompaperunixdialog.c:466 gtk/gtkpagesetupunixdialog.c:719
msgid "inch"
msgstr "inča"
-#: gtk/gtkcustompaperunixdialog.c:468 gtk/gtkpagesetupunixdialog.c:702
+#: gtk/gtkcustompaperunixdialog.c:468 gtk/gtkpagesetupunixdialog.c:717
msgid "mm"
msgstr "mm"
@@ -1470,7 +1470,7 @@ msgstr "Datoteka s tim nazivom već postoji"
#: gtk/gtkfilechoosernative.c:505 gtk/gtkfilechoosernative.c:576
#: gtk/gtkfilechooserwidget.c:1212 gtk/gtkfilechooserwidget.c:5755
#: gtk/gtkmessagedialog.c:742 gtk/gtkmessagedialog.c:751
-#: gtk/gtkmountoperation.c:608 gtk/gtkpagesetupunixdialog.c:281
+#: gtk/gtkmountoperation.c:608 gtk/gtkpagesetupunixdialog.c:284
#: gtk/gtkprintbackend.c:643 gtk/gtkprinteroptionwidget.c:713
#: gtk/gtkprintunixdialog.c:627 gtk/gtkprintunixdialog.c:782
#: gtk/gtkwindow.c:6649 gtk/inspector/css-editor.c:248
@@ -1564,7 +1564,7 @@ msgid "If you delete an item, it will be permanently lost."
msgstr "Ako obrišete stavku, biti će trajno izgubljena."
#: gtk/gtkfilechooserwidget.c:1213 gtk/gtkfilechooserwidget.c:1829
-#: gtk/gtklabel.c:5423 gtk/gtktext.c:5945 gtk/gtktextview.c:8558
+#: gtk/gtklabel.c:5423 gtk/gtktext.c:5969 gtk/gtktextview.c:8558
msgid "_Delete"
msgstr "_Obriši"
@@ -1736,7 +1736,6 @@ msgstr "Proračunska tablica"
#. Translators: We don't know whether this printer is
#. * available to print to.
#: gtk/gtkfilechooserwidget.c:4349 gtk/gtkfilechooserwidget.c:4536
-#: gtk/inspector/prop-editor.c:1468
#: modules/printbackends/gtkprintbackendcloudprint.c:729
msgid "Unknown"
msgstr "Nepoznato"
@@ -1785,51 +1784,51 @@ msgctxt "font"
msgid "None"
msgstr "Nijedno"
-#: gtk/gtkfontchooserwidget.c:1071
+#: gtk/gtkfontchooserwidget.c:1111
msgid "Width"
msgstr "Širina"
-#: gtk/gtkfontchooserwidget.c:1072
+#: gtk/gtkfontchooserwidget.c:1112
msgid "Weight"
msgstr "Težina"
-#: gtk/gtkfontchooserwidget.c:1073
+#: gtk/gtkfontchooserwidget.c:1113
msgid "Italic"
msgstr "Ukošeno"
-#: gtk/gtkfontchooserwidget.c:1074
+#: gtk/gtkfontchooserwidget.c:1114
msgid "Slant"
msgstr "Nagib"
-#: gtk/gtkfontchooserwidget.c:1075
+#: gtk/gtkfontchooserwidget.c:1115
msgid "Optical Size"
msgstr "Optička veličina"
-#: gtk/gtkfontchooserwidget.c:1613 gtk/inspector/prop-editor.c:1455
+#: gtk/gtkfontchooserwidget.c:1653
msgid "Default"
msgstr "Zadano"
-#: gtk/gtkfontchooserwidget.c:1657
+#: gtk/gtkfontchooserwidget.c:1697
msgid "Ligatures"
msgstr "Ligature"
-#: gtk/gtkfontchooserwidget.c:1658
+#: gtk/gtkfontchooserwidget.c:1698
msgid "Letter Case"
msgstr "Malo slovo"
-#: gtk/gtkfontchooserwidget.c:1659
+#: gtk/gtkfontchooserwidget.c:1699
msgid "Number Case"
msgstr "Broj slučaja"
-#: gtk/gtkfontchooserwidget.c:1660
+#: gtk/gtkfontchooserwidget.c:1700
msgid "Number Spacing"
msgstr "Razmak brojeva"
-#: gtk/gtkfontchooserwidget.c:1661
+#: gtk/gtkfontchooserwidget.c:1701
msgid "Number Formatting"
msgstr "Format brojeva"
-#: gtk/gtkfontchooserwidget.c:1662
+#: gtk/gtkfontchooserwidget.c:1702
msgid "Character Variants"
msgstr "Varijante znaka"
@@ -1837,19 +1836,19 @@ msgstr "Varijante znaka"
msgid "OpenGL context creation failed"
msgstr "Neuspjelo stvaranje OpenGL sadržaja"
-#: gtk/gtklabel.c:5420 gtk/gtktext.c:5933 gtk/gtktextview.c:8546
+#: gtk/gtklabel.c:5420 gtk/gtktext.c:5957 gtk/gtktextview.c:8546
msgid "Cu_t"
msgstr "Iz_reži"
-#: gtk/gtklabel.c:5421 gtk/gtktext.c:5937 gtk/gtktextview.c:8550
+#: gtk/gtklabel.c:5421 gtk/gtktext.c:5961 gtk/gtktextview.c:8550
msgid "_Copy"
msgstr "_Kopiraj"
-#: gtk/gtklabel.c:5422 gtk/gtktext.c:5941 gtk/gtktextview.c:8554
+#: gtk/gtklabel.c:5422 gtk/gtktext.c:5965 gtk/gtktextview.c:8554
msgid "_Paste"
msgstr "_Zalijepi"
-#: gtk/gtklabel.c:5428 gtk/gtktext.c:5954 gtk/gtktextview.c:8579
+#: gtk/gtklabel.c:5428 gtk/gtktext.c:5978 gtk/gtktextview.c:8579
msgid "Select _All"
msgstr "Odaberi _sve"
@@ -2085,23 +2084,23 @@ msgstr "Stranica %u"
msgid "Not a valid page setup file"
msgstr "Neispravna datoteka postavke stranice"
-#: gtk/gtkpagesetupunixdialog.c:200 gtk/gtkprintunixdialog.c:712
+#: gtk/gtkpagesetupunixdialog.c:202 gtk/gtkprintunixdialog.c:712
msgid "Manage Custom Sizes…"
msgstr "Upravljaj prilagođenim veličinama…"
-#: gtk/gtkpagesetupunixdialog.c:282 gtk/ui/gtkassistant.ui:98
+#: gtk/gtkpagesetupunixdialog.c:285 gtk/ui/gtkassistant.ui:98
msgid "_Apply"
msgstr "_Primijeni"
-#: gtk/gtkpagesetupunixdialog.c:316 gtk/gtkpagesetupunixdialog.c:567
+#: gtk/gtkpagesetupunixdialog.c:319 gtk/gtkpagesetupunixdialog.c:571
msgid "Any Printer"
msgstr "Bilo koji pisač"
-#: gtk/gtkpagesetupunixdialog.c:317
+#: gtk/gtkpagesetupunixdialog.c:320
msgid "For portable documents"
msgstr "Za prenosive dokumente"
-#: gtk/gtkpagesetupunixdialog.c:722
+#: gtk/gtkpagesetupunixdialog.c:737
#, c-format
msgid ""
"Margins:\n"
@@ -2116,7 +2115,7 @@ msgstr ""
" Vrh: %s %s\n"
" Dno: %s %s"
-#: gtk/gtkpagesetupunixdialog.c:768 gtk/ui/gtkpagesetupunixdialog.ui:5
+#: gtk/gtkpagesetupunixdialog.c:783 gtk/ui/gtkpagesetupunixdialog.ui:5
#: gtk/ui/gtkprintunixdialog.ui:711
msgid "Page Setup"
msgstr "Postavke ispisa"
@@ -2337,7 +2336,7 @@ msgstr "_Zaustavi uređaj s više diskova"
msgid "_Lock Device"
msgstr "_Zaključaj uređaj"
-#: gtk/gtkplacessidebar.c:3822 gtk/gtkplacesview.c:1105
+#: gtk/gtkplacessidebar.c:3821 gtk/gtkplacesview.c:1105
msgid "Computer"
msgstr "Računalo"
@@ -2553,12 +2552,11 @@ msgstr ""
#. window
#: gtk/gtkprintoperation-portal.c:236 gtk/gtkprintoperation-portal.c:554
-#: gtk/gtkprintoperation-portal.c:623 gtk/gtkprintunixdialog.c:3033
+#: gtk/gtkprintoperation-portal.c:623 gtk/gtkprintunixdialog.c:3032
msgid "Print"
msgstr "Ispis"
#: gtk/gtkprintoperation-unix.c:479 gtk/gtkprintoperation-win32.c:1503
-#: gtk/inspector/prop-editor.c:1465
msgid "Application"
msgstr "Aplikacija"
@@ -2813,7 +2811,7 @@ msgstr "Pokušaj drugačiju pretragu"
msgid "Could not show link"
msgstr "Nemoguće prikazati poveznicu"
-#: gtk/gtktext.c:5959 gtk/gtktextview.c:8584
+#: gtk/gtktext.c:5983 gtk/gtktextview.c:8584
msgid "Insert _Emoji"
msgstr "Umetni _smajli"
@@ -2889,7 +2887,7 @@ msgid "Attribute"
msgstr "Značajka"
#: gtk/inspector/a11y.ui:54 gtk/inspector/css-node-tree.ui:119
-#: gtk/inspector/prop-list.ui:56 gtk/inspector/recorder.ui:115
+#: gtk/inspector/prop-list.ui:56 gtk/inspector/recorder.ui:123
msgid "Value"
msgstr "Vrijednost"
@@ -3109,8 +3107,8 @@ msgid "Surface"
msgstr "Površina"
#: gtk/inspector/misc-info.ui:316 gtk/inspector/misc-info.ui:355
-#: gtk/inspector/misc-info.ui:394 gtk/inspector/prop-editor.c:1039
-#: gtk/inspector/prop-editor.c:1396 gtk/inspector/window.ui:418
+#: gtk/inspector/misc-info.ui:394 gtk/inspector/prop-editor.c:1054
+#: gtk/inspector/prop-editor.c:1414 gtk/inspector/window.ui:418
msgid "Properties"
msgstr "Svojstva"
@@ -3155,70 +3153,98 @@ msgstr "Podređena vidljivost"
msgid "Pointer: %p"
msgstr "Pokazivač: %p"
-#: gtk/inspector/prop-editor.c:785
+#. Translators: %s is a type name, for example
+#. * GtkPropertyExpression with value \"2.5\"
+#.
+#: gtk/inspector/prop-editor.c:788
#, c-format
msgid "%s with value \"%s\""
msgstr "%s s vrijednosti \"%s\""
-#: gtk/inspector/prop-editor.c:793
+#. Translators: Both %s are type names, for example
+#. * GtkPropertyExpression with type GObject
+#.
+#: gtk/inspector/prop-editor.c:799
#, c-format
msgid "%s with type %s"
msgstr "%s s vrstom %s"
-#: gtk/inspector/prop-editor.c:803
+#. Translators: Both %s are type names, for example
+#. * GtkObjectExpression for GtkStringObject 0x23456789
+#.
+#: gtk/inspector/prop-editor.c:812
#, c-format
msgid "%s for %s %p"
msgstr "%s za %s %p"
-#: gtk/inspector/prop-editor.c:807
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: gtk/inspector/prop-editor.c:827
+#. Translators: Both %s are type names, for example
+#. * GtkPropertyExpression with value type: gchararray
+#.
+#: gtk/inspector/prop-editor.c:842
#, c-format
msgid "%s with value type %s"
msgstr "%s s vrijednosti vrste %s"
-#: gtk/inspector/prop-editor.c:1107
+#: gtk/inspector/prop-editor.c:1122
#, c-format
msgid "Uneditable property type: %s"
msgstr "Neuredljivo svojstvo vrste: %s"
-#: gtk/inspector/prop-editor.c:1251
+#: gtk/inspector/prop-editor.c:1266
+msgctxt "column number"
msgid "None"
-msgstr "Nijedno"
+msgstr "Nepoznat"
-#: gtk/inspector/prop-editor.c:1288
+#: gtk/inspector/prop-editor.c:1303
msgid "Attribute:"
msgstr "Značajka:"
-#: gtk/inspector/prop-editor.c:1291
+#: gtk/inspector/prop-editor.c:1306
msgid "Model"
msgstr "Model"
-#: gtk/inspector/prop-editor.c:1296
+#: gtk/inspector/prop-editor.c:1311
msgid "Column:"
msgstr "Stupac:"
-#: gtk/inspector/prop-editor.c:1392
+#. Translators: %s is a type name, for example
+#. * Action from 0x2345678 (GtkApplicationWindow)
+#.
+#: gtk/inspector/prop-editor.c:1410
#, c-format
msgid "Action from: %p (%s)"
msgstr "Radnja iz : %p (%s)"
-#: gtk/inspector/prop-editor.c:1447
+#: gtk/inspector/prop-editor.c:1465
msgid "Reset"
msgstr "Vrati izvorno"
-#: gtk/inspector/prop-editor.c:1458
+#: gtk/inspector/prop-editor.c:1473
+msgctxt "GtkSettings source"
+msgid "Default"
+msgstr "Zadano"
+
+#: gtk/inspector/prop-editor.c:1476
+msgctxt "GtkSettings source"
msgid "Theme"
msgstr "Tema"
-#: gtk/inspector/prop-editor.c:1461
+#: gtk/inspector/prop-editor.c:1479
+msgctxt "GtkSettings source"
msgid "XSettings"
msgstr "X postavke"
-#: gtk/inspector/prop-editor.c:1471
+#: gtk/inspector/prop-editor.c:1483
+msgctxt "GtkSettings source"
+msgid "Application"
+msgstr "Aplikacija"
+
+#: gtk/inspector/prop-editor.c:1486
+msgctxt "GtkSettings source"
+msgid "Unknown"
+msgstr "Napoznato"
+
+#: gtk/inspector/prop-editor.c:1489
msgid "Source:"
msgstr "Izvor:"
@@ -3243,11 +3269,15 @@ msgstr "Obriši snimljene okvire"
msgid "Add debug nodes"
msgstr "Dodaj čvorove otklanjanja grešaka"
-#: gtk/inspector/recorder.ui:45
+#: gtk/inspector/recorder.ui:44
+msgid "Use a dark background"
+msgstr "Koristi tamnu pozadinu"
+
+#: gtk/inspector/recorder.ui:53
msgid "Save selected node"
msgstr "Spremi odabrani čvor"
-#: gtk/inspector/recorder.ui:102
+#: gtk/inspector/recorder.ui:110
msgid "Property"
msgstr "Svojstvo"
@@ -7190,6 +7220,9 @@ msgstr "Nema dostupnog profila"
msgid "Unspecified profile"
msgstr "Neodređeni profil"
+#~ msgid "%s"
+#~ msgstr "%s"
+
#~ msgid "Failed to get contents as “%s”"
#~ msgstr "Neuspjelo dobivanje sadržaja kao “%s”"
diff --git a/po/lt.po b/po/lt.po
index 9a11203726..0cbab0adda 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: lt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-25 18:30+0000\n"
-"PO-Revision-Date: 2020-08-25 23:16+0300\n"
+"POT-Creation-Date: 2020-08-31 16:17+0000\n"
+"PO-Revision-Date: 2020-09-01 22:44+0300\n"
"Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n"
"Language-Team: Lietuvių <gnome-lt@lists.akl.lt>\n"
"Language: lt\n"
@@ -1003,7 +1003,7 @@ msgstr "Priežastis nenurodyta"
msgid "%s does not exist in the bookmarks list"
msgstr "%s nėra žymelių sąraše"
-#: gtk/gtkbookmarksmanager.c:406
+#: gtk/gtkbookmarksmanager.c:412
#, c-format
msgid "%s already exists in the bookmarks list"
msgstr "%s jau yra žymelių sąraše"
@@ -1324,15 +1324,15 @@ msgid "Margins from Printer…"
msgstr "Paraštės iš spausdintuvo…"
#. And show the custom paper dialog
-#: gtk/gtkcustompaperunixdialog.c:402 gtk/gtkprintunixdialog.c:2993
+#: gtk/gtkcustompaperunixdialog.c:402 gtk/gtkprintunixdialog.c:2992
msgid "Manage Custom Sizes"
msgstr "Tvarkyti pasirinktinius dydžius"
-#: gtk/gtkcustompaperunixdialog.c:466 gtk/gtkpagesetupunixdialog.c:704
+#: gtk/gtkcustompaperunixdialog.c:466 gtk/gtkpagesetupunixdialog.c:719
msgid "inch"
msgstr "colis"
-#: gtk/gtkcustompaperunixdialog.c:468 gtk/gtkpagesetupunixdialog.c:702
+#: gtk/gtkcustompaperunixdialog.c:468 gtk/gtkpagesetupunixdialog.c:717
msgid "mm"
msgstr "mm"
@@ -1456,7 +1456,7 @@ msgstr "Jau yra failas tokiu pavadinimu"
#: gtk/gtkfilechoosernative.c:505 gtk/gtkfilechoosernative.c:576
#: gtk/gtkfilechooserwidget.c:1212 gtk/gtkfilechooserwidget.c:5755
#: gtk/gtkmessagedialog.c:742 gtk/gtkmessagedialog.c:751
-#: gtk/gtkmountoperation.c:608 gtk/gtkpagesetupunixdialog.c:281
+#: gtk/gtkmountoperation.c:608 gtk/gtkpagesetupunixdialog.c:284
#: gtk/gtkprintbackend.c:643 gtk/gtkprinteroptionwidget.c:713
#: gtk/gtkprintunixdialog.c:627 gtk/gtkprintunixdialog.c:782
#: gtk/gtkwindow.c:6649 gtk/inspector/css-editor.c:248
@@ -1722,7 +1722,6 @@ msgstr "Skaičiuoklė"
#. Translators: We don't know whether this printer is
#. * available to print to.
#: gtk/gtkfilechooserwidget.c:4349 gtk/gtkfilechooserwidget.c:4536
-#: gtk/inspector/prop-editor.c:1468
#: modules/printbackends/gtkprintbackendcloudprint.c:729
msgid "Unknown"
msgstr "Nežinomas"
@@ -1771,51 +1770,51 @@ msgctxt "font"
msgid "None"
msgstr "Nėra"
-#: gtk/gtkfontchooserwidget.c:1072
+#: gtk/gtkfontchooserwidget.c:1111
msgid "Width"
msgstr "Plotis"
-#: gtk/gtkfontchooserwidget.c:1073
+#: gtk/gtkfontchooserwidget.c:1112
msgid "Weight"
msgstr "Svoris"
-#: gtk/gtkfontchooserwidget.c:1074
+#: gtk/gtkfontchooserwidget.c:1113
msgid "Italic"
msgstr "Kursyvas"
-#: gtk/gtkfontchooserwidget.c:1075
+#: gtk/gtkfontchooserwidget.c:1114
msgid "Slant"
msgstr "Pasviręs"
-#: gtk/gtkfontchooserwidget.c:1076
+#: gtk/gtkfontchooserwidget.c:1115
msgid "Optical Size"
msgstr "Optinis dydis"
-#: gtk/gtkfontchooserwidget.c:1614 gtk/inspector/prop-editor.c:1455
+#: gtk/gtkfontchooserwidget.c:1653
msgid "Default"
msgstr "Numatyta"
-#: gtk/gtkfontchooserwidget.c:1658
+#: gtk/gtkfontchooserwidget.c:1697
msgid "Ligatures"
msgstr "Ligatūros"
-#: gtk/gtkfontchooserwidget.c:1659
+#: gtk/gtkfontchooserwidget.c:1698
msgid "Letter Case"
msgstr "Raidžių registras"
-#: gtk/gtkfontchooserwidget.c:1660
+#: gtk/gtkfontchooserwidget.c:1699
msgid "Number Case"
msgstr "Skaitmenų registras"
-#: gtk/gtkfontchooserwidget.c:1661
+#: gtk/gtkfontchooserwidget.c:1700
msgid "Number Spacing"
msgstr "Skaitmenų tarpai"
-#: gtk/gtkfontchooserwidget.c:1662
+#: gtk/gtkfontchooserwidget.c:1701
msgid "Number Formatting"
msgstr "Skaitmenų formatas"
-#: gtk/gtkfontchooserwidget.c:1663
+#: gtk/gtkfontchooserwidget.c:1702
msgid "Character Variants"
msgstr "Simbolių variantai"
@@ -2071,23 +2070,23 @@ msgstr "%u puslapis"
msgid "Not a valid page setup file"
msgstr "Netinkamas puslapio sąrankos failas"
-#: gtk/gtkpagesetupunixdialog.c:200 gtk/gtkprintunixdialog.c:712
+#: gtk/gtkpagesetupunixdialog.c:202 gtk/gtkprintunixdialog.c:712
msgid "Manage Custom Sizes…"
msgstr "Tvarkyti pasirinktinius dydžius..."
-#: gtk/gtkpagesetupunixdialog.c:282 gtk/ui/gtkassistant.ui:98
+#: gtk/gtkpagesetupunixdialog.c:285 gtk/ui/gtkassistant.ui:98
msgid "_Apply"
msgstr "Prit_aikyti"
-#: gtk/gtkpagesetupunixdialog.c:316 gtk/gtkpagesetupunixdialog.c:567
+#: gtk/gtkpagesetupunixdialog.c:319 gtk/gtkpagesetupunixdialog.c:571
msgid "Any Printer"
msgstr "Bet kuris spausdintuvas"
-#: gtk/gtkpagesetupunixdialog.c:317
+#: gtk/gtkpagesetupunixdialog.c:320
msgid "For portable documents"
msgstr "Perkeliamiems dokumentams"
-#: gtk/gtkpagesetupunixdialog.c:722
+#: gtk/gtkpagesetupunixdialog.c:737
#, c-format
msgid ""
"Margins:\n"
@@ -2102,7 +2101,7 @@ msgstr ""
" Viršus: %s %s\n"
" Apačia: %s %s"
-#: gtk/gtkpagesetupunixdialog.c:768 gtk/ui/gtkpagesetupunixdialog.ui:5
+#: gtk/gtkpagesetupunixdialog.c:783 gtk/ui/gtkpagesetupunixdialog.ui:5
#: gtk/ui/gtkprintunixdialog.ui:711
msgid "Page Setup"
msgstr "Puslapio sąranka"
@@ -2537,12 +2536,11 @@ msgstr "Labiausiai tikėtina priežastis – nepavyko sukurti laikinojo failo."
#. window
#: gtk/gtkprintoperation-portal.c:236 gtk/gtkprintoperation-portal.c:554
-#: gtk/gtkprintoperation-portal.c:623 gtk/gtkprintunixdialog.c:3033
+#: gtk/gtkprintoperation-portal.c:623 gtk/gtkprintunixdialog.c:3032
msgid "Print"
msgstr "Spausdinti"
#: gtk/gtkprintoperation-unix.c:479 gtk/gtkprintoperation-win32.c:1503
-#: gtk/inspector/prop-editor.c:1465
msgid "Application"
msgstr "Programa"
@@ -2867,12 +2865,11 @@ msgid "Role"
msgstr "Rolė"
#: gtk/inspector/a11y.ui:42
-#| msgid "Attribute:"
msgid "Attribute"
msgstr "Atributas"
#: gtk/inspector/a11y.ui:54 gtk/inspector/css-node-tree.ui:119
-#: gtk/inspector/prop-list.ui:56 gtk/inspector/recorder.ui:115
+#: gtk/inspector/prop-list.ui:56 gtk/inspector/recorder.ui:123
msgid "Value"
msgstr "Vertė"
@@ -3092,8 +3089,8 @@ msgid "Surface"
msgstr "Paviršius"
#: gtk/inspector/misc-info.ui:316 gtk/inspector/misc-info.ui:355
-#: gtk/inspector/misc-info.ui:394 gtk/inspector/prop-editor.c:1039
-#: gtk/inspector/prop-editor.c:1396 gtk/inspector/window.ui:418
+#: gtk/inspector/misc-info.ui:394 gtk/inspector/prop-editor.c:1054
+#: gtk/inspector/prop-editor.c:1414 gtk/inspector/window.ui:418
msgid "Properties"
msgstr "Savybės"
@@ -3138,70 +3135,104 @@ msgstr "Matomas vaikuose"
msgid "Pointer: %p"
msgstr "Rodyklė: %p"
-#: gtk/inspector/prop-editor.c:785
+#. Translators: %s is a type name, for example
+#. * GtkPropertyExpression with value \"2.5\"
+#.
+#: gtk/inspector/prop-editor.c:788
#, c-format
msgid "%s with value \"%s\""
msgstr "%s su verte „%s“"
-#: gtk/inspector/prop-editor.c:793
+#. Translators: Both %s are type names, for example
+#. * GtkPropertyExpression with type GObject
+#.
+#: gtk/inspector/prop-editor.c:799
#, c-format
msgid "%s with type %s"
msgstr "%s tipo %s"
-#: gtk/inspector/prop-editor.c:803
+#. Translators: Both %s are type names, for example
+#. * GtkObjectExpression for GtkStringObject 0x23456789
+#.
+#: gtk/inspector/prop-editor.c:812
#, c-format
msgid "%s for %s %p"
msgstr "%s %s %p"
-#: gtk/inspector/prop-editor.c:807
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: gtk/inspector/prop-editor.c:827
+#. Translators: Both %s are type names, for example
+#. * GtkPropertyExpression with value type: gchararray
+#.
+#: gtk/inspector/prop-editor.c:842
#, c-format
msgid "%s with value type %s"
msgstr "%s su vertės tipu %s"
-#: gtk/inspector/prop-editor.c:1107
+#: gtk/inspector/prop-editor.c:1122
#, c-format
msgid "Uneditable property type: %s"
msgstr "Neredaguojamas savybės tipas: %s"
-#: gtk/inspector/prop-editor.c:1251
+#: gtk/inspector/prop-editor.c:1266
+#| msgid "None"
+msgctxt "column number"
msgid "None"
msgstr "Nėra"
-#: gtk/inspector/prop-editor.c:1288
+#: gtk/inspector/prop-editor.c:1303
msgid "Attribute:"
msgstr "Atributas:"
-#: gtk/inspector/prop-editor.c:1291
+#: gtk/inspector/prop-editor.c:1306
msgid "Model"
msgstr "Modelis::"
-#: gtk/inspector/prop-editor.c:1296
+#: gtk/inspector/prop-editor.c:1311
msgid "Column:"
msgstr "Stulpelis:"
-#: gtk/inspector/prop-editor.c:1392
+#. Translators: %s is a type name, for example
+#. * Action from 0x2345678 (GtkApplicationWindow)
+#.
+#: gtk/inspector/prop-editor.c:1410
#, c-format
msgid "Action from: %p (%s)"
msgstr "Veiksmas iš: %p (%s)"
-#: gtk/inspector/prop-editor.c:1447
+#: gtk/inspector/prop-editor.c:1465
msgid "Reset"
msgstr "Atstatyti"
-#: gtk/inspector/prop-editor.c:1458
+#: gtk/inspector/prop-editor.c:1473
+#| msgid "Default"
+msgctxt "GtkSettings source"
+msgid "Default"
+msgstr "Numatyta"
+
+#: gtk/inspector/prop-editor.c:1476
+#| msgid "Theme"
+msgctxt "GtkSettings source"
msgid "Theme"
msgstr "Tema"
-#: gtk/inspector/prop-editor.c:1461
+#: gtk/inspector/prop-editor.c:1479
+#| msgid "XSettings"
+msgctxt "GtkSettings source"
msgid "XSettings"
msgstr "XSettings"
-#: gtk/inspector/prop-editor.c:1471
+#: gtk/inspector/prop-editor.c:1483
+#| msgid "Application"
+msgctxt "GtkSettings source"
+msgid "Application"
+msgstr "Programa"
+
+#: gtk/inspector/prop-editor.c:1486
+#| msgid "Unknown"
+msgctxt "GtkSettings source"
+msgid "Unknown"
+msgstr "Nežinoma"
+
+#: gtk/inspector/prop-editor.c:1489
msgid "Source:"
msgstr "Šaltinis:"
@@ -3226,11 +3257,15 @@ msgstr "Išvalyti įrašytus kadrus"
msgid "Add debug nodes"
msgstr "Pridėti derinimo viršūnes"
-#: gtk/inspector/recorder.ui:45
+#: gtk/inspector/recorder.ui:44
+msgid "Use a dark background"
+msgstr "Naudoti tamsų foną"
+
+#: gtk/inspector/recorder.ui:53
msgid "Save selected node"
msgstr "Įrašyti pažymėtą viršūnę"
-#: gtk/inspector/recorder.ui:102
+#: gtk/inspector/recorder.ui:110
msgid "Property"
msgstr "Savybė"
@@ -3460,25 +3495,18 @@ msgid "Refresh action state"
msgstr "Atnaujinti veiksmo būseną"
#: gtk/inspector/window.ui:340
-#| msgctxt "Stock label, media"
-#| msgid "Pre_vious"
msgid "Previous object"
msgstr "Ankstesnis objektas"
#: gtk/inspector/window.ui:350
-#| msgid "Child Properties"
msgid "Child object"
msgstr "Vaikinis objektas"
#: gtk/inspector/window.ui:360
-#| msgctxt "Stock label, media"
-#| msgid "Pre_vious"
msgid "Previous sibling"
msgstr "Ankstesnis giminaitis"
#: gtk/inspector/window.ui:369
-#| msgctxt "OpenType layout"
-#| msgid "Cursive Positioning"
msgid "List Position"
msgstr "Padėtis sąraše"
@@ -3523,7 +3551,6 @@ msgid "Magnifier"
msgstr "Lupa"
#: gtk/inspector/window.ui:530
-#| msgid "Accessible Role"
msgid "Accessibility"
msgstr "Prieiga"
@@ -7181,6 +7208,9 @@ msgstr "Nėra profilio"
msgid "Unspecified profile"
msgstr "Nenurodytas profilis"
+#~ msgid "%s"
+#~ msgstr "%s"
+
#~ msgid "Not implemented on OS X"
#~ msgstr "Nerealizuota OS X sistemoje"
diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build
index 929d9ca382..d31481bd3e 100644
--- a/testsuite/gtk/meson.build
+++ b/testsuite/gtk/meson.build
@@ -104,7 +104,7 @@ tests = [
{ 'name': 'theme-validate' },
{
'name': 'timsort',
- 'sources': ['timsort.c', '../../gtk/gtktimsort.c'],
+ 'sources': ['timsort.c', '../../gtk/timsort/gtktimsort.c'],
},
{ 'name': 'tooltips' },
{ 'name': 'treelistmodel' },
diff --git a/testsuite/gtk/timsort.c b/testsuite/gtk/timsort.c
index bf2cfee40f..fa524ca162 100644
--- a/testsuite/gtk/timsort.c
+++ b/testsuite/gtk/timsort.c
@@ -19,7 +19,7 @@
#include <gtk/gtk.h>
-#include "gtk/gtktimsortprivate.h"
+#include "gtk/timsort/gtktimsortprivate.h"
#define assert_sort_equal(a, b, size, n) \
g_assert_cmpmem (a, sizeof (size) * n, b, sizeof (size) * n)