Merge pull request #225 from albanobattistella/patch-1

Update it.po
i18n: update Italian translation
2024-01-14 17:45:35 -05:00 · 2024-01-14 17:40:54 -05:00 · 2024-01-13 11:48:47 -05:00 · 2024-01-13 11:38:42 -05:00 · 2024-01-06 23:11:25 -05:00 · 2024-01-06 23:04:52 -05:00
18 changed files with 155 additions and 190 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -39,16 +39,20 @@ jobs:

  meson-build-test:
    runs-on: ubuntu-latest
+    container:
+      # Use Ubuntu 23.04 in order to have appstreamcli v0.16 instead of 0.15.
+      image: ubuntu:23.04
    steps:
    - uses: actions/checkout@v4
    - uses: actions/setup-python@v5
      with:
          python-version: '3.8'
-    - run: sudo apt-get -y install meson appstream desktop-file-utils gettext
-    - run: pip install meson ninja
+    # Extra installation since we are not using ubuntu-latest
+    - run: apt-get update && apt-get -y install libglib2.0-dev-bin
+    - run: apt-get -y install meson appstream desktop-file-utils gettext
    - run: meson setup build
    - run: meson compile -C build
-    - run: meson test -C build
+    - run: meson test --print-errorlogs -C build

  flatpak-build-test:
    runs-on: ubuntu-latest
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -9,10 +9,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ### Changed

+- Translation: update Italian translation (@albanobattistella)
+
+## 0.9.0 - 2024-01-13
+
+### Changed
+
 - Update from GNOME 44 to 45 (@sabriunal)
 - Flatpak manifest now runs the tests (@sabriunal)
 - Use `appstreamcli` instead of the deprecated `appstream-util` to validate
  appdata (@sabriunal)
+- Update appdata: add translation tag, vcs-browser and translate URLs (@sabriunal)
+- Translation: mark the developer name and release descriptions as
+  untranslatable (@sabriunal)
+- Translation: update Turkish translation (@sabriunal)

 ### Removed

--- a/data/io.github.mightycreak.Diffuse.appdata.xml.in
+++ b/data/io.github.mightycreak.Diffuse.appdata.xml.in
@ -19,8 +19,11 @@
  <project_license>GPL-2.0-or-later</project_license>
  <content_rating type="oars-1.1"/>
  <launchable type="desktop-id">io.github.mightycreak.Diffuse.desktop</launchable>
+  <translation type="gettext">diffuse</translation>
  <url type="homepage">https://mightycreak.github.io/diffuse/</url>
  <url type="bugtracker">https://github.com/MightyCreak/diffuse/issues</url>
+  <url type="vcs-browser">https://github.com/MightyCreak/diffuse</url>
+  <url type="translate">https://github.com/MightyCreak/diffuse/blob/main/docs/translators.md</url>

  <screenshots>
    <screenshot type="default">
@ -33,13 +36,36 @@
    </screenshot>
  </screenshots>

-  <!-- Translators: no need to translate after this comment -->
-  <developer_name>Romain Failliot</developer_name>
+  <developer_name translatable="no">Romain Failliot</developer_name>
  <update_contact>romain@foolstep.com</update_contact>

  <releases>
-    <release version="0.8.2" date="2023-04-16">
+    <release version="0.9.0" date="2024-01-13">
      <description>
+        <p>Summary: remove support for SVK, update to GNOME 45, updated Turkish translation.</p>
+        <p>Changed:</p>
+        <ul>
+          <li>Update from GNOME 44 to 45 (@sabriunal)</li>
+          <li>Flatpak manifest now runs the tests (@sabriunal)</li>
+          <li>Use appstreamcli instead of the deprecated appstream-util to validate appdata (@sabriunal)</li>
+          <li>Update appdata: add translation tag, vcs-browser and translate URLs (@sabriunal)</li>
+          <li>Translation: mark the developer name and release descriptions as untranslatable (@sabriunal)</li>
+          <li>Translation: update Turkish translation (@sabriunal)</li>
+        </ul>
+        <p>Removed:</p>
+        <ul>
+          <li>Remove support for the SVK CVS (@MightyCreak)</li>
+        </ul>
+        <p>Fixed:</p>
+        <ul>
+          <li>Fix compatibility with Python 3.12: remove use of distutils (@MightyCreak)</li>
+          <li>Fix new errors raised by Flake8 (@MightyCreak)</li>
+          <li>Fix the error with the CICD due to the use of appstreamcli (@MightyCreak)</li>
+        </ul>
+      </description>
+    </release>
+    <release version="0.8.2" date="2023-04-16">
+      <description translatable="no">
        <p>Use more modern, symbolic icons, add Dutch translation, and a couple of small fixes.</p>
        <p>Added:</p>
        <ul>
