Skip to content

Commit 2b54c9d

Browse files
author
Jeremy Wootten
authored
Merge branch 'master' into persist-searchsettings
2 parents 01309c8 + 1ca172f commit 2b54c9d

File tree

8 files changed

+142
-313
lines changed

8 files changed

+142
-313
lines changed

po/de.po

Lines changed: 14 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgstr ""
88
"Project-Id-Version: scratch\n"
99
"Report-Msgid-Bugs-To: \n"
1010
"POT-Creation-Date: 2023-03-24 23:26+0000\n"
11-
"PO-Revision-Date: 2023-03-24 23:26+0000\n"
11+
"PO-Revision-Date: 2023-03-27 00:59+0000\n"
1212
"Last-Translator: Uwe S <saabisto@gmx.de>\n"
1313
"Language-Team: German <https://l10n.elementary.io/projects/code/code/de/>\n"
1414
"Language: de\n"
@@ -378,8 +378,7 @@ msgid "Load Anyway"
378378
msgstr "Trotzdem laden"
379379

380380
#: src/Services/Document.vala:300
381-
#, fuzzy, c-format
382-
#| msgid "Loading File \"%s\" Is Taking a Long Time"
381+
#, c-format
383382
msgid "Loading File “%s” Is Taking a Long Time"
384383
msgstr "Das Laden von »%s« dauert sehr lange"
385384

@@ -392,8 +391,7 @@ msgid "Cancel Loading"
392391
msgstr "Laden abbrechen"
393392

394393
#: src/Services/Document.vala:393
395-
#, fuzzy, c-format
396-
#| msgid "Save changes to \"%s\" before closing?"
394+
#, c-format
397395
msgid "Save changes to “%s” before closing?"
398396
msgstr "Änderungen am Dokument »%s« vor dem Schließen speichern?"
399397

@@ -421,36 +419,28 @@ msgstr "Neues Dokument"
421419

422420
#. Show an error view which says "Hey, I cannot read that file!"
423421
#: src/Services/Document.vala:762
424-
#, fuzzy, c-format
425-
#| msgid "Search for text in “%s”"
422+
#, c-format
426423
msgid "Cannot read text in file “%s”"
427-
msgstr "Text in »%s« suchen"
424+
msgstr "Kein Text in Datei »%s« gelesen"
428425

429426
#: src/Services/Document.vala:765
430-
#, fuzzy
431-
#| msgid "It may be corrupt or you don't have permission to read it."
432427
msgid "You may not have permission to read the file."
433428
msgstr ""
434-
"Möglicherweise ist sie beschädigt oder Sie verfügen nicht über die "
435-
"benötigten Rechte zum Lesen."
429+
"Sie verfügen möglicherweise nicht über die benötigten Rechte zum Lesen der "
430+
"Datei."
436431

437432
#: src/Services/Document.vala:767
438433
msgid "The file may be corrupt or may not be a text file"
439-
msgstr ""
434+
msgstr "Die Datei ist möglicherweise beschädigt oder keine Textdatei"
440435

441436
#. Lack of read permission results in empty content string. Do not give option to open
442437
#. in new document in that case.
443438
#: src/Services/Document.vala:773
444-
#, fuzzy
445-
#| msgid "Load Anyway"
446439
msgid "Show Anyway"
447-
msgstr "Trotzdem laden"
440+
msgstr "Trotzdem anzeigen"
448441

449442
#: src/Services/Document.vala:802
450-
#, fuzzy, c-format
451-
#| msgid ""
452-
#| "The location containing the file \"%s\" was unmounted. Do you want to "
453-
#| "save somewhere else?"
443+
#, c-format
454444
msgid ""
455445
"The location containing the file “%s” was unmounted. Do you want to save "
456446
"somewhere else?"
@@ -463,16 +453,12 @@ msgid "Save As…"
463453
msgstr "Speichern unter …"
464454

465455
#: src/Services/Document.vala:811
466-
#, fuzzy, c-format
467-
#| msgid "File \"%s\" was deleted. Do you want to save it anyway?"
456+
#, c-format
468457
msgid "File “%s” was deleted. Do you want to save it anyway?"
469458
msgstr "Die Datei »%s« wurde gelöscht. Möchten Sie sie trotzdem speichern?"
470459

