Skip to content

Commit 23ad6ee

Browse files
leonardo-lemosleonardo-lemos
authored
Merge branch 'master' into jeremypw/valasymbol/fix-message
2 parents 837c38a + 885dd1c commit 23ad6ee

597 files changed

Lines changed: 7765 additions & 4185 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎po/aa.po‎

Lines changed: 37 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: PACKAGE VERSION\n"
44
"Report-Msgid-Bugs-To: \n"
5-
"POT-Creation-Date: 2025-04-02 15:18+0000\n"
5+
"POT-Creation-Date: 2025-04-03 09:20+0000\n"
66
"PO-Revision-Date: 2015-12-18 20:01+0000\n"
77
"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
88
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -350,7 +350,7 @@ msgid "Rename"
350350
msgstr ""
351351

352352
#: src/FolderManager/FileItem.vala:65 src/FolderManager/FolderItem.vala:109
353-
#: src/FolderManager/ProjectFolderItem.vala:272
353+
#: src/FolderManager/ProjectFolderItem.vala:279
354354
msgid "Move to Trash"
355355
msgstr ""
356356

@@ -362,7 +362,7 @@ msgstr ""
362362
msgid "Open In"
363363
msgstr ""
364364

365-
#: src/FolderManager/FileView.vala:73
365+
#: src/FolderManager/FileView.vala:74
366366
msgid "Folders"
367367
msgstr ""
368368

@@ -385,8 +385,8 @@ msgstr ""
385385
#. scan all children
386386
#. No need to show status when children shown
387387
#: src/FolderManager/FolderItem.vala:204
388-
#: src/FolderManager/ProjectFolderItem.vala:394
389-
#: src/FolderManager/ProjectFolderItem.vala:400
388+
#: src/FolderManager/ProjectFolderItem.vala:439
389+
#: src/FolderManager/ProjectFolderItem.vala:445
390390
msgid "New"
391391
msgstr ""
392392

@@ -398,60 +398,68 @@ msgstr ""
398398
msgid "new file"
399399
msgstr ""
400400

401-
#: src/FolderManager/ProjectFolderItem.vala:140
401+
#: src/FolderManager/ProjectFolderItem.vala:147
402402
msgid "Set as Active Project"
403403
msgstr ""
404404

405-
#: src/FolderManager/ProjectFolderItem.vala:148
405+
#: src/FolderManager/ProjectFolderItem.vala:155
406406
msgid "Open in Terminal Pane"
407407
msgstr ""
408408

409-
#: src/FolderManager/ProjectFolderItem.vala:179
409+
#: src/FolderManager/ProjectFolderItem.vala:186
410410
msgid "Close Folder"
411411
msgstr ""
412412

413-
#: src/FolderManager/ProjectFolderItem.vala:187
413+
#: src/FolderManager/ProjectFolderItem.vala:194
414414
msgid "Close Other Folders"
415415
msgstr ""
416416

417-
#: src/FolderManager/ProjectFolderItem.vala:204
417+
#: src/FolderManager/ProjectFolderItem.vala:211
418418
#, c-format
419419
msgid "Close %u Open Document"
420420
msgid_plural "Close %u Open Documents"
421421
msgstr[0] ""
422422
msgstr[1] ""
423423

424-
#: src/FolderManager/ProjectFolderItem.vala:216
424+
#: src/FolderManager/ProjectFolderItem.vala:223
425425
#, c-format
426426
msgid "Hide %u Open Document"
427427
msgid_plural "Hide %u Open Documents"
428428
msgstr[0] ""
429429
msgstr[1] ""
430430

431-
#: src/FolderManager/ProjectFolderItem.vala:239
431+
#: src/FolderManager/ProjectFolderItem.vala:246
432432
#, c-format
433433
msgid "Restore %u Hidden Document"
434434
msgid_plural "Restore %u Hidden Documents"
435435
msgstr[0] ""
436436
msgstr[1] ""
437437

438-
#: src/FolderManager/ProjectFolderItem.vala:283 src/Widgets/HeaderBar.vala:131
438+
#: src/FolderManager/ProjectFolderItem.vala:290 src/Widgets/HeaderBar.vala:131
439439
msgid "Find in Project…"
440440
msgstr ""
441441