@ -62,7 +88,7 @@
      </description>
    </release>
    <release version="0.8.1" date="2023-04-07">
-      <description>
+      <description translatable="no">
        <p>
          Fix for the shortcuts that weren't working anymore due to migration to Gtk.Application.
        </p>
@ -82,7 +108,7 @@
      </description>
    </release>
    <release version="0.8.0" date="2023-04-03">
-      <description>
+      <description translatable="no">
        <p>
          Update to GNOME 44, improved GTK 3 support, initial support for Rust, added Turkish and
          Georgian translations, and a couple of fixes.
@ -119,7 +145,7 @@
      </description>
    </release>
    <release version="0.7.7" date="2022-10-23">
-      <description>
+      <description translatable="no">
        <p>
          Update translations.
        </p>
@ -132,7 +158,7 @@
      </description>
    </release>
    <release version="0.7.6" date="2022-10-23">
-      <description>
+      <description translatable="no">
        <p>
          Add port to Mac OS.
        </p>
@ -153,7 +179,7 @@
      </description>
    </release>
    <release version="0.7.5" date="2022-04-15">
-      <description>
+      <description translatable="no">
        <p>
          Crashfix and French translation.
        </p>
@ -170,7 +196,7 @@
      </description>
    </release>
    <release version="0.7.4" date="2022-04-03">
-      <description>
+      <description translatable="no">
        <p>
          Mainly a maintenance release. It does increase the GNOME SDK's version.
        </p>
@ -204,7 +230,7 @@
      </description>
    </release>
    <release version="0.7.3" date="2021-11-22">
-      <description>
+      <description translatable="no">
        <p>
          Patch release that introduces linters (flake8 and mypy).
        </p>
@ -229,7 +255,7 @@
      </description>
    </release>
    <release version="0.7.2" date="2021-11-18">
-      <description>
+      <description translatable="no">
        <p>
          Patch release that fixes an error about APP_NAME and the Brazilian translation.
        </p>
@ -257,7 +283,7 @@
      </description>
    </release>
    <release version="0.7.1" date="2021-11-17">
-      <description>
+      <description translatable="no">
        <p>
          Patch release to fix a bug when using the Flatpak package.
        </p>
@ -271,7 +297,7 @@
      </description>
    </release>
    <release version="0.7.0" date="2021-11-16">
-      <description>
+      <description translatable="no">
        <p>
          With this release, the main end-user change is the new icon. The rest
          is mainly maintenance improvements with a much more standard folder
@ -310,7 +336,7 @@
      </description>
    </release>
    <release version="0.6.0" date="2020-11-29">
-      <description>
+      <description translatable="no">
        <p>
          Mainly under the hood changes in this release, so nothing really
          visible to the users in this version. That said, I figured it was a
@ -335,7 +361,7 @@
      </description>
    </release>
    <release version="0.5.0" date="2020-07-18">
-      <description>
+      <description translatable="no">
        <p>
          Here is the v0.5.0. Unintentionally, this release happens exactly 6
          years after the previous v0.4.8 release!
--- a/data/usr/share/gnome/help/diffuse/C/diffuse.xml
+++ b/data/usr/share/gnome/help/diffuse/C/diffuse.xml
@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
  <!ENTITY app "Diffuse">
-  <!ENTITY app-version "0.8.2">
+  <!ENTITY app-version "0.9.0">
  <!ENTITY app-year "2006-2023">
  <!ENTITY manual-year "2009-2023">
 ]>
--- a/data/usr/share/gnome/help/diffuse/cs/diffuse.xml
+++ b/data/usr/share/gnome/help/diffuse/cs/diffuse.xml
@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
 [
  <!ENTITY app "Diffuse">
-  <!ENTITY app-version "0.8.2">
+  <!ENTITY app-version "0.9.0">
  <!ENTITY app-year "2006-2023">
  <!ENTITY manual-year "2009-2023">
 ]>
--- a/data/usr/share/gnome/help/diffuse/it/diffuse.xml
+++ b/data/usr/share/gnome/help/diffuse/it/diffuse.xml
@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
  <!ENTITY app "Diffuse">
-  <!ENTITY app-version "0.8.2">
+  <!ENTITY app-version "0.9.0">
  <!ENTITY app-year "2006-2023">
  <!ENTITY manual-year "2009-2023">
 ]>
--- a/data/usr/share/gnome/help/diffuse/ru/diffuse.xml
+++ b/data/usr/share/gnome/help/diffuse/ru/diffuse.xml
@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
  <!ENTITY app "Diffuse">
-  <!ENTITY app-version "0.8.2">
+  <!ENTITY app-version "0.9.0">
  <!ENTITY app-year "2006-2023">
  <!ENTITY manual-year "2009-2023">
 ]>