471460
#: src/Services/Document.vala:855
472-
#, fuzzy, c-format
473-
#| msgid ""
474-
#| "File \"%s\" was modified by an external application. Do you want to load "
475-
#| "it again or continue your editing?"
461+
#, c-format
476462
msgid ""
477463
"File “%s” was modified by an external application. Do you want to load it "
478464
"again or continue your editing?"
@@ -489,10 +475,7 @@ msgid "Continue"
489475
msgstr "Fortfahren"
490476

491477
#: src/Services/Document.vala:888
492-
#, fuzzy, c-format
493-
#| msgid ""
494-
#| "You cannot save the document to \"%s\". Do you want to save the file "
495-
#| "somewhere else?"
478+
#, c-format
496479
msgid ""
497480
"You cannot save the document to “%s”. Do you want to save the file somewhere "
498481
"else?"
@@ -501,10 +484,7 @@ msgstr ""
501484
"einem anderen Ort speichern?"
502485

503486
#: src/Services/Document.vala:892
504-
#, fuzzy, c-format
505-
#| msgid ""
506-
#| "You cannot save changes to the file \"%s\". Do you want to save the "
507-
#| "changes somewhere else?"
487+
#, c-format
508488
msgid ""
509489
"You cannot save changes to the file “%s”. Do you want to save the changes "
510490
"somewhere else?"

po/en_GB.po

Lines changed: 21 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgstr ""
88
"Project-Id-Version: scratch\n"
99
"Report-Msgid-Bugs-To: \n"
1010
"POT-Creation-Date: 2023-03-24 23:26+0000\n"
11-
"PO-Revision-Date: 2023-03-24 23:26+0000\n"
11+
"PO-Revision-Date: 2023-03-27 00:59+0000\n"
1212
"Last-Translator: David Hewitt <davidmhewitt@gmail.com>\n"
1313
"Language-Team: English (United Kingdom) <https://l10n.elementary.io/projects/"
1414
"code/code/en_GB/>\n"
@@ -376,10 +376,9 @@ msgid "Load Anyway"
376376
msgstr "Load Anyway"
377377

378378
#: src/Services/Document.vala:300
379-
#, fuzzy, c-format
380-
#| msgid "Loading File \"%s\" Is Taking a Long Time"
379+
#, c-format
381380
msgid "Loading File “%s” Is Taking a Long Time"
382-
msgstr "Loading File \"%s\" Is Taking a Long Time"
381+
msgstr "Loading File “%s” Is Taking a Long Time"
383382

384383
#: src/Services/Document.vala:301
385384
msgid "Please wait while Code is loading the file."
@@ -390,10 +389,9 @@ msgid "Cancel Loading"
390389
msgstr "Cancel Loading"
391390

392391
#: src/Services/Document.vala:393
393-
#, fuzzy, c-format
394-
#| msgid "Save changes to \"%s\" before closing?"
392+
#, c-format
395393
msgid "Save changes to “%s” before closing?"
396-
msgstr "Save changes to \"%s\" before closing?"
394+
msgstr "Save changes to “%s” before closing?"
397395

398396
#: src/Services/Document.vala:394
399397
msgid "If you don't save, changes will be permanently lost."
@@ -418,61 +416,49 @@ msgstr "New Document"
418416

419417
#. Show an error view which says "Hey, I cannot read that file!"
420418
#: src/Services/Document.vala:762
421-
#, fuzzy, c-format
422-
#| msgid "Search for text in “%s”"
419+
#, c-format
423420
msgid "Cannot read text in file “%s”"
424-
msgstr "Search for text in “%s”"
421+
msgstr "Cannot read text in file “%s”"
425422

426423
#: src/Services/Document.vala:765
427-
#, fuzzy
428-
#| msgid "It may be corrupt or you don't have permission to read it."
429424
msgid "You may not have permission to read the file."
430-
msgstr "It may be corrupt or you don't have permission to read it."
425+
msgstr "You may not have permission to read the file."
431426

432427
#: src/Services/Document.vala:767
433428
msgid "The file may be corrupt or may not be a text file"
434-
msgstr ""
429+
msgstr "The file may be corrupt or may not be a text file"
435430

436431
#. Lack of read permission results in empty content string. Do not give option to open
437432
#. in new document in that case.
438433
#: src/Services/Document.vala:773
439-
#, fuzzy
440-
#| msgid "Load Anyway"
441434
msgid "Show Anyway"
442-
msgstr "Load Anyway"
435+
msgstr "Show Anyway"
443436

