Compare commits
No commits in common. "6e2450847cae3a57794d95e6a3f9bd3df5c9b114" and "fb5423b7881d14a063049321bed64afe83e3efef" have entirely different histories.
6e2450847c
...
fb5423b788
|
|
@ -39,20 +39,16 @@ 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'
|
||||
# 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: sudo apt-get -y install meson appstream desktop-file-utils gettext
|
||||
- run: pip install meson ninja
|
||||
- run: meson setup build
|
||||
- run: meson compile -C build
|
||||
- run: meson test --print-errorlogs -C build
|
||||
- run: meson test -C build
|
||||
|
||||
flatpak-build-test:
|
||||
runs-on: ubuntu-latest
|
||||
|
|
|
|||
10
CHANGELOG.md
10
CHANGELOG.md
|
|
@ -9,20 +9,10 @@ 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
|
||||
|
||||
|
|
|
|||
|
|
@ -19,11 +19,8 @@
|
|||
<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">
|
||||
|
|
@ -36,36 +33,13 @@
|
|||
</screenshot>
|
||||
</screenshots>
|
||||
|
||||
<developer_name translatable="no">Romain Failliot</developer_name>
|
||||
<!-- Translators: no need to translate after this comment -->
|
||||
<developer_name>Romain Failliot</developer_name>
|
||||
<update_contact>romain@foolstep.com</update_contact>
|
||||
|
||||
<releases>
|
||||
<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">
|
||||
<description>
|
||||
<p>Use more modern, symbolic icons, add Dutch translation, and a couple of small fixes.</p>
|
||||
<p>Added:</p>
|
||||
<ul>
|
||||
|
|
@ -88,7 +62,7 @@
|
|||
</description>
|
||||
</release>
|
||||
<release version="0.8.1" date="2023-04-07">
|
||||
<description translatable="no">
|
||||
<description>
|
||||
<p>
|
||||
Fix for the shortcuts that weren't working anymore due to migration to Gtk.Application.
|
||||
</p>
|
||||
|
|
@ -108,7 +82,7 @@
|
|||
</description>
|
||||
</release>
|
||||
<release version="0.8.0" date="2023-04-03">
|
||||
<description translatable="no">
|
||||
<description>
|
||||
<p>
|
||||
Update to GNOME 44, improved GTK 3 support, initial support for Rust, added Turkish and
|
||||
Georgian translations, and a couple of fixes.
|
||||
|
|
@ -145,7 +119,7 @@
|
|||
</description>
|
||||
</release>
|
||||
<release version="0.7.7" date="2022-10-23">
|
||||
<description translatable="no">
|
||||
<description>
|
||||
<p>
|
||||
Update translations.
|
||||
</p>
|
||||
|
|
@ -158,7 +132,7 @@
|
|||
</description>
|
||||
</release>
|
||||
<release version="0.7.6" date="2022-10-23">
|
||||
<description translatable="no">
|
||||
<description>
|
||||
<p>
|
||||
Add port to Mac OS.
|
||||
</p>
|
||||
|
|
@ -179,7 +153,7 @@
|
|||
</description>
|
||||
</release>
|
||||
<release version="0.7.5" date="2022-04-15">
|
||||
<description translatable="no">
|
||||
<description>
|
||||
<p>
|
||||
Crashfix and French translation.
|
||||
</p>
|
||||
|
|
@ -196,7 +170,7 @@
|
|||
</description>
|
||||
</release>
|
||||
<release version="0.7.4" date="2022-04-03">
|
||||
<description translatable="no">
|
||||
<description>
|
||||
<p>
|
||||
Mainly a maintenance release. It does increase the GNOME SDK's version.
|
||||
</p>
|
||||
|
|
@ -230,7 +204,7 @@
|
|||
</description>
|
||||
</release>
|
||||
<release version="0.7.3" date="2021-11-22">
|
||||
<description translatable="no">
|
||||
<description>
|
||||
<p>
|
||||
Patch release that introduces linters (flake8 and mypy).
|
||||
</p>
|
||||
|
|
@ -255,7 +229,7 @@
|
|||
</description>
|
||||
</release>
|
||||
<release version="0.7.2" date="2021-11-18">
|
||||
<description translatable="no">
|
||||
<description>
|
||||
<p>
|
||||
Patch release that fixes an error about APP_NAME and the Brazilian translation.
|
||||
</p>
|
||||
|
|
@ -283,7 +257,7 @@
|
|||
</description>
|
||||
</release>
|
||||
<release version="0.7.1" date="2021-11-17">
|
||||
<description translatable="no">
|
||||
<description>
|
||||
<p>
|
||||
Patch release to fix a bug when using the Flatpak package.
|
||||
</p>
|
||||
|
|
@ -297,7 +271,7 @@
|
|||
</description>
|
||||
</release>
|
||||
<release version="0.7.0" date="2021-11-16">
|
||||
<description translatable="no">
|
||||
<description>
|
||||
<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
|
||||
|
|
@ -336,7 +310,7 @@
|
|||
</description>
|
||||
</release>
|
||||
<release version="0.6.0" date="2020-11-29">
|
||||
<description translatable="no">
|
||||
<description>
|
||||
<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
|
||||
|
|
@ -361,7 +335,7 @@
|
|||
</description>
|
||||
</release>
|
||||
<release version="0.5.0" date="2020-07-18">
|
||||
<description translatable="no">
|
||||
<description>
|
||||
<p>
|
||||
Here is the v0.5.0. Unintentionally, this release happens exactly 6
|
||||
years after the previous v0.4.8 release!
|
||||
|
|
|
|||
|
|
@ -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.9.0">
|
||||
<!ENTITY app-version "0.8.2">
|
||||
<!ENTITY app-year "2006-2023">
|
||||
<!ENTITY manual-year "2009-2023">
|
||||
]>
|
||||
|
|
|
|||
|
|
@ -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.9.0">
|
||||
<!ENTITY app-version "0.8.2">
|
||||
<!ENTITY app-year "2006-2023">
|
||||
<!ENTITY manual-year "2009-2023">
|
||||
]>
|
||||
|
|
|
|||
|
|
@ -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.9.0">
|
||||
<!ENTITY app-version "0.8.2">
|
||||
<!ENTITY app-year "2006-2023">
|
||||
<!ENTITY manual-year "2009-2023">
|
||||
]>
|
||||
|
|
|
|||
|
|
@ -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.9.0">
|
||||
<!ENTITY app-version "0.8.2">
|
||||
<!ENTITY app-year "2006-2023">
|
||||
<!ENTITY manual-year "2009-2023">
|
||||
]>
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
<creator>Derrick Moser</creator>
|
||||
<maintainer>Derrick Moser</maintainer>
|
||||
<title>Diffuse User's Manual</title>
|
||||
<date>2024-01-13</date>
|
||||
<version identifier="0.9.0" date="2024-01-13"/>
|
||||
<date>2023-04-16</date>
|
||||
<version identifier="0.8.2" date="2023-04-16"/>
|
||||
<subject category="GNOME|Development|Applications"/>
|
||||
<description>Diffuse is a graphical tool for merging and comparing text files.</description>
|
||||
<type>manual</type>
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
<creator>Derrick Moser</creator>
|
||||
<maintainer>Derrick Moser</maintainer>
|
||||
<title>Uživatelská příručka programu Diffuse</title>
|
||||
<date>2024-01-13</date>
|
||||
<version identifier="0.9.0" date="2024-01-13"/>
|
||||
<date>2023-04-16</date>
|
||||
<version identifier="0.8.2" date="2023-04-16"/>
|
||||
<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>
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
<creator>Derrick Moser</creator>
|
||||
<maintainer>Derrick Moser</maintainer>
|
||||
<title>Manuale utente di Diffuse</title>
|
||||
<date>2024-01-13</date>
|
||||
<version identifier="0.9.0" date="2024-01-13"/>
|
||||
<date>2023-04-16</date>
|
||||
<version identifier="0.8.2" date="2023-04-16"/>
|
||||
<subject category="GNOME|Development|Applications"/>
|
||||
<description>Diffuse è uno strumento grafico per l'unione e il confronto di file di testo.</description>
|
||||
<type>manual</type>
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
<creator>Derrick Moser</creator>
|
||||
<maintainer>Derrick Moser</maintainer>
|
||||
<title>Руководство Пользователя Diffuse</title>
|
||||
<date>2024-01-13</date>
|
||||
<version identifier="0.9.0" date="2024-01-13"/>
|
||||
<date>2023-04-16</date>
|
||||
<version identifier="0.8.2" date="2023-04-16"/>
|
||||
<subject category="GNOME|Development|Applications"/>
|
||||
<description>Программа Diffuse является графическим инструментом для слияния и сравнения текстовых файлов.</description>
|
||||
<type>manual</type>
|
||||
|
|
|
|||
|
|
@ -17,6 +17,12 @@ 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).
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
project('diffuse',
|
||||
version: '0.9.0',
|
||||
version: '0.8.2',
|
||||
meson_version: '>= 0.55',
|
||||
license: 'GPL-2.0-or-later',
|
||||
default_options: [ 'warning_level=2' ])
|
||||
|
|
|
|||
84
po/it.po
84
po/it.po
|
|
@ -2,15 +2,14 @@
|
|||
# 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: 2024-01-14 22:18+0100\n"
|
||||
"Last-Translator: Albano Battistella <albanobattistella@gmail.com>\n"
|
||||
"PO-Revision-Date: 2022-04-04 12:18-0400\n"
|
||||
"Last-Translator: Cristian Marchi <cri.penta@gmail.com>\n"
|
||||
"Language-Team: Italian\n"
|
||||
"Language: it\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -35,17 +34,14 @@ 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 "Finestra principale"
|
||||
msgstr ""
|
||||
|
||||
#: data/io.github.mightycreak.Diffuse.appdata.xml.in:32
|
||||
msgid "About window"
|
||||
msgstr "Informazioni sulla finestra"
|
||||
msgstr ""
|
||||
|
||||
#: src/diffuse/constants.py:26
|
||||
msgid "Copyright"
|
||||
|
|
@ -55,7 +51,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 "_Annulla"
|
||||
msgstr ""
|
||||
|
||||
#: src/diffuse/dialogs.py:50
|
||||
msgid "Encoding: "
|
||||
|
|
@ -132,7 +128,7 @@ msgstr "Apre una nuova scheda"
|
|||
|
||||
#: src/diffuse/main.py:137 src/diffuse/preferences.py:159
|
||||
msgid "Version control system search order"
|
||||
msgstr "Ordine di ricerca del sistema di controllo della versione"
|
||||
msgstr ""
|
||||
|
||||
#: src/diffuse/main.py:145
|
||||
msgid "Start with line <line> selected"
|
||||
|
|
@ -170,10 +166,6 @@ 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
|
||||
|
|
@ -334,84 +326,88 @@ 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 "_Apri"
|
||||
msgstr ""
|
||||
|
||||
#: 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 "L'associazione della chiave \"{key}\" non è valida"
|
||||
msgstr ""
|
||||
|
||||
#: src/diffuse/resources.py:376
|
||||
msgid "Imports must have one argument"
|
||||
msgstr "Le importazioni devono avere un argomento"
|
||||
msgstr ""
|
||||
|
||||
#: src/diffuse/resources.py:392
|
||||
msgid "Key bindings must have three arguments"
|
||||
msgstr "Le associazioni di tasti devono avere tre argomenti"
|
||||
msgstr ""
|
||||
|
||||
#: src/diffuse/resources.py:398
|
||||
msgid "Colors must have four arguments"
|
||||
msgstr "I colori devono avere quattro argomenti"
|
||||
msgstr ""
|
||||
|
||||
#: src/diffuse/resources.py:404
|
||||
msgid "Floats must have two arguments"
|
||||
msgstr "I float devono avere due argomenti"
|
||||
msgstr ""
|
||||
|
||||
#: src/diffuse/resources.py:410
|
||||
msgid "Options must have two arguments"
|
||||
msgstr "Le opzioni devono avere due argomenti"
|
||||
msgstr ""
|
||||
|
||||
#: src/diffuse/resources.py:413
|
||||
#, python-brace-format
|
||||
msgid "Option \"{option}\" is unknown"
|
||||
msgstr "L'opzione \"{option}\" è sconosciuta"
|
||||
msgstr ""
|
||||
|
||||
#: src/diffuse/resources.py:420
|
||||
msgid "Strings must have two arguments"
|
||||
msgstr "Le stringhe devono avere due argomenti"
|
||||
msgstr ""
|
||||
|
||||
#: src/diffuse/resources.py:431
|
||||
msgid "Syntaxes must have two or three arguments"
|
||||
msgstr "Le sintassi devono avere due o tre argomenti"
|
||||
msgstr ""
|
||||
|
||||
#: src/diffuse/resources.py:459
|
||||
msgid "Syntax patterns must have at least four arguments"
|
||||
msgstr "I modelli di sintassi devono avere almeno quattro argomenti"
|
||||
msgstr ""
|
||||
|
||||
#: src/diffuse/resources.py:465 src/diffuse/resources.py:509
|
||||
#, python-brace-format
|
||||
msgid "Value \"{value}\" is unknown"
|
||||
msgstr "Il valore \"{value}\" è sconosciuto"
|
||||
msgstr ""
|
||||
|
||||
#: src/diffuse/resources.py:476
|
||||
msgid "Syntax files must have one or two arguments"
|
||||
msgstr "I file di sintassi devono avere uno o due argomenti"
|
||||
msgstr ""
|
||||
|
||||
#: src/diffuse/resources.py:494
|
||||
msgid "Syntax magics must have at least one argument"
|
||||
msgstr "Le magie della sintassi devono avere almeno un argomento"
|
||||
msgstr ""
|
||||
|
||||
#: src/diffuse/resources.py:513
|
||||
#, python-brace-format
|
||||
msgid "Keyword \"{keyword}\" is unknown"
|
||||
msgstr "La parola chiave \"{keyword}\" è sconosciuta"
|
||||
msgstr ""
|
||||
|
||||
#: src/diffuse/resources.py:515
|
||||
#, fuzzy, python-brace-format
|
||||
msgid "Syntax error at line {line} of {file}"
|
||||
msgstr "Errore di sintassi alla riga {line} di {file}"
|
||||
msgstr "Errore nell'elaborare la riga {line} di «{file}»."
|
||||
|
||||
#: src/diffuse/resources.py:521
|
||||
#, fuzzy, python-brace-format
|
||||
msgid "Value error at line {line} of {file}"
|
||||
msgstr "Errore di valore alla riga {line} di {file}"
|
||||
msgstr "Errore nell'elaborare la riga {line} di «{file}»."
|
||||
|
||||
#: src/diffuse/resources.py:527
|
||||
#, fuzzy, python-brace-format
|
||||
msgid "Regex error at line {line} of {file}."
|
||||
msgstr "Errore regex alla riga {line} di {file}."
|
||||
msgstr "Errore nell'elaborare la riga {line} di «{file}»."
|
||||
|
||||
#: src/diffuse/resources.py:530
|
||||
#, fuzzy, python-brace-format
|
||||
msgid "Unhandled error at line {line} of {file}."
|
||||
msgstr "Errore non gestito alla riga {line} di {file}."
|
||||
msgstr "Errore nell'elaborare la riga {line} di «{file}»."
|
||||
|
||||
#: src/diffuse/utils.py:66
|
||||
msgid "Auto Detect"
|
||||
|
|
@ -489,11 +485,11 @@ msgstr "Salvare i cambiamenti prima di caricare il nuovo file?"
|
|||
|
||||
#: src/diffuse/window.py:310
|
||||
msgid "_No"
|
||||
msgstr ":_No"
|
||||
msgstr ""
|
||||
|
||||
#: src/diffuse/window.py:311
|
||||
msgid "_Yes"
|
||||
msgstr "_Si"
|
||||
msgstr ""
|
||||
|
||||
#: src/diffuse/window.py:417
|
||||
#, python-format
|
||||
|
|
@ -510,8 +506,9 @@ 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"
|
||||
msgstr "_Salva file"
|
||||
|
||||
#: src/diffuse/window.py:527
|
||||
#, python-format
|
||||
|
|
@ -891,29 +888,24 @@ msgstr "Ripeti"
|
|||
|
||||
#: src/diffuse/window.py:950
|
||||
msgid "Changes detected"
|
||||
msgstr "Modifiche rilevate"
|
||||
msgstr ""
|
||||
|
||||
#: 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\" sul disco è stato modificato.\n"
|
||||
"\n"
|
||||
"Vuoi ricaricare il file?"
|
||||
msgstr "Il file «%s» è cambiato sul disco. Ricaricarlo?"
|
||||
|
||||
#: 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 ""
|
||||
"I seguenti file sono stati modificati sul disco:\n"
|
||||
"%s\n"
|
||||
"\n"
|
||||
"Vuoi ricaricare questi file?"
|
||||
msgstr "Il file «%s» è cambiato sul disco. Ricaricarlo?"
|
||||
|
||||
#: src/diffuse/window.py:1078
|
||||
msgid "Some files have unsaved changes. Select the files to save before closing."
|
||||
|
|
|
|||
145
po/tr.po
145
po/tr.po
|
|
@ -1,23 +1,23 @@
|
|||
# Turkish translation for io.github.mightycreak.Diffuse.
|
||||
# Copyright (C) 2022-2024 io.github.mightycreak.Diffuse's COPYRIGHT HOLDER
|
||||
# Copyright (C) 2022 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, 2024.
|
||||
# Sabri Ünal <libreajans@gmail.com>, 2022.
|
||||
#
|
||||
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: 2024-01-07 02:49+0300\n"
|
||||
"PO-Revision-Date: 2022-11-19 03:14+0300\n"
|
||||
"Last-Translator: Sabri Ünal <libreajans@gmail.com>\n"
|
||||
"Language-Team: Türkçe <takim@gnome.org.tr>\n"
|
||||
"Language-Team: Türkçe <gnome-turk@gnome.org>\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.4.2\n"
|
||||
"X-Generator: Poedit 3.1.1\n"
|
||||
|
||||
#: data/io.github.mightycreak.Diffuse.desktop.in:3
|
||||
#: data/io.github.mightycreak.Diffuse.appdata.xml.in:4
|
||||
|
|
@ -30,22 +30,23 @@ 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 dosya alabilir."
|
||||
"araçtır. Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, ve Subversion "
|
||||
"depolarından karşılaştırma için dosyaları alabilir."
|
||||
|
||||
#: data/io.github.mightycreak.Diffuse.appdata.xml.in:28
|
||||
msgid "Main window"
|
||||
msgstr "Ana pencere"
|
||||
msgstr ""
|
||||
|
||||
#: data/io.github.mightycreak.Diffuse.appdata.xml.in:32
|
||||
msgid "About window"
|
||||
msgstr "Pencere hakkında"
|
||||
msgstr ""
|
||||
|
||||
#: src/diffuse/constants.py:26
|
||||
msgid "Copyright"
|
||||
|
|
@ -55,7 +56,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 "İ_ptal"
|
||||
msgstr ""
|
||||
|
||||
#: src/diffuse/dialogs.py:50
|
||||
msgid "Encoding: "
|
||||
|
|
@ -68,7 +69,7 @@ msgstr "Düzeltme: "
|
|||
#: src/diffuse/dialogs.py:90 src/diffuse/dialogs.py:134
|
||||
#: src/diffuse/preferences.py:255
|
||||
msgid "_OK"
|
||||
msgstr "_Tamam"
|
||||
msgstr ""
|
||||
|
||||
#: src/diffuse/dialogs.py:130
|
||||
msgid "Find..."
|
||||
|
|
@ -103,8 +104,9 @@ 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 olmayan tüm sekmeleri kapat"
|
||||
msgstr "Fark yoksa sekmeleri kapat"
|
||||
|
||||
#: src/diffuse/main.py:92
|
||||
msgid "Use <codec> to read and write files"
|
||||
|
|
@ -170,11 +172,6 @@ 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
|
||||
|
|
@ -335,7 +332,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 "_Aç"
|
||||
msgstr ""
|
||||
|
||||
#: src/diffuse/resources.py:242 src/diffuse/resources.py:246
|
||||
#: src/diffuse/resources.py:249
|
||||
|
|
@ -494,11 +491,11 @@ msgstr "Yeni dosya yüklenmeden önce değişiklikler kaydedilsin mi?"
|
|||
|
||||
#: src/diffuse/window.py:310
|
||||
msgid "_No"
|
||||
msgstr "_Hayır"
|
||||
msgstr ""
|
||||
|
||||
#: src/diffuse/window.py:311
|
||||
msgid "_Yes"
|
||||
msgstr "_Evet"
|
||||
msgstr ""
|
||||
|
||||
#: src/diffuse/window.py:417
|
||||
#, python-format
|
||||
|
|
@ -515,8 +512,9 @@ 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 "_Kaydet"
|
||||
msgstr "Dosyayı _Kaydet"
|
||||
|
||||
#: src/diffuse/window.py:527
|
||||
#, python-format
|
||||
|
|
@ -896,32 +894,24 @@ msgstr "Yinele"
|
|||
|
||||
#: src/diffuse/window.py:950
|
||||
msgid "Changes detected"
|
||||
msgstr "Değişiklikler algılandı"
|
||||
msgstr ""
|
||||
|
||||
#: src/diffuse/window.py:954
|
||||
#, python-format
|
||||
#, fuzzy, 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. \n"
|
||||
"\n"
|
||||
"Dosyayı yeniden yüklemek ister misiniz?"
|
||||
msgstr "%s dosyası diskte değişti. Dosyayı yeniden yüklemek ister misiniz?"
|
||||
|
||||
#: src/diffuse/window.py:959
|
||||
#, python-format
|
||||
#, fuzzy, python-format
|
||||
msgid ""
|
||||
"The following files changed on disk:\n"
|
||||
"%s\n"
|
||||
"\n"
|
||||
"Do you want to reload these files?"
|
||||
msgstr ""
|
||||
"Aşağıdaki dosyalar diskte değişti. \n"
|
||||
"\n"
|
||||
"%s\n"
|
||||
"\n"
|
||||
"Bu dosyaları yeniden yüklemek ister misiniz?"
|
||||
msgstr "%s dosyası diskte değişti. Dosyayı yeniden yüklemek ister misiniz?"
|
||||
|
||||
#: src/diffuse/window.py:1078
|
||||
msgid "Some files have unsaved changes. Select the files to save before closing."
|
||||
|
|
@ -1006,3 +996,90 @@ 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"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!DOCTYPE xsl:stylesheet [
|
||||
<!ENTITY app "Diffuse">
|
||||
<!ENTITY app-version "0.9.0">
|
||||
<!ENTITY app-version "0.8.2">
|
||||
<!ENTITY app-cmd "diffuse">
|
||||
<!ENTITY date "2024-01-13">
|
||||
<!ENTITY date "2023-04-16">
|
||||
]>
|
||||
<!--
|
||||
template for translating Diffuse's help documentation to a manual page
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ import platform
|
|||
import subprocess
|
||||
import sys
|
||||
|
||||
VERSION = '0.9.0'
|
||||
VERSION = '0.8.2'
|
||||
PACKAGE = '1'
|
||||
PLATFORM = 'win' + ''.join([c for c in platform.architecture()[0] if c.isdigit()])
|
||||
INSTALLER = 'diffuse-%s-%s.%s' % (VERSION, PACKAGE, PLATFORM)
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
[Setup]
|
||||
AppId=Diffuse
|
||||
AppName={cm:ToolName}
|
||||
AppVerName=Diffuse 0.9.0
|
||||
AppVerName=Diffuse 0.8.2
|
||||
DefaultDirName={pf}\Diffuse
|
||||
DefaultGroupName=Diffuse
|
||||
UninstallDisplayIcon={app}\diffusew.exe
|
||||
|
|
|
|||
Loading…
Reference in New Issue