--- a/data/usr/share/omf/diffuse/diffuse-C.omf
+++ b/data/usr/share/omf/diffuse/diffuse-C.omf
@ -4,8 +4,8 @@
    <creator>Derrick Moser</creator>
    <maintainer>Derrick Moser</maintainer>
    <title>Diffuse User's Manual</title>
-    <date>2023-04-16</date>
-    <version identifier="0.8.2" date="2023-04-16"/>
+    <date>2024-01-13</date>
+    <version identifier="0.9.0" date="2024-01-13"/>
    <subject category="GNOME|Development|Applications"/>
    <description>Diffuse is a graphical tool for merging and comparing text files.</description>
    <type>manual</type>
--- a/data/usr/share/omf/diffuse/diffuse-cs.omf
+++ b/data/usr/share/omf/diffuse/diffuse-cs.omf
@ -4,8 +4,8 @@
    <creator>Derrick Moser</creator>
    <maintainer>Derrick Moser</maintainer>
    <title>Uživatelská příručka programu Diffuse</title>
-    <date>2023-04-16</date>
-    <version identifier="0.8.2" date="2023-04-16"/>
+    <date>2024-01-13</date>
+    <version identifier="0.9.0" date="2024-01-13"/>
    <subject category="GNOME|Development|Applications"/>
    <description>Diffuse je grafický nástroj pro slučování a porovnávání textových souborů.</description>
    <type>manual</type>
--- a/data/usr/share/omf/diffuse/diffuse-it.omf
+++ b/data/usr/share/omf/diffuse/diffuse-it.omf
@ -4,8 +4,8 @@
    <creator>Derrick Moser</creator>
    <maintainer>Derrick Moser</maintainer>
    <title>Manuale utente di Diffuse</title>
-    <date>2023-04-16</date>
-    <version identifier="0.8.2" date="2023-04-16"/>
+    <date>2024-01-13</date>
+    <version identifier="0.9.0" date="2024-01-13"/>
    <subject category="GNOME|Development|Applications"/>
    <description>Diffuse è uno strumento grafico per l'unione e il confronto di file di testo.</description>
    <type>manual</type>
--- a/data/usr/share/omf/diffuse/diffuse-ru.omf
+++ b/data/usr/share/omf/diffuse/diffuse-ru.omf
@ -4,8 +4,8 @@
    <creator>Derrick Moser</creator>
    <maintainer>Derrick Moser</maintainer>
    <title>Руководство Пользователя Diffuse</title>
-    <date>2023-04-16</date>
-    <version identifier="0.8.2" date="2023-04-16"/>
+    <date>2024-01-13</date>
+    <version identifier="0.9.0" date="2024-01-13"/>
    <subject category="GNOME|Development|Applications"/>
    <description>Программа Diffuse является графическим инструментом для слияния и сравнения текстовых файлов.</description>
    <type>manual</type>
--- a/docs/translators.md
+++ b/docs/translators.md
@ -17,12 +17,6 @@ repo root:
 xgettext -w 84 -o po/diffuse.pot -f po/POTFILES
 ```

-Regenerating the POT file will add a bunch of new lines coming from
-`data/io.github.mightycreak.Diffuse.appdata.xml.in`. Not all the lines need to
-be translated in this file. In `diffuse.pot`, look for the comment
-`Translators: no need to translate after this comment`, and remove all the
-added lines for this file.
-
 _Note:_ why 84 characters, you ask? because the usage text has to be 80-char
 wide, plus the beginning and ending `"` and the final `\n` (which is two
 characters).
--- a/meson.build
+++ b/meson.build
@ -1,5 +1,5 @@
 project('diffuse',
-    version: '0.8.2',
+    version: '0.9.0',
    meson_version: '>= 0.55',
    license: 'GPL-2.0-or-later',
    default_options: [ 'warning_level=2' ])
--- a/po/it.po
+++ b/po/it.po
@ -2,14 +2,15 @@
 # Copyright (C) 2010 THE Diffuse'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the Diffuse package.
 # Cristian Marchi <cri.penta@gmail.com>, 2010.
+# Albano Battistella <albanobattistella@gmail.com>, 2024.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Diffuse 0.4.4\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-04-16 14:09-0400\n"
-"PO-Revision-Date: 2022-04-04 12:18-0400\n"
-"Last-Translator: Cristian Marchi <cri.penta@gmail.com>\n"
+"PO-Revision-Date: 2024-01-14 22:18+0100\n"
+"Last-Translator: Albano Battistella <albanobattistella@gmail.com>\n"
 "Language-Team: Italian\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