442-
#: src/FolderManager/ProjectFolderItem.vala:333
442+
#: src/FolderManager/ProjectFolderItem.vala:332
443+
msgid "Local"
444+
msgstr ""
445+
446+
#: src/FolderManager/ProjectFolderItem.vala:349
447+
msgid "Remote"
448+
msgstr ""
449+
450+
#: src/FolderManager/ProjectFolderItem.vala:364
443451
msgid "New Branch…"
444452
msgstr ""
445453

446-
#: src/FolderManager/ProjectFolderItem.vala:357
454+
#: src/FolderManager/ProjectFolderItem.vala:389
447455
msgid "Branch"
448456
msgstr ""
449457

450-
#: src/FolderManager/ProjectFolderItem.vala:400
458+
#: src/FolderManager/ProjectFolderItem.vala:445
451459
msgid "Modified"
452460
msgstr ""
453461

454-
#: src/FolderManager/ProjectFolderItem.vala:438
462+
#: src/FolderManager/ProjectFolderItem.vala:483
455463
#, c-format
456464
msgid "Error while creating new branch: “%s”"
457465
msgstr ""
@@ -602,12 +610,22 @@ msgstr ""
602610
msgid "Save Document elsewhere"
603611
msgstr ""
604612

605-
#: src/Services/MonitoredRepository.vala:213
613+
#: src/Services/MonitoredRepository.vala:238
614+
#, c-format
615+
msgid "Remote Branch '%s' not found"
616+
msgstr ""
617+
618+
#: src/Services/MonitoredRepository.vala:239
619+
msgid ""
620+
"The requested branch was not found in any remote linked to this repository"
621+
msgstr ""
622+
623+
#: src/Services/MonitoredRepository.vala:276
606624
msgid "An error occurred while checking out the requested branch"
607625
msgstr ""
608626

609627
#. /TRANSLATORS "%.8s" is a placeholder for the first 8 characters of a commit reference
610-
#: src/Services/MonitoredRepository.vala:261
628+
#: src/Services/MonitoredRepository.vala:324
611629
#, c-format
612630
msgid "%.8s (detached)"
613631
msgstr ""

‎po/ab.po‎

Lines changed: 37 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: PACKAGE VERSION\n"
44
"Report-Msgid-Bugs-To: \n"
5-
"POT-Creation-Date: 2025-04-02 15:18+0000\n"
5+
"POT-Creation-Date: 2025-04-03 09:20+0000\n"
66
"PO-Revision-Date: 2015-12-18 20:01+0000\n"
77
"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
88
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -350,7 +350,7 @@ msgid "Rename"
350350
msgstr ""
351351

352352
#: src/FolderManager/FileItem.vala:65 src/FolderManager/FolderItem.vala:109
353-
#: src/FolderManager/ProjectFolderItem.vala:272
353+
#: src/FolderManager/ProjectFolderItem.vala:279
354354
msgid "Move to Trash"
355355
msgstr ""
356356

@@ -362,7 +362,7 @@ msgstr ""
362362
msgid "Open In"
363363
msgstr ""
364364

365-
#: src/FolderManager/FileView.vala:73
365+
#: src/FolderManager/FileView.vala:74
366366
msgid "Folders"
367367
msgstr ""
368368

@@ -385,8 +385,8 @@ msgstr ""
385385
#. scan all children
386386
#. No need to show status when children shown
387387
#: src/FolderManager/FolderItem.vala:204
388-
#: src/FolderManager/ProjectFolderItem.vala:394
389-
#: src/FolderManager/ProjectFolderItem.vala:400
388+
#: src/FolderManager/ProjectFolderItem.vala:439
389+
#: src/FolderManager/ProjectFolderItem.vala:445
390390
msgid "New"
391391
msgstr ""
392392

@@ -398,60 +398,68 @@ msgstr ""
398398
msgid "new file"
399399
msgstr ""
400400

401-
#: src/FolderManager/ProjectFolderItem.vala:140
401+
#: src/FolderManager/ProjectFolderItem.vala:147
402402
msgid "Set as Active Project"
403403
msgstr ""
404404