444437
#: src/Services/Document.vala:802
445-
#, fuzzy, c-format
446-
#| msgid ""
447-
#| "The location containing the file \"%s\" was unmounted. Do you want to "
448-
#| "save somewhere else?"
438+
#, c-format
449439
msgid ""
450440
"The location containing the file “%s” was unmounted. Do you want to save "
451441
"somewhere else?"
452442
msgstr ""
453-
"The location containing the file \"%s\" was unmounted. Do you want to save "
443+
"The location containing the file “%s” was unmounted. Do you want to save "
454444
"somewhere else?"
455445

456446
#: src/Services/Document.vala:805
457447
msgid "Save As…"
458448
msgstr "Save As…"
459449

460450
#: src/Services/Document.vala:811
461-
#, fuzzy, c-format
462-
#| msgid "File \"%s\" was deleted. Do you want to save it anyway?"
451+
#, c-format
463452
msgid "File “%s” was deleted. Do you want to save it anyway?"
464-
msgstr "File \"%s\" was deleted. Do you want to save it anyway?"
453+
msgstr "File “%s” was deleted. Do you want to save it anyway?"
465454

466455
#: src/Services/Document.vala:855
467-
#, fuzzy, c-format
468-
#| msgid ""
469-
#| "File \"%s\" was modified by an external application. Do you want to load "
470-
#| "it again or continue your editing?"
456+
#, c-format
471457
msgid ""
472458
"File “%s” was modified by an external application. Do you want to load it "
473459
"again or continue your editing?"
474460
msgstr ""
475-
"File \"%s\" was modified by an external application. Do you want to load it "
461+
"File “%s” was modified by an external application. Do you want to load it "
476462
"again or continue your editing?"
477463

478464
#: src/Services/Document.vala:858
@@ -484,27 +470,21 @@ msgid "Continue"
484470
msgstr "Continue"
485471

486472
#: src/Services/Document.vala:888
487-
#, fuzzy, c-format
488-
#| msgid ""
489-
#| "You cannot save the document to \"%s\". Do you want to save the file "
490-
#| "somewhere else?"
473+
#, c-format
491474
msgid ""
492475
"You cannot save the document to “%s”. Do you want to save the file somewhere "
493476
"else?"
494477
msgstr ""
495-
"You cannot save the document to \"%s\". Do you want to save the file "
496-
"somewhere else?"
478+
"You cannot save the document to “%s”. Do you want to save the file somewhere "
479+
"else?"
497480

498481
#: src/Services/Document.vala:892
499-
#, fuzzy, c-format
500-
#| msgid ""
501-
#| "You cannot save changes to the file \"%s\". Do you want to save the "
502-
#| "changes somewhere else?"
482+
#, c-format
503483
msgid ""
504484
"You cannot save changes to the file “%s”. Do you want to save the changes "
505485
"somewhere else?"
506486
msgstr ""
507-
"You cannot save changes to the file \"%s\". Do you want to save the changes "
487+
"You cannot save changes to the file “%s”. Do you want to save the changes "
508488
"somewhere else?"
509489

510490
#: src/Services/Document.vala:899

po/he.po

Lines changed: 15 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgstr ""
88
"Project-Id-Version: scratch\n"
99
"Report-Msgid-Bugs-To: \n"
1010
"POT-Creation-Date: 2023-03-24 23:26+0000\n"
11-
"PO-Revision-Date: 2023-03-24 23:26+0000\n"
11+
"PO-Revision-Date: 2023-03-27 00:59+0000\n"
1212
"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
1313
"Language-Team: Hebrew <https://l10n.elementary.io/projects/code/code/he/>\n"
1414
"Language: he\n"
@@ -374,8 +374,7 @@ msgid "Load Anyway"
374374
msgstr "לטעון בכל זאת"
375375

376376
#: src/Services/Document.vala:300
377-
#, fuzzy, c-format
378-
#| msgid "Loading File \"%s\" Is Taking a Long Time"
377+
#, c-format
379378
msgid "Loading File “%s” Is Taking a Long Time"
380379
msgstr "טעינת הקובץ „%s” אורכת זמן רב"
381380

@@ -388,8 +387,7 @@ msgid "Cancel Loading"
388387
msgstr "ביטול הטעינה"
389388

390389
#: src/Services/Document.vala:393
391-
#, fuzzy, c-format
392-
#| msgid "Save changes to \"%s\" before closing?"
390+
#, c-format
393391
msgid "Save changes to “%s” before closing?"
394392
msgstr "לשמור את השינויים אל „%s” לפני הסגירה?"
395393