@ -34,14 +35,17 @@ msgid ""
 "files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, and "
 "Subversion repositories."
 msgstr ""
+"Diffuse è uno strumento grafico per confrontare e unire file di testo. Può recuperare "
+"file per il confronto da Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS e "
+"Repository di sovversione."

 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:28
 msgid "Main window"
-msgstr ""
+msgstr "Finestra principale"

 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:32
 msgid "About window"
-msgstr ""
+msgstr "Informazioni sulla finestra"

 #: src/diffuse/constants.py:26
 msgid "Copyright"
@ -51,7 +55,7 @@ msgstr ""
 #: src/diffuse/preferences.py:254 src/diffuse/preferences.py:483
 #: src/diffuse/window.py:309 src/diffuse/window.py:1107
 msgid "_Cancel"
-msgstr ""
+msgstr "_Annulla"

 #: src/diffuse/dialogs.py:50
 msgid "Encoding: "
@ -128,7 +132,7 @@ msgstr "Apre una nuova scheda"

 #: src/diffuse/main.py:137 src/diffuse/preferences.py:159
 msgid "Version control system search order"
-msgstr ""
+msgstr "Ordine di ricerca del sistema di controllo della versione"

 #: src/diffuse/main.py:145
 msgid "Start with line <line> selected"
@ -166,6 +170,10 @@ msgid ""
 "ability to manually adjust line matching and directly edit files. Diffuse can\n"
 "also retrieve revisions of files from several VCSs for comparison and merging."
 msgstr ""
+"Diffuse è uno strumento grafico per unire e confrontare file di testo. Diffuse è\n"
+"in grado di confrontare un numero arbitrario di file fianco a fianco e offre agli utenti\n"
+"capacità di regolare manualmente la corrispondenza delle linee e modificare direttamente i file. Diffuse può\n"
+"recuperare anche revisioni di file da diversi VCS per il confronto e l'unione."

 #: src/diffuse/main.py:247 src/diffuse/window.py:420
 #, python-format
@ -326,88 +334,84 @@ msgstr "Errore scrivendo il %s."
 #: src/diffuse/preferences.py:483 src/diffuse/window.py:446
 #: src/diffuse/window.py:1413 src/diffuse/window.py:1436 src/diffuse/window.py:1459
 msgid "_Open"
-msgstr ""
+msgstr "_Apri"

 #: src/diffuse/resources.py:242 src/diffuse/resources.py:246
 #: src/diffuse/resources.py:249
 #, python-brace-format
 msgid "The key binding \"{key}\" is invalid"
-msgstr ""
+msgstr "L'associazione della chiave \"{key}\" non è valida"

 #: src/diffuse/resources.py:376
 msgid "Imports must have one argument"
-msgstr ""
+msgstr "Le importazioni devono avere un argomento"

 #: src/diffuse/resources.py:392
 msgid "Key bindings must have three arguments"
-msgstr ""
+msgstr "Le associazioni di tasti devono avere tre argomenti"

 #: src/diffuse/resources.py:398
 msgid "Colors must have four arguments"
-msgstr ""
+msgstr "I colori devono avere quattro argomenti"

 #: src/diffuse/resources.py:404
 msgid "Floats must have two arguments"
-msgstr ""
+msgstr "I float devono avere due argomenti"

 #: src/diffuse/resources.py:410
 msgid "Options must have two arguments"
-msgstr ""
+msgstr "Le opzioni devono avere due argomenti"

 #: src/diffuse/resources.py:413
 #, python-brace-format
 msgid "Option \"{option}\" is unknown"
-msgstr ""
+msgstr "L'opzione \"{option}\" è sconosciuta"

 #: src/diffuse/resources.py:420
 msgid "Strings must have two arguments"
-msgstr ""
+msgstr "Le stringhe devono avere due argomenti"

 #: src/diffuse/resources.py:431
 msgid "Syntaxes must have two or three arguments"
-msgstr ""
+msgstr "Le sintassi devono avere due o tre argomenti"

 #: src/diffuse/resources.py:459
 msgid "Syntax patterns must have at least four arguments"
-msgstr ""
+msgstr "I modelli di sintassi devono avere almeno quattro argomenti"

 #: src/diffuse/resources.py:465 src/diffuse/resources.py:509
 #, python-brace-format
 msgid "Value \"{value}\" is unknown"
-msgstr ""
+msgstr "Il valore \"{value}\" è sconosciuto"

 #: src/diffuse/resources.py:476
 msgid "Syntax files must have one or two arguments"
-msgstr ""
+msgstr "I file di sintassi devono avere uno o due argomenti"

 #: src/diffuse/resources.py:494
 msgid "Syntax magics must have at least one argument"