405-
#: src/FolderManager/ProjectFolderItem.vala:148
405+
#: src/FolderManager/ProjectFolderItem.vala:155
406406
msgid "Open in Terminal Pane"
407407
msgstr ""
408408

409-
#: src/FolderManager/ProjectFolderItem.vala:179
409+
#: src/FolderManager/ProjectFolderItem.vala:186
410410
msgid "Close Folder"
411411
msgstr ""
412412

413-
#: src/FolderManager/ProjectFolderItem.vala:187
413+
#: src/FolderManager/ProjectFolderItem.vala:194
414414
msgid "Close Other Folders"
415415
msgstr ""
416416

417-
#: src/FolderManager/ProjectFolderItem.vala:204
417+
#: src/FolderManager/ProjectFolderItem.vala:211
418418
#, c-format
419419
msgid "Close %u Open Document"
420420
msgid_plural "Close %u Open Documents"
421421
msgstr[0] ""
422422
msgstr[1] ""
423423

424-
#: src/FolderManager/ProjectFolderItem.vala:216
424+
#: src/FolderManager/ProjectFolderItem.vala:223
425425
#, c-format
426426
msgid "Hide %u Open Document"
427427
msgid_plural "Hide %u Open Documents"
428428
msgstr[0] ""
429429
msgstr[1] ""
430430

431-
#: src/FolderManager/ProjectFolderItem.vala:239
431+
#: src/FolderManager/ProjectFolderItem.vala:246
432432
#, c-format
433433
msgid "Restore %u Hidden Document"
434434
msgid_plural "Restore %u Hidden Documents"
435435
msgstr[0] ""
436436
msgstr[1] ""
437437

438-
#: src/FolderManager/ProjectFolderItem.vala:283 src/Widgets/HeaderBar.vala:131
438+
#: src/FolderManager/ProjectFolderItem.vala:290 src/Widgets/HeaderBar.vala:131
439439
msgid "Find in Project…"
440440
msgstr ""
441441

442-
#: src/FolderManager/ProjectFolderItem.vala:333
442+
#: src/FolderManager/ProjectFolderItem.vala:332
443+
msgid "Local"
444+
msgstr ""
445+
446+
#: src/FolderManager/ProjectFolderItem.vala:349
447+
msgid "Remote"
448+
msgstr ""
449+
450+
#: src/FolderManager/ProjectFolderItem.vala:364
443451
msgid "New Branch…"
444452
msgstr ""
445453

446-
#: src/FolderManager/ProjectFolderItem.vala:357
454+
#: src/FolderManager/ProjectFolderItem.vala:389
447455
msgid "Branch"
448456
msgstr ""
449457

450-
#: src/FolderManager/ProjectFolderItem.vala:400
458+
#: src/FolderManager/ProjectFolderItem.vala:445
451459
msgid "Modified"
452460
msgstr ""
453461

454-
#: src/FolderManager/ProjectFolderItem.vala:438
462+
#: src/FolderManager/ProjectFolderItem.vala:483
455463
#, c-format
456464
msgid "Error while creating new branch: “%s”"
457465
msgstr ""
@@ -602,12 +610,22 @@ msgstr ""
602610
msgid "Save Document elsewhere"
603611
msgstr ""
604612

605-
#: src/Services/MonitoredRepository.vala:213
613+
#: src/Services/MonitoredRepository.vala:238
614+
#, c-format
615+
msgid "Remote Branch '%s' not found"
616+
msgstr ""
617+
618+
#: src/Services/MonitoredRepository.vala:239
619+
msgid ""
620+
"The requested branch was not found in any remote linked to this repository"
621+
msgstr ""
622+
623+
#: src/Services/MonitoredRepository.vala:276
606624
msgid "An error occurred while checking out the requested branch"
607625
msgstr ""
608626

609627
#. /TRANSLATORS "%.8s" is a placeholder for the first 8 characters of a commit reference
610-
#: src/Services/MonitoredRepository.vala:261
628+
#: src/Services/MonitoredRepository.vala:324
611629
#, c-format
612630
msgid "%.8s (detached)"
613631
msgstr ""

0 commit comments

Comments
 (0)