@@ -416,34 +414,26 @@ msgstr "מסמך חדש"
416414

417415
#. Show an error view which says "Hey, I cannot read that file!"
418416
#: src/Services/Document.vala:762
419-
#, fuzzy, c-format
420-
#| msgid "Search for text in “%s”"
417+
#, c-format
421418
msgid "Cannot read text in file “%s”"
422-
msgstr "חיפוש טקסט בתוך „%s”"
419+
msgstr "לא ניתן לקרוא טקסט בקובץ „%s”"
423420

424421
#: src/Services/Document.vala:765
425-
#, fuzzy
426-
#| msgid "It may be corrupt or you don't have permission to read it."
427422
msgid "You may not have permission to read the file."
428-
msgstr "יתכן שהוא פגום או שאין לך את ההרשאות המתאימות כדי לקרוא ממנו."
423+
msgstr "כנראה שאין לך הרשאות לקרוא את הקובץ."
429424

430425
#: src/Services/Document.vala:767
431426
msgid "The file may be corrupt or may not be a text file"
432-
msgstr ""
427+
msgstr "כנראה שהקובץ פגום או שאינו קובץ טקסט"
433428

434429
#. Lack of read permission results in empty content string. Do not give option to open
435430
#. in new document in that case.
436431
#: src/Services/Document.vala:773
437-
#, fuzzy
438-
#| msgid "Load Anyway"
439432
msgid "Show Anyway"
440-
msgstr "לטעון בכל זאת"
433+
msgstr "להציג בכל זאת"
441434

442435
#: src/Services/Document.vala:802
443-
#, fuzzy, c-format
444-
#| msgid ""
445-
#| "The location containing the file \"%s\" was unmounted. Do you want to "
446-
#| "save somewhere else?"
436+
#, c-format
447437
msgid ""
448438
"The location containing the file “%s” was unmounted. Do you want to save "
449439
"somewhere else?"
@@ -454,21 +444,16 @@ msgid "Save As…"
454444
msgstr "שמירה בשם…"
455445

456446
#: src/Services/Document.vala:811
457-
#, fuzzy, c-format
458-
#| msgid "File \"%s\" was deleted. Do you want to save it anyway?"
447+
#, c-format
459448
msgid "File “%s” was deleted. Do you want to save it anyway?"
460-
msgstr "הקובץ „%s” נמחק. האם לשמור בכל זאת?"
449+
msgstr "הקובץ „%s” נמחק. לשמור בכל זאת?"
461450

462451
#: src/Services/Document.vala:855
463-
#, fuzzy, c-format
464-
#| msgid ""
465-
#| "File \"%s\" was modified by an external application. Do you want to load "
466-
#| "it again or continue your editing?"
452+
#, c-format
467453
msgid ""
468454
"File “%s” was modified by an external application. Do you want to load it "
469455
"again or continue your editing?"
470-
msgstr ""
471-
"הקובץ „%s” שונה באמצעות יישום חיצוני. האם לטעון אותו שוב או להמשיך בעריכה?"
456+
msgstr "הקובץ „%s” שונה באמצעות יישום חיצוני. לטעון אותו שוב או להמשיך בעריכה?"
472457

473458
#: src/Services/Document.vala:858
474459
msgid "Load"
@@ -479,20 +464,14 @@ msgid "Continue"
479464
msgstr "המשך"
480465

481466
#: src/Services/Document.vala:888
482-
#, fuzzy, c-format
483-
#| msgid ""
484-
#| "You cannot save the document to \"%s\". Do you want to save the file "
485-
#| "somewhere else?"
467+
#, c-format
486468
msgid ""
487469
"You cannot save the document to “%s”. Do you want to save the file somewhere "
488470
"else?"
489471
msgstr "לא ניתן לשמור את המסמך אל „%s”. לשמור את הקובץ במקום אחר?"
490472

491473
#: src/Services/Document.vala:892
492-
#, fuzzy, c-format
493-
#| msgid ""
494-
#| "You cannot save changes to the file \"%s\". Do you want to save the "
495-
#| "changes somewhere else?"
474+
#, c-format
496475
msgid ""
497476
"You cannot save changes to the file “%s”. Do you want to save the changes "
498477
"somewhere else?"

0 commit comments

Comments
 (0)