-msgstr ""
+msgstr "Le magie della sintassi devono avere almeno un argomento"

 #: src/diffuse/resources.py:513
 #, python-brace-format
 msgid "Keyword \"{keyword}\" is unknown"
-msgstr ""
+msgstr "La parola chiave \"{keyword}\" è sconosciuta"

 #: src/diffuse/resources.py:515
-#, fuzzy, python-brace-format
 msgid "Syntax error at line {line} of {file}"
-msgstr "Errore nell'elaborare la riga {line} di «{file}»."
+msgstr "Errore di sintassi alla riga {line} di {file}"

 #: src/diffuse/resources.py:521
-#, fuzzy, python-brace-format
 msgid "Value error at line {line} of {file}"
-msgstr "Errore nell'elaborare la riga {line} di «{file}»."
+msgstr "Errore di valore alla riga {line} di {file}"

 #: src/diffuse/resources.py:527
-#, fuzzy, python-brace-format
 msgid "Regex error at line {line} of {file}."
-msgstr "Errore nell'elaborare la riga {line} di «{file}»."
+msgstr "Errore regex alla riga {line} di {file}."

 #: src/diffuse/resources.py:530
-#, fuzzy, python-brace-format
 msgid "Unhandled error at line {line} of {file}."
-msgstr "Errore nell'elaborare la riga {line} di «{file}»."
+msgstr "Errore non gestito alla riga {line} di {file}."

 #: src/diffuse/utils.py:66
 msgid "Auto Detect"
@ -485,11 +489,11 @@ msgstr "Salvare i cambiamenti prima di caricare il nuovo file?"

 #: src/diffuse/window.py:310
 msgid "_No"
-msgstr ""
+msgstr ":_No"

 #: src/diffuse/window.py:311
 msgid "_Yes"
-msgstr ""
+msgstr "_Si"

 #: src/diffuse/window.py:417
 #, python-format
@ -506,9 +510,8 @@ msgid "Save %(title)s Pane %(pane)d"
 msgstr "Salva %(title)s riquadro %(pane)d"

 #: src/diffuse/window.py:499 src/diffuse/window.py:1111
-#, fuzzy
 msgid "_Save"
-msgstr "_Salva file"
+msgstr "_Salva"

 #: src/diffuse/window.py:527
 #, python-format
@ -888,24 +891,29 @@ msgstr "Ripeti"

 #: src/diffuse/window.py:950
 msgid "Changes detected"
-msgstr ""
+msgstr "Modifiche rilevate"

 #: src/diffuse/window.py:954
-#, fuzzy, python-format
 msgid ""
 "The file \"%s\" changed on disk.\n"
 "\n"
 "Do you want to reload the file?"
-msgstr "Il file «%s» è cambiato sul disco. Ricaricarlo?"
+msgstr ""
+"Il file \"%s\" sul disco è stato modificato.\n"
+"\n"
+"Vuoi ricaricare il file?"

 #: src/diffuse/window.py:959
-#, fuzzy, python-format
 msgid ""
 "The following files changed on disk:\n"
 "%s\n"
 "\n"
 "Do you want to reload these files?"
-msgstr "Il file «%s» è cambiato sul disco. Ricaricarlo?"
+msgstr ""
+"I seguenti file sono stati modificati sul disco:\n"
+"%s\n"
+"\n"
+"Vuoi ricaricare questi file?"

 #: src/diffuse/window.py:1078
 msgid "Some files have unsaved changes. Select the files to save before closing."
--- a/po/tr.po
+++ b/po/tr.po
@ -1,23 +1,23 @@
 # Turkish translation for io.github.mightycreak.Diffuse.
-# Copyright (C) 2022 io.github.mightycreak.Diffuse's COPYRIGHT HOLDER
+# Copyright (C) 2022-2024 io.github.mightycreak.Diffuse's COPYRIGHT HOLDER
 # This file is distributed under the same license as the io.github.mightycreak.Diffuse package.
 #
-# Sabri Ünal <libreajans@gmail.com>, 2022.
+# Sabri Ünal <libreajans@gmail.com>, 2022, 2024.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: io.github.mightycreak.Diffuse\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-04-16 14:09-0400\n"
-"PO-Revision-Date: 2022-11-19 03:14+0300\n"
+"PO-Revision-Date: 2024-01-07 02:49+0300\n"
 "Last-Translator: Sabri Ünal <libreajans@gmail.com>\n"
-"Language-Team: Türkçe <gnome-turk@gnome.org>\n"
+"Language-Team: Türkçe <takim@gnome.org.tr>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 3.1.1\n"
+"X-Generator: Poedit 3.4.2\n"

 #: data/io.github.mightycreak.Diffuse.desktop.in:3
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:4
@ -30,23 +30,22 @@ msgid "Graphical tool for merging and comparing text files"
 msgstr "Metin dosyalarını birleştirmek ve karşılaştırmak için grafiksel araç"

 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:7
