Backmerge bugfix release branch 1.30 from 1.30.1 to master
This commit is contained in:
Frank Lanitz
commit
4f388e515c
10
NEWS
10
NEWS
@ -1,6 +1,16 @@
|
||||
Geany 1.31 (unreleased)
|
||||
|
||||
|
||||
Geany 1.30.1 (March 19, 2017)
|
||||
|
||||
Editor
|
||||
* Fix auto-completion and calltip popup position on multi-monitor
|
||||
setups (Issue#1422).
|
||||
|
||||
Internationalization
|
||||
* Updated translations: ca, de, el, es, sk
|
||||
|
||||
|
||||
Geany 1.30 (March 05, 2017)
|
||||
|
||||
General
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
.TH "GEANY" "1" "March 05, 2017" "geany @VERSION@" ""
|
||||
.TH "GEANY" "1" "March 19, 2017" "geany @VERSION@" ""
|
||||
.SH "NAME"
|
||||
Geany \(em a small and lightweight IDE
|
||||
.SH "SYNOPSIS"
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
Frank Lanitz,
|
||||
Colomban Wendling,
|
||||
Matthew Brush
|
||||
:Date: 2017-03-05
|
||||
:Date: 2017-03-19
|
||||
:Version: |(version)|
|
||||
|
||||
Copyright © 2005-2017
|
||||
|
||||
94
po/ca.po
94
po/ca.po
@ -2945,7 +2945,7 @@ msgstr "S'ha desat el fitxer %s."
|
||||
msgid "Wrap search and find again?"
|
||||
msgstr "Tornar a començar la cerca des del principi?"
|
||||
|
||||
#: ../src/document.c:2460 ../src/search.c:1366 ../src/search.c:1419
|
||||
#: ../src/document.c:2460 ../src/search.c:1368 ../src/search.c:1421
|
||||
#: ../src/search.c:2222 ../src/search.c:2223
|
||||
#, c-format
|
||||
msgid "No matches found for \"%s\"."
|
||||
@ -3514,7 +3514,7 @@ msgstr "Insereix una línia nova abans de l'actual"
|
||||
msgid "Insert New Line After Current"
|
||||
msgstr "Insereix una línia nova després de l'actual"
|
||||
|
||||
#: ../src/keybindings.c:529 ../src/search.c:464
|
||||
#: ../src/keybindings.c:529 ../src/search.c:466
|
||||
msgid "Find"
|
||||
msgstr "Troba"
|
||||
|
||||
@ -3526,11 +3526,11 @@ msgstr "Troba el següent"
|
||||
msgid "Find Previous"
|
||||
msgstr "Troba l'anterior"
|
||||
|
||||
#: ../src/keybindings.c:540 ../src/search.c:617
|
||||
#: ../src/keybindings.c:540 ../src/search.c:619
|
||||
msgid "Replace"
|
||||
msgstr "Substitueix"
|
||||
|
||||
#: ../src/keybindings.c:542 ../src/search.c:867
|
||||
#: ../src/keybindings.c:542 ../src/search.c:869
|
||||
msgid "Find in Files"
|
||||
msgstr "Troba als fitxers"
|
||||
|
||||
@ -4050,7 +4050,7 @@ msgstr ""
|
||||
"El connector del servidor intermediari «%s» amb extensió «%s» comença amb un "
|
||||
"punt. Corregiu el connector del vostre servidor intermediari."
|
||||
|
||||
#: ../src/pluginutils.c:411
|
||||
#: ../src/pluginutils.c:427
|
||||
msgid "Configure Plugins"
|
||||
msgstr "Configura els connectors"
|
||||
|
||||
@ -4309,7 +4309,7 @@ msgstr "No s'ha pogut crear el directori base del projecte (%s)."
|
||||
msgid "Project file could not be written (%s)."
|
||||
msgstr "No es pot escriure el fitxer de projecte (%s)."
|
||||
|
||||
#: ../src/project.c:779 ../src/search.c:627
|
||||
#: ../src/project.c:779 ../src/search.c:629
|
||||
msgid "_Replace"
|
||||
msgstr "_Substitueix"
|
||||
|
||||
@ -4328,11 +4328,11 @@ msgstr "Trieu el nom de fitxer del projecte"
|
||||
msgid "Project \"%s\" opened."
|
||||
msgstr "S'ha obert el projecte «%s»."
|
||||
|
||||
#: ../src/search.c:308 ../src/search.c:960
|
||||
#: ../src/search.c:310 ../src/search.c:962
|
||||
msgid "_Use regular expressions"
|
||||
msgstr "_Utilitza expressions regulars"
|
||||
|
||||
#: ../src/search.c:311
|
||||
#: ../src/search.c:313
|
||||
msgid ""
|
||||
"Use Perl-like regular expressions. For detailed information about using "
|
||||
"regular expressions, please refer to the manual."
|
||||
@ -4340,11 +4340,11 @@ msgstr ""
|
||||
"Utilitza expressions regulars de tipus Perl. Per a informació detallada "
|
||||
"sobre expressions regulars, consulteu el manual."
|
||||
|
||||
#: ../src/search.c:316
|
||||
#: ../src/search.c:318
|
||||
msgid "Use _escape sequences"
|
||||
msgstr "Utilitza les seqüències d'_escapament"
|
||||
|
||||
#: ../src/search.c:320
|
||||
#: ../src/search.c:322
|
||||
msgid ""
|
||||
"Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode characters) with the "
|
||||
"corresponding control characters"
|
||||
@ -4352,11 +4352,11 @@ msgstr ""
|
||||
"Reemplaça \\\\, \\t, \\n, \\r i \\uXXXX (caràcters Unicode) amb les "
|
||||
"seqüències de control corresponents"
|
||||
|
||||
#: ../src/search.c:323
|
||||
#: ../src/search.c:325
|
||||
msgid "Use multi-line matchin_g"
|
||||
msgstr "Utilitza la coincidència de línia múlti_ple"
|
||||
|
||||
#: ../src/search.c:328
|
||||
#: ../src/search.c:330
|
||||
msgid ""
|
||||
"Perform regular expression matching on the whole buffer at once rather than "
|
||||
"line by line, allowing matches to span multiple lines. In this mode, "
|
||||
@ -4368,98 +4368,98 @@ msgstr ""
|
||||
"línies. En aquest mode, els caràcters de nova línia són part de l'entrada i "
|
||||
"es poden capturar com a caràcters regulars amb el patró."
|
||||
|
||||
#: ../src/search.c:341
|
||||
#: ../src/search.c:343
|
||||
msgid "Search _backwards"
|
||||
msgstr "Cerca cap e_nrere"
|
||||
|
||||
#: ../src/search.c:347 ../src/search.c:969
|
||||
#: ../src/search.c:349 ../src/search.c:971
|
||||
msgid "C_ase sensitive"
|
||||
msgstr "Sensible a _majúscules"
|
||||
|
||||
#: ../src/search.c:351 ../src/search.c:974
|
||||
#: ../src/search.c:353 ../src/search.c:976
|
||||
msgid "Match only a _whole word"
|
||||
msgstr "Cerca només _paraules completes"
|
||||
|
||||
#: ../src/search.c:355
|
||||
#: ../src/search.c:357
|
||||
msgid "Match from s_tart of word"
|
||||
msgstr "Cerca només el p_rincipi de la paraula"
|
||||
|
||||
#: ../src/search.c:471
|
||||
#: ../src/search.c:473
|
||||
msgid "_Previous"
|
||||
msgstr "_Anterior"
|
||||
|
||||
#: ../src/search.c:476
|
||||
#: ../src/search.c:478
|
||||
msgid "_Next"
|
||||
msgstr "Següe_nt"
|
||||
|
||||
#: ../src/search.c:480 ../src/search.c:638 ../src/search.c:877
|
||||
#: ../src/search.c:482 ../src/search.c:640 ../src/search.c:879
|
||||
msgid "_Search for:"
|
||||
msgstr "_Cerca:"
|
||||
|
||||
#. Now add the multiple match options
|
||||
#: ../src/search.c:508
|
||||
#: ../src/search.c:510
|
||||
msgid "_Find All"
|
||||
msgstr "_Troba-ho tot"
|
||||
|
||||
#: ../src/search.c:515
|
||||
#: ../src/search.c:517
|
||||
msgid "_Mark"
|
||||
msgstr "_Marca"
|
||||
|
||||
#: ../src/search.c:517
|
||||
#: ../src/search.c:519
|
||||
msgid "Mark all matches in the current document"
|
||||
msgstr "Marca totes les coincidències en el document"
|
||||
|
||||
#: ../src/search.c:522 ../src/search.c:697
|
||||
#: ../src/search.c:524 ../src/search.c:699
|
||||
msgid "In Sessi_on"
|
||||
msgstr "A la _sessió"
|
||||
|
||||
#: ../src/search.c:527 ../src/search.c:702
|
||||
#: ../src/search.c:529 ../src/search.c:704
|
||||
msgid "_In Document"
|
||||
msgstr "Al _document"
|
||||
|
||||
#. close window checkbox
|
||||
#: ../src/search.c:533 ../src/search.c:715
|
||||
#: ../src/search.c:535 ../src/search.c:717
|
||||
msgid "Close _dialog"
|
||||
msgstr "Tanca el _diàleg"
|
||||
|
||||
#: ../src/search.c:537 ../src/search.c:719
|
||||
#: ../src/search.c:539 ../src/search.c:721
|
||||
msgid "Disable this option to keep the dialog open"
|
||||
msgstr "Inhabiliteu aquesta opció per a mantenir obert el diàleg"
|
||||
|
||||
#: ../src/search.c:632
|
||||
#: ../src/search.c:634
|
||||
msgid "Replace & Fi_nd"
|
||||
msgstr "Substitueix i tro_ba"
|
||||
|
||||
#: ../src/search.c:641
|
||||
#: ../src/search.c:643
|
||||
msgid "Replace wit_h:"
|
||||
msgstr "Substitueix a_mb:"
|
||||
|
||||
#. Now add the multiple replace options
|
||||
#: ../src/search.c:690
|
||||
#: ../src/search.c:692
|
||||
msgid "Re_place All"
|
||||
msgstr "Substitueix-ho _tot"
|
||||
|
||||
#: ../src/search.c:707
|
||||
#: ../src/search.c:709
|
||||
msgid "In Se_lection"
|
||||
msgstr "A la se_lecció"
|
||||
|
||||
#: ../src/search.c:709
|
||||
#: ../src/search.c:711
|
||||
msgid "Replace all matches found in the currently selected text"
|
||||
msgstr "Substitueix totes les ocurrències al text seleccionat actualment"
|
||||
|
||||
#: ../src/search.c:826
|
||||
#: ../src/search.c:828
|
||||
msgid "all"
|
||||
msgstr "tot"
|
||||
|
||||
#: ../src/search.c:828
|
||||
#: ../src/search.c:830
|
||||
msgid "project"
|
||||
msgstr "projecte"
|
||||
|
||||
#: ../src/search.c:830
|
||||
#: ../src/search.c:832
|
||||
msgid "custom"
|
||||
msgstr "personalitzat"
|
||||
|
||||
#: ../src/search.c:834
|
||||
#: ../src/search.c:836
|
||||
msgid ""
|
||||
"All: search all files in the directory\n"
|
||||
"Project: use file patterns defined in the project settings\n"
|
||||
@ -4469,56 +4469,56 @@ msgstr ""
|
||||
"Projecte: utilitza els patrons de fitxer definits per al projecte\n"
|
||||
"Personalitzat: especifica manualment els patrons de fitxer"
|
||||
|
||||
#: ../src/search.c:896
|
||||
#: ../src/search.c:898
|
||||
msgid "Fi_les:"
|
||||
msgstr "Fi_txers:"
|
||||
|
||||
#: ../src/search.c:908
|
||||
#: ../src/search.c:910
|
||||
msgid "File patterns, e.g. *.c *.h"
|
||||
msgstr "Patrons de fitxer, p. ex. *.c *.h"
|
||||
|
||||
#: ../src/search.c:920
|
||||
#: ../src/search.c:922
|
||||
msgid "_Directory:"
|
||||
msgstr "_Directori:"
|
||||
|
||||
#: ../src/search.c:939
|
||||
#: ../src/search.c:941
|
||||
msgid "E_ncoding:"
|
||||
msgstr "_Codificació:"
|
||||
|
||||
#: ../src/search.c:963
|
||||
#: ../src/search.c:965
|
||||
msgid "See grep's manual page for more information"
|
||||
msgstr "Veieu el manual de 'grep' per a més informació"
|
||||
|
||||
#: ../src/search.c:965
|
||||
#: ../src/search.c:967
|
||||
msgid "_Recurse in subfolders"
|
||||
msgstr "_Recursiu a les subcarpetes"
|
||||
|
||||
#: ../src/search.c:978
|
||||
#: ../src/search.c:980
|
||||
msgid "_Invert search results"
|
||||
msgstr "_Inverteix els resultats de la cerca"
|
||||
|
||||
#: ../src/search.c:982
|
||||
#: ../src/search.c:984
|
||||
msgid "Invert the sense of matching, to select non-matching lines"
|
||||
msgstr ""
|
||||
"Inverteix el sentit de la cerca, per a seleccionar les línies que no "
|
||||
"contenen el text"
|
||||
|
||||
#: ../src/search.c:999
|
||||
#: ../src/search.c:1001
|
||||
msgid "E_xtra options:"
|
||||
msgstr "Opcions e_xtres:"
|
||||
|
||||
#: ../src/search.c:1007
|
||||
#: ../src/search.c:1009
|
||||
msgid "Other options to pass to Grep"
|
||||
msgstr "Altres opcions per passar a Grep"
|
||||
|
||||
#: ../src/search.c:1369 ../src/search.c:2228 ../src/search.c:2231
|
||||
#: ../src/search.c:1371 ../src/search.c:2228 ../src/search.c:2231
|
||||
#, c-format
|
||||
msgid "Found %d match for \"%s\"."
|
||||
msgid_plural "Found %d matches for \"%s\"."
|
||||
msgstr[0] "S'ha trobat %d coincidència de «%s»."
|
||||
msgstr[1] "S'han trobat %d coincidències de «%s»."
|
||||
|
||||
#: ../src/search.c:1425
|
||||
#: ../src/search.c:1427
|
||||
#, c-format
|
||||
msgid "Replaced %u matches in %u documents."
|
||||
msgstr "S'han substituït %u ocurrències en %u documents."
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user