-#, fuzzy
 msgid ""
 "Diffuse is a graphical tool for comparing and merging text files. It can retrieve "
 "files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, and "
 "Subversion repositories."
 msgstr ""
 "Diffuse, metin dosyalarını karşılaştırmak ve birleştirmek için grafiksel bir "
-"araçtır. Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, ve Subversion "
-"depolarından karşılaştırma için dosyaları alabilir."
+"araçtır. Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS ve Subversion "
+"depolarından karşılaştırma için dosya alabilir."

 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:28
 msgid "Main window"
-msgstr ""
+msgstr "Ana pencere"

 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:32
 msgid "About window"
-msgstr ""
+msgstr "Pencere hakkında"

 #: src/diffuse/constants.py:26
 msgid "Copyright"
@ -56,7 +55,7 @@ msgstr "Telif Hakkı"
 #: src/diffuse/preferences.py:254 src/diffuse/preferences.py:483
 #: src/diffuse/window.py:309 src/diffuse/window.py:1107
 msgid "_Cancel"
-msgstr ""
+msgstr "İ_ptal"

 #: src/diffuse/dialogs.py:50
 msgid "Encoding: "
@ -69,7 +68,7 @@ msgstr "Düzeltme: "
 #: src/diffuse/dialogs.py:90 src/diffuse/dialogs.py:134
 #: src/diffuse/preferences.py:255
 msgid "_OK"
-msgstr ""
+msgstr "_Tamam"

 #: src/diffuse/dialogs.py:130
 msgid "Find..."
@ -104,9 +103,8 @@ msgid "File revisions <rev-1> and <rev>"
 msgstr "Dosya düzeltmesi <rev-1> ve <rev>"

 #: src/diffuse/main.py:85
-#, fuzzy
 msgid "Close all tabs with no differences"
-msgstr "Fark yoksa sekmeleri kapat"
+msgstr "Fark olmayan tüm sekmeleri kapat"

 #: src/diffuse/main.py:92
 msgid "Use <codec> to read and write files"
@ -172,6 +170,11 @@ msgid ""
 "ability to manually adjust line matching and directly edit files. Diffuse can\n"
 "also retrieve revisions of files from several VCSs for comparison and merging."
 msgstr ""
+"Diffuse, metin dosyalarını karşılaştırmak ve birleştirmek için grafiksel bir "
+"araçtır. Diffuse, pek çok dosyayı yan yana karşılaştırabilir ve kullanıcılara "
+"satır eşleştirmeyi elle ayarlama ve dosyaları doğrudan düzenleme imkanı sunar. "
+"Diffuse ayrıca karşılaştırma ve birleştirme için çeşitli sürüm kontrol "
+"sistemlerinden dosyaların revizyonlarını alabilir."

 #: src/diffuse/main.py:247 src/diffuse/window.py:420
 #, python-format
@ -332,7 +335,7 @@ msgstr "%s yazma hatası."
 #: src/diffuse/preferences.py:483 src/diffuse/window.py:446
 #: src/diffuse/window.py:1413 src/diffuse/window.py:1436 src/diffuse/window.py:1459
 msgid "_Open"
-msgstr ""
+msgstr "_Aç"

 #: src/diffuse/resources.py:242 src/diffuse/resources.py:246
 #: src/diffuse/resources.py:249
@ -491,11 +494,11 @@ msgstr "Yeni dosya yüklenmeden önce değişiklikler kaydedilsin mi?"

 #: src/diffuse/window.py:310
 msgid "_No"
-msgstr ""
+msgstr "_Hayır"

 #: src/diffuse/window.py:311
 msgid "_Yes"
-msgstr ""
+msgstr "_Evet"

 #: src/diffuse/window.py:417
 #, python-format
@ -512,9 +515,8 @@ msgid "Save %(title)s Pane %(pane)d"
 msgstr "%(title)s Bölmesi %(pane)d Kaydet"

 #: src/diffuse/window.py:499 src/diffuse/window.py:1111
-#, fuzzy
 msgid "_Save"
-msgstr "Dosyayı _Kaydet"
+msgstr "_Kaydet"

 #: src/diffuse/window.py:527
 #, python-format
@ -894,24 +896,32 @@ msgstr "Yinele"

 #: src/diffuse/window.py:950
 msgid "Changes detected"
-msgstr ""
+msgstr "Değişiklikler algılandı"

 #: src/diffuse/window.py:954
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "The file \"%s\" changed on disk.\n"
 "\n"
 "Do you want to reload the file?"
-msgstr "%s dosyası diskte değişti. Dosyayı yeniden yüklemek ister misiniz?"
+msgstr ""
+"\"%s\" dosyası diskte değişti. \n"
+"\n"
+"Dosyayı yeniden yüklemek ister misiniz?"

 #: src/diffuse/window.py:959
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "The following files changed on disk:\n"
 "%s\n"
 "\n"
 "Do you want to reload these files?"
-msgstr "%s dosyası diskte değişti. Dosyayı yeniden yüklemek ister misiniz?"
+msgstr ""
+"Aşağıdaki dosyalar diskte değişti. \n"
+"\n"
+"%s\n"
+"\n"
+"Bu dosyaları yeniden yüklemek ister misiniz?"

 #: src/diffuse/window.py:1078
 msgid "Some files have unsaved changes. Select the files to save before closing."
@ -996,90 +1006,3 @@ msgstr ""
 #: src/diffuse/window.py:1766
 msgid "translator-credits"
 msgstr "Sabri Ünal <libreajans@gmail.com>"
-
-#~ msgid "Main window: diff between two files"
-#~ msgstr "Ana pencere: iki dosya arasında fark"
-
-#~ msgid ""
-#~ "Usage:\n"
-#~ "    diffuse [OPTION...] [FILE...]\n"
-#~ "    diffuse ( -h | -? | --help | -v | --version )\n"
-#~ "\n"
-#~ "Diffuse is a graphical tool for merging and comparing text files. Diffuse is\n"
-#~ "able to compare an arbitrary number of files side-by-side and gives users the\n"
-#~ "ability to manually adjust line matching and directly edit files. Diffuse can\n"
-#~ "also retrieve revisions of files from several VCSs for comparison and "
-#~ "merging.\n"
-#~ "\n"
-#~ "Help Options:\n"
-#~ "  ( -h | -? | --help )             Display this usage information\n"
-#~ "  ( -v | --version )               Display version and copyright information\n"
-#~ "\n"
-#~ "Configuration Options:\n"
-#~ "  --no-rcfile                      Do not read any resource files\n"
-#~ "  --rcfile <file>                  Specify explicit resource file\n"
-#~ "\n"
-#~ "General Options:\n"
-#~ "  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
-#~ "  ( -D | --close-if-same )         Close all tabs with no differences\n"
-#~ "  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
-#~ "  ( -L | --label ) <label>         Display <label> instead of the file name\n"
-#~ "  ( -m | --modified )              Create a new tab for each modified file\n"
-#~ "  ( -r | --revision ) <rev>        File revision <rev>\n"
-#~ "  ( -s | --separate )              Create a new tab for each file\n"
-#~ "  ( -t | --tab )                   Start a new tab\n"
-#~ "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
-#~ "  --line <line>                    Start with line <line> selected\n"
-#~ "  --null-file                      Create a blank file comparison pane\n"
-#~ "\n"
-#~ "Display Options:\n"
-#~ "  ( -b | --ignore-space-change )   Ignore changes to white space\n"
-#~ "  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
-#~ "  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
-#~ "  ( -i | --ignore-case )           Ignore case differences\n"
-#~ "  ( -w | --ignore-all-space )      Ignore white space differences"
-#~ msgstr ""
-#~ "Kullanım:\n"
-#~ "    diffuse [SEÇENEK...] [DOSYA...]\n"
-#~ "    diffuse ( -h | -? | --help | -v | --version )\n"
-#~ "\n"
-#~ "Diffuse, metin dosyalarını birleştirmek ve karşılaştırmak için grafiksel bir "
-#~ "araçtır.\n"
-#~ "Diffuse, tercih edilen sayıda dosyayı yan yana karşılaştırabilir ve "
-#~ "kullanıcılara\n"
-#~ "satır eşleştirmeyi elle ayarlama ve dosyaları doğrudan düzenleme yeteneği "
-#~ "kazandırır.\n"
-#~ "Diffuse, karşılaştırma ve birleştirme için çeşitli Sürüm Denetim Sistemi "
-#~ "dosyaların\n"
-#~ "düzeltmelerini de alabilir.\n"
-#~ "\n"
-#~ "Yardım Seçenekleri:\n"
-#~ "  ( -h | -? | --help )             Bu kullanım bilgilerini göster\n"
-#~ "  ( -v | --version )               Sürümü ve telif hakkı bilgilerini göster\n"
-#~ "\n"
-#~ "Yapılandırma Seçenekleri:\n"
-#~ "  --no-rcfile                      Herhangi bir kaynak dosyasını okuma\n"
-#~ "  --rcfile <file>                  Açık kaynak dosyasını belirtin\n"
-#~ "\n"
-#~ "Genel Seçenekler:\n"
-#~ "  ( -c | --commit ) <rev>          Dosya düzeltmesi <rev-1> ve <rev>\n"
-#~ "  ( -D | --close-if-same )         Fark yoksa sekmeleri kapat\n"
-#~ "  ( -e | --encoding ) <codec>      Dosyaları okumak için <codec> kod çözücü "
-#~ "kullan\n"
-#~ "  ( -L | --label ) <label>         Dosya adı yerine <label> etiketini göster\n"
-#~ "  ( -m | --modified )              Değiştirilen her dosya için yeni sekme "
-#~ "oluştur\n"
-#~ "  ( -r | --revision ) <rev>        Dosya düzeltmesi <rev>\n"
-#~ "  ( -s | --separate )              Her dosya için yeni sekme oluştur\n"
-#~ "  ( -t | --tab )                   Yeni sekme başlat\n"
-#~ "  ( -V | --vcs ) <vcs-list>        Sürüm denetimi sistemi arama sırası\n"
-#~ "  --line <line>                    <line> satırı seçiliyken başla\n"
-#~ "  --null-file                      Boş bir dosya karşılaştırma bölmesi "
-#~ "oluştur\n"
-#~ "\n"
-#~ "Görünüm Seçenekleri:\n"
-#~ "  ( -b | --ignore-space-change )   Boşluk değişikliklerini yoksay\n"
-#~ "  ( -B | --ignore-blank-lines )    Boş satırlardaki değişiklikleri yoksay\n"
-#~ "  ( -E | --ignore-end-of-line )    Satır sonu farklarını yoksay\n"
-#~ "  ( -i | --ignore-case )           Büyük/Küçük harf farklarını yoksay\n"
-#~ "  ( -w | --ignore-all-space )      Boşluk farklarını yoksay"
--- a/utils/book2manual.xsl
+++ b/utils/book2manual.xsl
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE xsl:stylesheet [
 <!ENTITY app "Diffuse">
- <!ENTITY app-version "0.8.2">
+ <!ENTITY app-version "0.9.0">
 <!ENTITY app-cmd "diffuse">
- <!ENTITY date "2023-04-16">
+ <!ENTITY date "2024-01-13">
 ]>
 <!--
  template for translating Diffuse's help documentation to a manual page
--- a/windows-installer/build.py
+++ b/windows-installer/build.py
@ -25,7 +25,7 @@ import platform
 import subprocess
 import sys

-VERSION = '0.8.2'
+VERSION = '0.9.0'
 PACKAGE = '1'
 PLATFORM = 'win' + ''.join([c for c in platform.architecture()[0] if c.isdigit()])
 INSTALLER = 'diffuse-%s-%s.%s' % (VERSION, PACKAGE, PLATFORM)
--- a/windows-installer/diffuse.iss
+++ b/windows-installer/diffuse.iss
@ -5,7 +5,7 @@
 [Setup]
 AppId=Diffuse
 AppName={cm:ToolName}
-AppVerName=Diffuse 0.8.2
+AppVerName=Diffuse 0.9.0
 DefaultDirName={pf}\Diffuse
 DefaultGroupName=Diffuse
 UninstallDisplayIcon={app}\diffusew.exe
Author	SHA1	Message	Date
Creak	6e2450847c	Merge pull request #225 from albanobattistella/patch-1 Update it.po	2024-01-14 17:45:35 -05:00
albanobattistella	33ec9bd243	i18n: update Italian translation	2024-01-14 17:40:54 -05:00
Creak	6510966ae9	Merge pull request #224 from MightyCreak/release-0.9.0 chore: prepare files for release 0.9.0	2024-01-13 11:48:47 -05:00
Romain Failliot	f5ab606017	chore: prepare files for release 0.9.0	2024-01-13 11:38:42 -05:00
Creak	90ec27e3c3	Merge pull request #220 from sabriunal/fix-appdata Appdata and translation related patches	2024-01-06 23:11:25 -05:00
Romain Failliot	4d3dde33b8	fix(cicd): run the tests on Ubuntu 23.04 In order to have appstreamcli v0.16 instead of 0.15	2024-01-06 23:04:52 -05:00
Romain Failliot	06e1137278	cicd: print meson tests errors	2024-01-06 22:39:07 -05:00
Romain Failliot	81883fa1d3	chore: add changelog	2024-01-06 21:46:13 -05:00
Sabri Ünal	b24958d68c	Update Turkish translation	2024-01-06 21:41:16 -05:00
Sabri Ünal	eb01063bfb	appdata: Update appdata - Add vcs-browser and translate URLs - Add the translation tag - Mark the developer name and release descriptions as untranslatable - Use appstreamcli to validate appdata - Remove redundant paragraph from the translation document	2024-01-06 21:41:16 -05:00