Merge branch 'master' of https://github.com/git-cola/git-cola into work_on_german_translation

This commit is contained in:
Joachim Lusiardi
2019-03-07 07:36:30 +01:00
23 changed files with 2177 additions and 246 deletions
+4
View File
@@ -165,6 +165,10 @@ use to translate `git-cola`.
Untranslatted strings are denoted by an empty "" string.
The `.mo` files have to be regenerated after each change by running:
make mo
Alternate translations can be tested by setting `$LANG` when running, e.g.
env LANG=zh_TW ./bin/git-cola
+3
View File
@@ -239,6 +239,9 @@ class ColaQApplication(QtWidgets.QApplication):
def __init__(self, context, argv):
super(ColaQApplication, self).__init__(argv)
self.context = context
# Make icons sharp in HiDPI screen
if hasattr(Qt, 'AA_UseHighDpiPixmaps'):
self.setAttribute(Qt.AA_UseHighDpiPixmaps, True)
def event(self, e):
"""Respond to focus events for the cola.refreshonfocus feature"""
+14 -7
View File
@@ -39,6 +39,7 @@ class GravatarLabel(QtWidgets.QLabel):
self.timeout = 0
self.imgsize = defs.medium_icon
self.pixmaps = {}
self._default_pixmap_bytes = None
self.network = QtNetwork.QNetworkAccessManager()
self.network.finished.connect(self.network_finished)
@@ -62,13 +63,17 @@ class GravatarLabel(QtWidgets.QLabel):
self.network.get(QtNetwork.QNetworkRequest(QtCore.QUrl(url)))
def default_pixmap_as_bytes(self):
xres = self.imgsize
pixmap = icons.cola().pixmap(xres)
byte_array = QtCore.QByteArray()
buf = QtCore.QBuffer(byte_array)
buf.open(QtCore.QIODevice.WriteOnly)
pixmap.save(buf, 'PNG')
buf.close()
if self._default_pixmap_bytes is None:
xres = self.imgsize
pixmap = icons.cola().pixmap(xres)
byte_array = QtCore.QByteArray()
buf = QtCore.QBuffer(byte_array)
buf.open(QtCore.QIODevice.WriteOnly)
pixmap.save(buf, 'PNG')
buf.close()
self._default_pixmap_bytes = byte_array
else:
byte_array = self._default_pixmap_bytes
return byte_array
def network_finished(self, reply):
@@ -106,6 +111,8 @@ class GravatarLabel(QtWidgets.QLabel):
self.pixmaps[email] = pixmap
def set_pixmap_from_response(self):
if self.response is None:
self.response = self._default_pixmap_bytes()
pixmap = QtGui.QPixmap()
pixmap.loadFromData(self.response)
self.setPixmap(pixmap)
+33 -20
View File
@@ -189,12 +189,9 @@ class SettingsFormWidget(FormWidget):
self.linebreak = qtutils.checkbox()
self.keep_merge_backups = qtutils.checkbox()
self.sort_bookmarks = qtutils.checkbox()
self.bold_headers = qtutils.checkbox()
self.save_window_settings = qtutils.checkbox()
self.check_spelling = qtutils.checkbox()
self.expandtab = qtutils.checkbox()
self.status_indent = qtutils.checkbox()
self.status_show_totals = qtutils.checkbox()
self.add_row(N_('Fixed-Width Font'), self.fixed_font)
self.add_row(N_('Font Size'), self.font_size)
@@ -208,14 +205,8 @@ class SettingsFormWidget(FormWidget):
self.add_row(N_('Insert spaces instead of tabs'), self.expandtab)
self.add_row(N_('Sort bookmarks alphabetically'), self.sort_bookmarks)
self.add_row(N_('Keep *.orig Merge Backups'), self.keep_merge_backups)
self.add_row(N_('Bold on dark headers instead of italic '
'(restart required)'), self.bold_headers)
self.add_row(N_('Save GUI Settings'), self.save_window_settings)
self.add_row(N_('Check spelling'), self.check_spelling)
self.add_row(N_('Indent Status paths '
'(restart required)'), self.status_indent)
self.add_row(N_('Show file counts in Status titles '
'(restart required)'), self.status_show_totals)
self.set_config({
prefs.SAVEWINDOWSETTINGS:
@@ -227,7 +218,6 @@ class SettingsFormWidget(FormWidget):
prefs.MAXRECENT: (self.maxrecent, Defaults.maxrecent),
prefs.SORT_BOOKMARKS:
(self.sort_bookmarks, Defaults.sort_bookmarks),
prefs.BOLD_HEADERS: (self.bold_headers, Defaults.bold_headers),
prefs.DIFFTOOL: (self.difftool, Defaults.difftool),
prefs.EDITOR:
(self.editor, os.getenv('VISUAL', Defaults.editor)),
@@ -238,9 +228,6 @@ class SettingsFormWidget(FormWidget):
(self.keep_merge_backups, Defaults.merge_keep_backup),
prefs.MERGETOOL: (self.mergetool, Defaults.mergetool),
prefs.SPELL_CHECK: (self.check_spelling, Defaults.spellcheck),
prefs.STATUS_INDENT: (self.status_indent, Defaults.status_indent),
prefs.STATUS_SHOW_TOTALS:
(self.status_show_totals, Defaults.status_show_totals)
})
self.fixed_font.currentFontChanged.connect(self.current_font_changed)
@@ -278,21 +265,46 @@ class AppearanceFormWidget(FormWidget):
self.theme = qtutils.combo_mapped(themes.themes_map())
self.high_dpi = qtutils.combo_mapped(hidpi.choices_map())
self.high_dpi.setEnabled(hidpi.is_supported())
self.bold_headers = qtutils.checkbox()
self.status_show_totals = qtutils.checkbox()
self.status_indent = qtutils.checkbox()
label = QtWidgets.QLabel(
'<b>'
+ N_('Appearance settings require an application restart')
+ '</b>')
self.add_row('<br/><br/>', label)
self.add_row(N_('GUI theme'), self.theme)
self.add_row(N_('High DPI'), self.high_dpi)
self.add_row(N_('Bold on dark headers instead of italic'),
self.bold_headers)
self.add_row(N_('Show file counts in Status titles'),
self.status_show_totals)
self.add_row(N_('Indent Status paths'), self.status_indent)
self.set_config({
prefs.BOLD_HEADERS: (self.bold_headers, Defaults.bold_headers),
prefs.HIDPI: (self.high_dpi, Defaults.hidpi),
prefs.STATUS_SHOW_TOTALS:
(self.status_show_totals, Defaults.status_show_totals),
prefs.STATUS_INDENT: (self.status_indent, Defaults.status_indent),
prefs.THEME: (self.theme, Defaults.theme),
prefs.HIDPI: (self.high_dpi, Defaults.hidpi)
})
class AppearanceWidget(QtWidgets.QWidget):
def __init__(self, form, parent):
QtWidgets.QWidget.__init__(self, parent)
self.form = form
self.label = QtWidgets.QLabel(
'<center><b>'
+ N_('Appearance settings require an application restart')
+ '</b></center>')
layout = qtutils.vbox(defs.margin, defs.spacing,
self.form, defs.spacing * 4, self.label,
qtutils.STRETCH)
self.setLayout(layout)
def update_from_config(self):
self.form.update_from_config()
class PreferencesView(standard.Dialog):
def __init__(self, context, model, parent=None):
@@ -314,7 +326,8 @@ class PreferencesView(standard.Dialog):
self.user_form = RepoFormWidget(context, model, self, source='user')
self.repo_form = RepoFormWidget(context, model, self, source='repo')
self.options_form = SettingsFormWidget(context, model, self)
self.appearance = AppearanceFormWidget(context, model, self)
self.appearance_form = AppearanceFormWidget(context, model, self)
self.appearance = AppearanceWidget(self.appearance_form, self)
self.stack_widget = QtWidgets.QStackedWidget()
self.stack_widget.addWidget(self.user_form)
+125 -9
View File
@@ -450,6 +450,12 @@ msgstr "Stáří"
msgid "All Repositories"
msgstr "Všechny repozitáře"
#, python-format
msgid ""
"All submodules will be updated using\n"
"\"%s\""
msgstr ""
msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care"
msgstr "Povolit aktualizace Ne rychle vpřed. Použití „vynutit“ může způsobit, že vzdálený repositář ztratí zápisy; používejte obezřetně"
@@ -485,6 +491,12 @@ msgstr ""
"Místo toho bude vytvořena nepodepsaná prostá značka.\n"
"Vytvořit nepodepsanou značku?"
msgid "Appearance"
msgstr ""
msgid "Appearance settings require an application restart"
msgstr ""
msgid "Apply"
msgstr "Aplikovat"
@@ -512,6 +524,9 @@ msgstr "Autor"
msgid "Authors"
msgstr "Autoři"
msgid "Auto"
msgstr ""
msgid "Auto-Wrap Lines"
msgstr "Automaticky zalamovat řádky"
@@ -524,8 +539,8 @@ msgstr ""
msgid "Blame..."
msgstr "Blame…"
msgid "Bold on dark headers instead of italic (restart required)"
msgstr "Hlavičky tučným písmem na tmavém pozadí místo kurzívy (vyžaduje restart)"
msgid "Bold on dark headers instead of italic"
msgstr "Hlavičky tučným písmem na tmavém pozadí místo kurzívy"
msgid "Branch"
msgstr "Větev"
@@ -816,6 +831,9 @@ msgstr "DAG…"
msgid "Date, Time"
msgstr "Datum, čas"
msgid "Default"
msgstr ""
msgid "Delete"
msgstr "Odstranit"
@@ -1021,6 +1039,14 @@ msgstr "Chyba při přejmenovávání „%(name)s“ na „%(new_name)s“"
msgid "Error running prepare-commitmsg hook"
msgstr "Chyba spouštění háčku prepare-commitmsg"
#, fuzzy, python-format
msgid "Error updating submodule %s"
msgstr "Chyba při vytváření vzdálené \"%s\""
#, fuzzy
msgid "Error updating submodules"
msgstr "Chyba při úpravě souboru"
msgid "Error: Cannot find commit template"
msgstr "Chyba: nedaří se nalézt šablonu nahrání"
@@ -1139,6 +1165,30 @@ msgstr "Opravit"
msgid "Fixup Previous Commit"
msgstr "Opravit předchozí zápis"
msgid "Flat dark blue"
msgstr ""
msgid "Flat dark green"
msgstr ""
msgid "Flat dark grey"
msgstr ""
msgid "Flat dark red"
msgstr ""
msgid "Flat light blue"
msgstr ""
msgid "Flat light green"
msgstr ""
msgid "Flat light grey"
msgstr ""
msgid "Flat light red"
msgstr ""
msgid "Font Size"
msgstr "Velikost písma"
@@ -1174,6 +1224,9 @@ msgstr "Francouzský překlad"
msgid "GPG-sign the merge commit"
msgstr "GPG podepsaný zápis sloučení"
msgid "GUI theme"
msgstr ""
#, python-format
msgid "Gathering info for \"%s\"..."
msgstr "Shromažďování informací pro „%s“…"
@@ -1217,6 +1270,9 @@ msgstr "Nápověda git-xbase"
msgid "Hide Details.."
msgstr "Skrýt podrobnosti…"
msgid "High DPI"
msgstr ""
msgid "History Browser"
msgstr "Prohlížeč historie"
@@ -1244,6 +1300,9 @@ msgstr "Ignorovat název souboru nebo šablonu"
msgid "Include tags "
msgstr "Zahrnout značky "
msgid "Indent Status paths"
msgstr ""
msgid "Indonesian translation"
msgstr "Indonéský překlad"
@@ -1464,6 +1523,10 @@ msgstr "Otevřít"
msgid "Open Git Repository..."
msgstr "Otevřít Git repozitář…"
#, fuzzy
msgid "Open Parent"
msgstr "Otevřít nedávné"
msgid "Open Parent Directory"
msgstr "Otevřít nadřazenou složku"
@@ -1495,10 +1558,6 @@ msgstr "Přepsat „%s“?"
msgid "Overwrite File?"
msgstr "Přepsat soubor?"
#, python-format
msgid "PATCH %(current)d/%(count)d"
msgstr "PATCH %(current)d/%(count)d"
msgid ""
"Parse arguments using a shell.\n"
"Queries with spaces will require \"double quotes\"."
@@ -1972,6 +2031,11 @@ msgstr "Nastavit výchozí repozitář"
msgid "Set Upstream Branch"
msgstr "Nastavit upstream větev"
msgid ""
"Set the sort order for branches and tags.\n"
"Toggle between date-based and version-name-based sorting."
msgstr ""
msgid "Set upstream"
msgstr "Nastavit upstream"
@@ -2005,6 +2069,9 @@ msgstr "Zobrazit nápovědu"
msgid "Show History"
msgstr "Zobrazit historii"
msgid "Show file counts in Status titles"
msgstr ""
msgid ""
"Show help\n"
"Shortcut: ?"
@@ -2148,15 +2215,15 @@ msgstr "Stav"
msgid "Stop tracking paths"
msgstr "Zastavit sledující umístění"
msgid "Submodules"
msgstr ""
msgid "Summarize Merge Commits"
msgstr "Shrnout nahrání sloučení"
msgid "Summary"
msgstr "Shrnutí"
msgid "Summary:"
msgstr "Shrnutí:"
msgid "Tab Width"
msgstr "Šířka tabelátoru"
@@ -2210,6 +2277,12 @@ msgstr "Následující soubory budou smazány:"
msgid "The revision expression cannot be empty."
msgstr "Výraz revize nemůže zůstat nevyplněný."
#, python-format
msgid ""
"The submodule will be updated using\n"
"\"%s\""
msgstr ""
#, python-format
msgid "The worktree will be reset using \"git reset --keep %s\""
msgstr "Větev bude resetována za použití \"git reset --keep %s\""
@@ -2337,9 +2410,37 @@ msgstr "Nesledováno"
msgid "Untracking: %s"
msgstr "Přestává se sledovat: %s"
msgid "Update All Submodules..."
msgstr ""
msgid "Update Existing Branch:"
msgstr "Aktualizovat stávající větev:"
msgid "Update Submodule"
msgstr ""
msgid "Update Submodule..."
msgstr ""
#, fuzzy
msgid "Update Submodules"
msgstr "Inicializovat dílčí moduly"
#, fuzzy
msgid "Update all submodules?"
msgstr "Inicializovat dílčí moduly"
#, fuzzy
msgid "Update submodules..."
msgstr "Inicializovat dílčí moduly"
#, fuzzy
msgid "Update this submodule"
msgstr "Inicializovat dílčí moduly"
msgid "Update this submodule?"
msgstr ""
msgid "Updating"
msgstr "Aktualizuje se"
@@ -2440,11 +2541,26 @@ msgstr "neznámé"
msgid "vX.Y.Z"
msgstr "vX.Y.Z"
msgid "x 1"
msgstr ""
msgid "x 1.5"
msgstr ""
msgid "x 2"
msgstr ""
msgid "yyyy-MM-dd"
msgstr "rrrr-mm-dd"
#~ msgid "PATCH %(current)d/%(count)d"
#~ msgstr "PATCH %(current)d/%(count)d"
#~ msgid "Rename remote?"
#~ msgstr "Přejmenovat vzdálenou?"
#~ msgid "Select File"
#~ msgstr "Vybrat soubor"
#~ msgid "Summary:"
#~ msgstr "Shrnutí:"
+124 -2
View File
@@ -507,6 +507,12 @@ msgstr "Alter"
msgid "All Repositories"
msgstr "Alle Repositories"
#, python-format
msgid ""
"All submodules will be updated using\n"
"\"%s\""
msgstr ""
msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care"
msgstr "Aktualisierungen ohne schnelles Vorspulen erlauben. Die Nutzung von \"force\" kann dazu führen, dass im externen Repository Commits verloren gehen; seien Sie vorsichtig"
@@ -542,6 +548,12 @@ msgstr ""
"Stattdessen wird ein einfacher, unsignierter Tag erstellt.\n"
"Unsignierten Tag erstellen?"
msgid "Appearance"
msgstr ""
msgid "Appearance settings require an application restart"
msgstr ""
msgid "Apply"
msgstr "Anwenden"
@@ -569,6 +581,9 @@ msgstr "Autor"
msgid "Authors"
msgstr "Autoren"
msgid "Auto"
msgstr ""
msgid "Auto-Wrap Lines"
msgstr "Zeilen automatisch umbrechen"
@@ -581,8 +596,8 @@ msgstr "Verantwortlichkeitsbetrachter"
msgid "Blame..."
msgstr "Verantwortlichkeit..."
msgid "Bold on dark headers instead of italic (restart required)"
msgstr "Fettschrift mit dunklem Hintergrund verwenden anstelle von schräg geschriebenen Überschriften (Neustart erforderlich)"
msgid "Bold on dark headers instead of italic"
msgstr "Fettschrift mit dunklem Hintergrund verwenden anstelle von schräg geschriebenen Überschriften"
msgid "Branch"
msgstr "Branch"
@@ -873,6 +888,10 @@ msgstr "DAG..."
msgid "Date, Time"
msgstr "Datum und Zeit"
#, fuzzy
msgid "Default"
msgstr "Voreinstellungen wiederherstellen"
msgid "Delete"
msgstr "Löschen"
@@ -1078,6 +1097,14 @@ msgstr "Fehler beim Umbenennen von \"%(name)s\" in \"%(new_name)s\""
msgid "Error running prepare-commitmsg hook"
msgstr "Fehler beim Aufrufen der Vor-Eintragen-Kontrolle"
#, fuzzy, python-format
msgid "Error updating submodule %s"
msgstr "Fehler beim erstellen der externen Referenz \"%s\""
#, fuzzy
msgid "Error updating submodules"
msgstr "Fehler beim Bearbeiten der Datei"
msgid "Error: Cannot find commit template"
msgstr "Fehler: Commit-Vorlage nicht gefunden"
@@ -1200,6 +1227,30 @@ msgstr "Nachbessern (fixup)"
msgid "Fixup Previous Commit"
msgstr "Vorherigen Commit nachbessern (fixup)"
msgid "Flat dark blue"
msgstr ""
msgid "Flat dark green"
msgstr ""
msgid "Flat dark grey"
msgstr ""
msgid "Flat dark red"
msgstr ""
msgid "Flat light blue"
msgstr ""
msgid "Flat light green"
msgstr ""
msgid "Flat light grey"
msgstr ""
msgid "Flat light red"
msgstr ""
msgid "Font Size"
msgstr "Schriftgröße"
@@ -1235,6 +1286,9 @@ msgstr "Französische Übersetzung"
msgid "GPG-sign the merge commit"
msgstr "GPG-signierter Merge-Commit"
msgid "GUI theme"
msgstr ""
#, python-format
msgid "Gathering info for \"%s\"..."
msgstr "Frage Informationen zu »%s« ab..."
@@ -1278,6 +1332,9 @@ msgstr "Hilfe - git-xbase"
msgid "Hide Details.."
msgstr ""
msgid "High DPI"
msgstr ""
msgid "History Browser"
msgstr "Werkzeug für die Verlaufsansicht"
@@ -1305,6 +1362,9 @@ msgstr "Dateiname oder Muster ignorieren"
msgid "Include tags "
msgstr "Übernehmen der Tags "
msgid "Indent Status paths"
msgstr ""
msgid "Indonesian translation"
msgstr "Indonesische Übersetzung"
@@ -1523,6 +1583,10 @@ msgstr "Öffnen"
msgid "Open Git Repository..."
msgstr "Git-Repository öffnen..."
#, fuzzy
msgid "Open Parent"
msgstr "Zuletzt verwendet"
msgid "Open Parent Directory"
msgstr "Übergeordnetes Verzeichnis öffnen"
@@ -2040,6 +2104,11 @@ msgstr "Standard-Repository auswählen"
msgid "Set Upstream Branch"
msgstr "Upstream-Branch setzen"
msgid ""
"Set the sort order for branches and tags.\n"
"Toggle between date-based and version-name-based sorting."
msgstr ""
msgid "Set upstream"
msgstr "Neuen Upstream setzen"
@@ -2074,6 +2143,9 @@ msgstr "Hilfe anzeigen"
msgid "Show History"
msgstr "Verlauf anzeigen"
msgid "Show file counts in Status titles"
msgstr ""
msgid ""
"Show help\n"
"Shortcut: ?"
@@ -2217,6 +2289,9 @@ msgstr "Zustand"
msgid "Stop tracking paths"
msgstr "Versionskontrolle für den ausgewählten Pfad beenden"
msgid "Submodules"
msgstr ""
msgid "Summarize Merge Commits"
msgstr "Zusammenfassung beim Zusammenführen anzeigen"
@@ -2277,6 +2352,12 @@ msgid "The revision expression cannot be empty."
msgstr "Der Ausdruck darf nicht leer sein."
#, python-format
msgid ""
"The submodule will be updated using\n"
"\"%s\""
msgstr ""
#, fuzzy, python-format
msgid "The worktree will be reset using \"git reset --keep %s\""
msgstr "Der Arbeitsbaum wird zurückgesetzt mit \"git reset --keep %s\""
@@ -2408,9 +2489,38 @@ msgstr "Nicht unter Versionskontrolle"
msgid "Untracking: %s"
msgstr "Nicht mehr verfolgen: %s"
msgid "Update All Submodules..."
msgstr ""
msgid "Update Existing Branch:"
msgstr "Existierenden Branch aktualisieren:"
#, fuzzy
msgid "Update Submodule"
msgstr "Aktualisiert"
msgid "Update Submodule..."
msgstr ""
#, fuzzy
msgid "Update Submodules"
msgstr "Submodule initialisieren"
#, fuzzy
msgid "Update all submodules?"
msgstr "Submodule initialisieren"
#, fuzzy
msgid "Update submodules..."
msgstr "Submodule initialisieren"
#, fuzzy
msgid "Update this submodule"
msgstr "Submodule initialisieren"
msgid "Update this submodule?"
msgstr ""
msgid "Updating"
msgstr "Aktualisierung"
@@ -2509,6 +2619,15 @@ msgstr "unbekannt"
msgid "vX.Y.Z"
msgstr "vX.Y.Z"
msgid "x 1"
msgstr ""
msgid "x 1.5"
msgstr ""
msgid "x 2"
msgstr ""
msgid "yyyy-MM-dd"
msgstr "dd.MM.yyyy"
@@ -3321,6 +3440,9 @@ msgstr "dd.MM.yyyy"
#~ msgid "Successfully saved bookmarks"
#~ msgstr "Die Favoriten wurden erfolgreich gesichert."
#~ msgid "Summary:"
#~ msgstr "Zusammenfassung:"
#~ msgid "The 'master' branch has not been initialized."
#~ msgstr "Der »master«-Zweig wurde noch nicht initialisiert."
+125 -9
View File
@@ -503,6 +503,12 @@ msgstr "Edad"
msgid "All Repositories"
msgstr "Todos los repositorios"
#, python-format
msgid ""
"All submodules will be updated using\n"
"\"%s\""
msgstr ""
msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care"
msgstr "Permitir actualizaciones \"non-fast-forward\". Utilizar \"force\" puede causar que el repositorio remoto pierda los commits, utilizar con cuidado"
@@ -538,6 +544,12 @@ msgstr ""
"Una etiqueta sin firmar, de poca entidad será creada.\n"
"¿Crear una etiqueta sin firmar?"
msgid "Appearance"
msgstr ""
msgid "Appearance settings require an application restart"
msgstr ""
msgid "Apply"
msgstr "Aplicar"
@@ -565,6 +577,9 @@ msgstr "Autor"
msgid "Authors"
msgstr "Autores"
msgid "Auto"
msgstr ""
msgid "Auto-Wrap Lines"
msgstr "Salto de línea automático"
@@ -578,8 +593,8 @@ msgstr ""
msgid "Blame..."
msgstr "Cerrar..."
msgid "Bold on dark headers instead of italic (restart required)"
msgstr "Fuente en negrita con fondo negro en vez de cabeceras en cursiva (se necesita reiniciar)"
msgid "Bold on dark headers instead of italic"
msgstr "Fuente en negrita con fondo negro en vez de cabeceras en cursiva"
msgid "Branch"
msgstr "Rama"
@@ -870,6 +885,9 @@ msgstr "DAG..."
msgid "Date, Time"
msgstr "Fecha, hora"
msgid "Default"
msgstr ""
msgid "Delete"
msgstr "Eliminar"
@@ -1076,6 +1094,14 @@ msgstr "Error al renombrar \"%(name)s\" a \"%(new_name)s\""
msgid "Error running prepare-commitmsg hook"
msgstr ""
#, fuzzy, python-format
msgid "Error updating submodule %s"
msgstr "Error al crear el repositorio remoto \"%s\""
#, fuzzy
msgid "Error updating submodules"
msgstr "Error al editar el archivo"
msgid "Error: Cannot find commit template"
msgstr "Error: No se pudo encontrar la plantilla para el commit"
@@ -1197,6 +1223,30 @@ msgstr "Arreglar"
msgid "Fixup Previous Commit"
msgstr "Arreglar un Commit previo"
msgid "Flat dark blue"
msgstr ""
msgid "Flat dark green"
msgstr ""
msgid "Flat dark grey"
msgstr ""
msgid "Flat dark red"
msgstr ""
msgid "Flat light blue"
msgstr ""
msgid "Flat light green"
msgstr ""
msgid "Flat light grey"
msgstr ""
msgid "Flat light red"
msgstr ""
msgid "Font Size"
msgstr "Tamaño de fuente"
@@ -1232,6 +1282,9 @@ msgstr "Traducción al Francés"
msgid "GPG-sign the merge commit"
msgstr "Firmar mediante GPG el Merge Commit"
msgid "GUI theme"
msgstr ""
#, python-format
msgid "Gathering info for \"%s\"..."
msgstr "Runiendo información para \"%s\"..."
@@ -1275,6 +1328,9 @@ msgstr "Ayuda - git-xbase"
msgid "Hide Details.."
msgstr "Ocultar detalles..."
msgid "High DPI"
msgstr ""
msgid "History Browser"
msgstr "Navegador de historial"
@@ -1302,6 +1358,9 @@ msgstr "Ignorar nombre de archivo o patrón"
msgid "Include tags "
msgstr "Incluir etiquetas "
msgid "Indent Status paths"
msgstr ""
msgid "Indonesian translation"
msgstr "Traducción al Indonesio"
@@ -1522,6 +1581,10 @@ msgstr "Abrir"
msgid "Open Git Repository..."
msgstr "Abrir Repositorio Git..."
#, fuzzy
msgid "Open Parent"
msgstr "Abrir recientes"
msgid "Open Parent Directory"
msgstr "Abrir carpeta padre"
@@ -1553,10 +1616,6 @@ msgstr "¿Desea sobrescribir \"%s\"?"
msgid "Overwrite File?"
msgstr "¿Desea sobrescribir el archivo?"
#, python-format
msgid "PATCH %(current)d/%(count)d"
msgstr "PATCH %(current)d/%(count)d"
msgid ""
"Parse arguments using a shell.\n"
"Queries with spaces will require \"double quotes\"."
@@ -2037,6 +2096,11 @@ msgstr "Establecer el repositorio como predeterminado"
msgid "Set Upstream Branch"
msgstr "Establecer rama aguas arriba (upstream)"
msgid ""
"Set the sort order for branches and tags.\n"
"Toggle between date-based and version-name-based sorting."
msgstr ""
msgid "Set upstream"
msgstr "Establecer aguas arriba (upstream)"
@@ -2070,6 +2134,9 @@ msgstr "Mostrar ayuda"
msgid "Show History"
msgstr "Mostrar historial"
msgid "Show file counts in Status titles"
msgstr ""
msgid ""
"Show help\n"
"Shortcut: ?"
@@ -2213,15 +2280,15 @@ msgstr "Estado"
msgid "Stop tracking paths"
msgstr "Dejar de seguir las rutas"
msgid "Submodules"
msgstr ""
msgid "Summarize Merge Commits"
msgstr "Sumario de Merge Commits"
msgid "Summary"
msgstr "Resumen"
msgid "Summary:"
msgstr "Resumen:"
msgid "Tab Width"
msgstr "Ancho de tabulación"
@@ -2275,6 +2342,12 @@ msgstr "Los siguientes archivos serán eliminados:"
msgid "The revision expression cannot be empty."
msgstr "La expresión de revisión no puede estar vacía."
#, python-format
msgid ""
"The submodule will be updated using\n"
"\"%s\""
msgstr ""
#, python-format
msgid "The worktree will be reset using \"git reset --keep %s\""
msgstr "El árbol de trabajo será reiniciado utilizando \"git reset --keep %s\""
@@ -2407,9 +2480,37 @@ msgstr ""
msgid "Untracking: %s"
msgstr ""
msgid "Update All Submodules..."
msgstr ""
msgid "Update Existing Branch:"
msgstr "Actualizar rama existente:"
msgid "Update Submodule"
msgstr ""
msgid "Update Submodule..."
msgstr ""
#, fuzzy
msgid "Update Submodules"
msgstr "Inicializar submódulos"
#, fuzzy
msgid "Update all submodules?"
msgstr "Inicializar submódulos"
#, fuzzy
msgid "Update submodules..."
msgstr "Inicializar submódulos"
#, fuzzy
msgid "Update this submodule"
msgstr "Inicializar submódulos"
msgid "Update this submodule?"
msgstr ""
msgid "Updating"
msgstr "Actualizando"
@@ -2510,6 +2611,15 @@ msgstr "desconocido"
msgid "vX.Y.Z"
msgstr "vX.Y.Z"
msgid "x 1"
msgstr ""
msgid "x 1.5"
msgstr ""
msgid "x 2"
msgstr ""
msgid "yyyy-MM-dd"
msgstr "aaaa-MM-dd"
@@ -2547,6 +2657,9 @@ msgstr "aaaa-MM-dd"
#~ msgid "Output: %s"
#~ msgstr "Resultado: %s"
#~ msgid "PATCH %(current)d/%(count)d"
#~ msgstr "PATCH %(current)d/%(count)d"
#, fuzzy
#~ msgid "Remote Branches"
#~ msgstr "Rama Remota"
@@ -2560,6 +2673,9 @@ msgstr "aaaa-MM-dd"
#~ msgid "Select file from \"%s\""
#~ msgstr "Seleccionar archivo de \"%s\""
#~ msgid "Summary:"
#~ msgstr "Resumen:"
#~ msgid ""
#~ "This PyQt4 does not include QtWebKit.\n"
#~ "The keyboard shortcuts feature is unavailable."
+123 -15
View File
@@ -439,6 +439,12 @@ msgstr "Age"
msgid "All Repositories"
msgstr "Tous les dépôts"
#, python-format
msgid ""
"All submodules will be updated using\n"
"\"%s\""
msgstr ""
msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care"
msgstr "Autoriser les mises à jour non rapides. Utiliser « force » peut provoquer des pertes de commit au niveau du dépôt distant : utilisez le avec précaution"
@@ -474,6 +480,12 @@ msgstr ""
"Un marqueur non signé et léger sera créé à la place.\n"
"Créer un tag non signé ?"
msgid "Appearance"
msgstr ""
msgid "Appearance settings require an application restart"
msgstr ""
msgid "Apply"
msgstr "Appliquer"
@@ -502,6 +514,9 @@ msgstr "Auteur"
msgid "Authors"
msgstr "Auteurs"
msgid "Auto"
msgstr ""
msgid "Auto-Wrap Lines"
msgstr "Retour à la ligne automatique"
@@ -514,8 +529,8 @@ msgstr "Visionneur de fichier"
msgid "Blame..."
msgstr "Visionner..."
msgid "Bold on dark headers instead of italic (restart required)"
msgstr "Police en gras avec fond sombre au lieu d'en-têtes italiques (redémarrage nécessaire)"
msgid "Bold on dark headers instead of italic"
msgstr "Police en gras avec fond sombre au lieu d'en-têtes italiques"
msgid "Branch"
msgstr "Branche"
@@ -817,6 +832,10 @@ msgstr "DAG..."
msgid "Date, Time"
msgstr "Date, heure"
#, fuzzy
msgid "Default"
msgstr "Remettre les valeurs par défaut"
msgid "Delete"
msgstr "Supprimer"
@@ -1029,6 +1048,14 @@ msgstr "Marquage de « %(revision)s » sous « %(name)s »"
msgid "Error running prepare-commitmsg hook"
msgstr "Appel du programme externe d'avant commit..."
#, fuzzy, python-format
msgid "Error updating submodule %s"
msgstr "Erreur lors de la création de la branche distante « %s »"
#, fuzzy
msgid "Error updating submodules"
msgstr "Erreur lors de la modification du fichier"
msgid "Error: Cannot find commit template"
msgstr "Erreur : impossible de trouver un modèle de commit"
@@ -1151,6 +1178,30 @@ msgstr ""
msgid "Fixup Previous Commit"
msgstr "Réparer le commit précédent"
msgid "Flat dark blue"
msgstr ""
msgid "Flat dark green"
msgstr ""
msgid "Flat dark grey"
msgstr ""
msgid "Flat dark red"
msgstr ""
msgid "Flat light blue"
msgstr ""
msgid "Flat light green"
msgstr ""
msgid "Flat light grey"
msgstr ""
msgid "Flat light red"
msgstr ""
msgid "Font Size"
msgstr "Taille de police"
@@ -1188,6 +1239,9 @@ msgstr "Traduction allemande"
msgid "GPG-sign the merge commit"
msgstr "GPG-signer le commit fusionné"
msgid "GUI theme"
msgstr ""
#, python-format
msgid "Gathering info for \"%s\"..."
msgstr "Rassemblement des informations de %s..."
@@ -1231,6 +1285,9 @@ msgstr ""
msgid "Hide Details.."
msgstr ""
msgid "High DPI"
msgstr ""
msgid "History Browser"
msgstr "Navigateur de l'historique"
@@ -1260,6 +1317,9 @@ msgstr ""
msgid "Include tags "
msgstr "Inclure les marques"
msgid "Indent Status paths"
msgstr ""
msgid "Indonesian translation"
msgstr "Traduction indonésienne"
@@ -1482,6 +1542,10 @@ msgstr "Ouvrir"
msgid "Open Git Repository..."
msgstr "Ouvrir le dépôt Git..."
#, fuzzy
msgid "Open Parent"
msgstr "Ouvrir récent"
msgid "Open Parent Directory"
msgstr "Ouvrir le répertoire parent"
@@ -1514,10 +1578,6 @@ msgstr "Écraser « %s » ?"
msgid "Overwrite File?"
msgstr "Écraser le fichier ?"
#, python-format
msgid "PATCH %(current)d/%(count)d"
msgstr "PATCH %(current)d/%(count)d"
msgid ""
"Parse arguments using a shell.\n"
"Queries with spaces will require \"double quotes\"."
@@ -2020,6 +2080,11 @@ msgstr "Modifier le dépôt par défaut"
msgid "Set Upstream Branch"
msgstr "Modifier la source"
msgid ""
"Set the sort order for branches and tags.\n"
"Toggle between date-based and version-name-based sorting."
msgstr ""
msgid "Set upstream"
msgstr "Modifier la source"
@@ -2054,6 +2119,9 @@ msgstr "Afficher l'aide"
msgid "Show History"
msgstr "Afficher l'historique"
msgid "Show file counts in Status titles"
msgstr ""
msgid ""
"Show help\n"
"Shortcut: ?"
@@ -2201,15 +2269,15 @@ msgstr "Statut"
msgid "Stop tracking paths"
msgstr "Stopper le suivi des chemins"
msgid "Submodules"
msgstr ""
msgid "Summarize Merge Commits"
msgstr "Résumer les commits de fusion"
msgid "Summary"
msgstr "Résumé"
msgid "Summary:"
msgstr "Résumé :"
msgid "Tab Width"
msgstr "Largeur de l'onglet"
@@ -2263,6 +2331,12 @@ msgstr "Les fichiers suivants seront effacés :"
msgid "The revision expression cannot be empty."
msgstr "L'expression de révision est vide."
#, python-format
msgid ""
"The submodule will be updated using\n"
"\"%s\""
msgstr ""
#, fuzzy, python-format
msgid "The worktree will be reset using \"git reset --keep %s\""
msgstr "Cet arbre de travail sera réinitialisé en utilisant « git reset --merge %s »"
@@ -2398,9 +2472,34 @@ msgstr "Non suivi"
msgid "Untracking: %s"
msgstr "Démarquage de %s du commit"
msgid "Update All Submodules..."
msgstr ""
msgid "Update Existing Branch:"
msgstr "Mettre à jour branche existante :"
#, fuzzy
msgid "Update Submodule"
msgstr "Misa à jour"
msgid "Update Submodule..."
msgstr ""
msgid "Update Submodules"
msgstr ""
msgid "Update all submodules?"
msgstr ""
msgid "Update submodules..."
msgstr ""
msgid "Update this submodule"
msgstr ""
msgid "Update this submodule?"
msgstr ""
msgid "Updating"
msgstr "Mise à jour"
@@ -2501,6 +2600,15 @@ msgstr "inconnu"
msgid "vX.Y.Z"
msgstr "vX.Y.Z"
msgid "x 1"
msgstr ""
msgid "x 1.5"
msgstr ""
msgid "x 2"
msgstr ""
msgid "yyyy-MM-dd"
msgstr "dd/MM/yyyy"
@@ -3088,6 +3196,9 @@ msgstr "dd/MM/yyyy"
#~ msgid "Output: %s"
#~ msgstr "Sortie : %s"
#~ msgid "PATCH %(current)d/%(count)d"
#~ msgstr "PATCH %(current)d/%(count)d"
#~ msgid "Packed objects waiting for pruning"
#~ msgstr "Objets empaquetés attendant d'être supprimés"
@@ -3207,9 +3318,6 @@ msgstr "dd/MM/yyyy"
#~ "\n"
#~ "Réinitialiser quand même les modifications courantes ?"
#~ msgid "Restore Defaults"
#~ msgstr "Remettre les valeurs par défaut"
#~ msgid "Revert changes in these %i files?"
#~ msgstr "Inverser les modifications dans ces %i fichiers ?"
@@ -3282,6 +3390,9 @@ msgstr "dd/MM/yyyy"
#~ msgid "Success"
#~ msgstr "Succès"
#~ msgid "Summary:"
#~ msgstr "Résumé :"
#~ msgid "The 'master' branch has not been initialized."
#~ msgstr "Cette branche 'master' n'a pas été initialisée."
@@ -3395,9 +3506,6 @@ msgstr "dd/MM/yyyy"
#~ msgid "Unsupported spell checker"
#~ msgstr "Vérificateur d'orthographe non supporté"
#~ msgid "Updated"
#~ msgstr "Misa à jour"
#~ msgid "Updating the Git index failed. A rescan will be automatically started to resynchronize git-gui."
#~ msgstr "Le pré-commit a échoué. Une resynchronisation va être lancée automatiquement."
+106 -8
View File
@@ -360,6 +360,12 @@ msgstr ""
msgid "All Repositories"
msgstr ""
#, python-format
msgid ""
"All submodules will be updated using\n"
"\"%s\""
msgstr ""
msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care"
msgstr ""
@@ -391,6 +397,12 @@ msgid ""
"Create an unsigned tag?"
msgstr ""
msgid "Appearance"
msgstr ""
msgid "Appearance settings require an application restart"
msgstr ""
msgid "Apply"
msgstr ""
@@ -418,6 +430,9 @@ msgstr ""
msgid "Authors"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Auto-Wrap Lines"
msgstr ""
@@ -430,7 +445,7 @@ msgstr ""
msgid "Blame..."
msgstr ""
msgid "Bold on dark headers instead of italic (restart required)"
msgid "Bold on dark headers instead of italic"
msgstr ""
msgid "Branch"
@@ -716,6 +731,9 @@ msgstr ""
msgid "Date, Time"
msgstr ""
msgid "Default"
msgstr ""
msgid "Delete"
msgstr ""
@@ -921,6 +939,13 @@ msgstr ""
msgid "Error running prepare-commitmsg hook"
msgstr ""
#, python-format
msgid "Error updating submodule %s"
msgstr ""
msgid "Error updating submodules"
msgstr ""
msgid "Error: Cannot find commit template"
msgstr ""
@@ -1039,6 +1064,30 @@ msgstr ""
msgid "Fixup Previous Commit"
msgstr ""
msgid "Flat dark blue"
msgstr ""
msgid "Flat dark green"
msgstr ""
msgid "Flat dark grey"
msgstr ""
msgid "Flat dark red"
msgstr ""
msgid "Flat light blue"
msgstr ""
msgid "Flat light green"
msgstr ""
msgid "Flat light grey"
msgstr ""
msgid "Flat light red"
msgstr ""
msgid "Font Size"
msgstr ""
@@ -1074,6 +1123,9 @@ msgstr ""
msgid "GPG-sign the merge commit"
msgstr ""
msgid "GUI theme"
msgstr ""
#, python-format
msgid "Gathering info for \"%s\"..."
msgstr ""
@@ -1117,6 +1169,9 @@ msgstr ""
msgid "Hide Details.."
msgstr ""
msgid "High DPI"
msgstr ""
msgid "History Browser"
msgstr ""
@@ -1144,6 +1199,9 @@ msgstr ""
msgid "Include tags "
msgstr ""
msgid "Indent Status paths"
msgstr ""
msgid "Indonesian translation"
msgstr ""
@@ -1391,10 +1449,6 @@ msgstr ""
msgid "Overwrite File?"
msgstr ""
#, python-format
msgid "PATCH %(current)d/%(count)d"
msgstr ""
msgid ""
"Parse arguments using a shell.\n"
"Queries with spaces will require \"double quotes\"."
@@ -1866,6 +1920,11 @@ msgstr ""
msgid "Set Upstream Branch"
msgstr ""
msgid ""
"Set the sort order for branches and tags.\n"
"Toggle between date-based and version-name-based sorting."
msgstr ""
msgid "Set upstream"
msgstr ""
@@ -1899,6 +1958,9 @@ msgstr ""
msgid "Show History"
msgstr ""
msgid "Show file counts in Status titles"
msgstr ""
msgid ""
"Show help\n"
"Shortcut: ?"
@@ -2049,9 +2111,6 @@ msgstr ""
msgid "Summary"
msgstr ""
msgid "Summary:"
msgstr ""
msgid "Tab Width"
msgstr ""
@@ -2105,6 +2164,12 @@ msgstr ""
msgid "The revision expression cannot be empty."
msgstr ""
#, python-format
msgid ""
"The submodule will be updated using\n"
"\"%s\""
msgstr ""
#, python-format
msgid "The worktree will be reset using \"git reset --keep %s\""
msgstr ""
@@ -2223,9 +2288,33 @@ msgstr ""
msgid "Untracking: %s"
msgstr ""
msgid "Update All Submodules..."
msgstr ""
msgid "Update Existing Branch:"
msgstr ""
msgid "Update Submodule"
msgstr ""
msgid "Update Submodule..."
msgstr ""
msgid "Update Submodules"
msgstr ""
msgid "Update all submodules?"
msgstr ""
msgid "Update submodules..."
msgstr ""
msgid "Update this submodule"
msgstr ""
msgid "Update this submodule?"
msgstr ""
msgid "Updating"
msgstr ""
@@ -2324,5 +2413,14 @@ msgstr ""
msgid "vX.Y.Z"
msgstr ""
msgid "x 1"
msgstr ""
msgid "x 1.5"
msgstr ""
msgid "x 2"
msgstr ""
msgid "yyyy-MM-dd"
msgstr ""
+116 -14
View File
@@ -400,6 +400,12 @@ msgstr ""
msgid "All Repositories"
msgstr "Globális (minden repó)"
#, python-format
msgid ""
"All submodules will be updated using\n"
"\"%s\""
msgstr ""
msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care"
msgstr ""
@@ -432,6 +438,12 @@ msgid ""
"Create an unsigned tag?"
msgstr ""
msgid "Appearance"
msgstr ""
msgid "Appearance settings require an application restart"
msgstr ""
#, fuzzy
msgid "Apply"
msgstr "Apple"
@@ -462,6 +474,9 @@ msgstr "Szerző:"
msgid "Authors"
msgstr "Szerző:"
msgid "Auto"
msgstr ""
msgid "Auto-Wrap Lines"
msgstr ""
@@ -476,7 +491,7 @@ msgstr "Fájl néző"
msgid "Blame..."
msgstr "Átnevezés..."
msgid "Bold on dark headers instead of italic (restart required)"
msgid "Bold on dark headers instead of italic"
msgstr ""
msgid "Branch"
@@ -800,6 +815,10 @@ msgstr ""
msgid "Date, Time"
msgstr ""
#, fuzzy
msgid "Default"
msgstr "Alapértelmezés visszaállítása"
msgid "Delete"
msgstr "Törlés"
@@ -1039,6 +1058,14 @@ msgstr ""
msgid "Error running prepare-commitmsg hook"
msgstr "A pre-commit hurok meghívása..."
#, fuzzy, python-format
msgid "Error updating submodule %s"
msgstr "Hiba a diff betöltése közben:"
#, fuzzy
msgid "Error updating submodules"
msgstr "Hiba a diff betöltése közben:"
msgid "Error: Cannot find commit template"
msgstr ""
@@ -1171,6 +1198,30 @@ msgstr ""
msgid "Fixup Previous Commit"
msgstr "Merge commit üzenet:"
msgid "Flat dark blue"
msgstr ""
msgid "Flat dark green"
msgstr ""
msgid "Flat dark grey"
msgstr ""
msgid "Flat dark red"
msgstr ""
msgid "Flat light blue"
msgstr ""
msgid "Flat light green"
msgstr ""
msgid "Flat light grey"
msgstr ""
msgid "Flat light red"
msgstr ""
msgid "Font Size"
msgstr "Font méret"
@@ -1206,6 +1257,9 @@ msgstr ""
msgid "GPG-sign the merge commit"
msgstr ""
msgid "GUI theme"
msgstr ""
#, fuzzy, python-format
msgid "Gathering info for \"%s\"..."
msgstr "A(z) %s diff-jének betöltése..."
@@ -1250,6 +1304,9 @@ msgstr ""
msgid "Hide Details.."
msgstr ""
msgid "High DPI"
msgstr ""
#, fuzzy
msgid "History Browser"
msgstr "Fájl böngésző"
@@ -1279,6 +1336,9 @@ msgstr ""
msgid "Include tags "
msgstr "Tageket is"
msgid "Indent Status paths"
msgstr ""
msgid "Indonesian translation"
msgstr ""
@@ -1526,6 +1586,10 @@ msgstr "Megnyitás"
msgid "Open Git Repository..."
msgstr "Létező könyvtár megnyitása"
#, fuzzy
msgid "Open Parent"
msgstr "Legutóbbi repók megnyitása:"
#, fuzzy
msgid "Open Parent Directory"
msgstr "Legutóbbi repók megnyitása:"
@@ -1561,10 +1625,6 @@ msgstr ""
msgid "Overwrite File?"
msgstr ""
#, python-format
msgid "PATCH %(current)d/%(count)d"
msgstr ""
msgid ""
"Parse arguments using a shell.\n"
"Queries with spaces will require \"double quotes\"."
@@ -2108,6 +2168,11 @@ msgstr "Git repó"
msgid "Set Upstream Branch"
msgstr "Kiválaszt"
msgid ""
"Set the sort order for branches and tags.\n"
"Toggle between date-based and version-name-based sorting."
msgstr ""
#, fuzzy
msgid "Set upstream"
msgstr "Kiválaszt"
@@ -2145,6 +2210,9 @@ msgstr "Segítség"
msgid "Show History"
msgstr ""
msgid "Show file counts in Status titles"
msgstr ""
msgid ""
"Show help\n"
"Shortcut: ?"
@@ -2309,15 +2377,15 @@ msgstr ""
msgid "Stop tracking paths"
msgstr ""
msgid "Submodules"
msgstr ""
msgid "Summarize Merge Commits"
msgstr "A merge commitok összegzése"
msgid "Summary"
msgstr ""
msgid "Summary:"
msgstr ""
msgid "Tab Width"
msgstr ""
@@ -2374,6 +2442,12 @@ msgstr ""
msgid "The revision expression cannot be empty."
msgstr "A revízió kifejezés üres."
#, python-format
msgid ""
"The submodule will be updated using\n"
"\"%s\""
msgstr ""
#, python-format
msgid "The worktree will be reset using \"git reset --keep %s\""
msgstr ""
@@ -2498,9 +2572,34 @@ msgstr "Nem követett, nem kiválasztott"
msgid "Untracking: %s"
msgstr ""
msgid "Update All Submodules..."
msgstr ""
msgid "Update Existing Branch:"
msgstr "Létező branch frissítése"
#, fuzzy
msgid "Update Submodule"
msgstr "Frissítve"
msgid "Update Submodule..."
msgstr ""
msgid "Update Submodules"
msgstr ""
msgid "Update all submodules?"
msgstr ""
msgid "Update submodules..."
msgstr ""
msgid "Update this submodule"
msgstr ""
msgid "Update this submodule?"
msgstr ""
#, fuzzy
msgid "Updating"
msgstr "Indítás..."
@@ -2605,6 +2704,15 @@ msgstr ""
msgid "vX.Y.Z"
msgstr ""
msgid "x 1"
msgstr ""
msgid "x 1.5"
msgstr ""
msgid "x 2"
msgstr ""
msgid "yyyy-MM-dd"
msgstr ""
@@ -3313,9 +3421,6 @@ msgstr ""
#~ "\n"
#~ "Folytatjuk a jelenlegi módosítások visszavonását?"
#~ msgid "Restore Defaults"
#~ msgstr "Alapértelmezés visszaállítása"
#~ msgid "Revert changes in these %i files?"
#~ msgstr "Visszaállítja a változtatásokat ebben e %i fájlban?"
@@ -3509,9 +3614,6 @@ msgstr ""
#~ msgid "Unsupported spell checker"
#~ msgstr "Nem támogatott helyesírás-ellenőrző"
#~ msgid "Updated"
#~ msgstr "Frissítve"
#~ msgid "Updating the Git index failed. A rescan will be automatically started to resynchronize git-gui."
#~ msgstr "A Git index frissítése sikertelen volt. Egy újraolvasás automatikusan elindult, hogy a git-gui újra szinkonban legyen."
+120 -8
View File
@@ -399,6 +399,12 @@ msgstr "Usia"
msgid "All Repositories"
msgstr "Semua Repositori"
#, python-format
msgid ""
"All submodules will be updated using\n"
"\"%s\""
msgstr ""
msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care"
msgstr ""
@@ -434,6 +440,12 @@ msgstr ""
"Tak bertanda, tag ringan akan dibuat.\n"
"Buat tag tak bertanda?"
msgid "Appearance"
msgstr ""
msgid "Appearance settings require an application restart"
msgstr ""
msgid "Apply"
msgstr "Terapkan"
@@ -463,6 +475,9 @@ msgstr "Penulis"
msgid "Authors"
msgstr "Penulis"
msgid "Auto"
msgstr ""
msgid "Auto-Wrap Lines"
msgstr "Auto-Wrap Baris"
@@ -477,7 +492,7 @@ msgstr "Penampil Diff Cabang"
msgid "Blame..."
msgstr "Tutup..."
msgid "Bold on dark headers instead of italic (restart required)"
msgid "Bold on dark headers instead of italic"
msgstr ""
msgid "Branch"
@@ -788,6 +803,9 @@ msgstr "DAG..."
msgid "Date, Time"
msgstr "Tanggal, Waktu"
msgid "Default"
msgstr ""
msgid "Delete"
msgstr "Hapus"
@@ -1003,6 +1021,14 @@ msgstr "Menandai \"%(revision)s\" sebagai \"%(name)s\""
msgid "Error running prepare-commitmsg hook"
msgstr ""
#, fuzzy, python-format
msgid "Error updating submodule %s"
msgstr "Error membuat hulu \"%s\""
#, fuzzy
msgid "Error updating submodules"
msgstr "Error Menyunting Berkas"
msgid "Error: Cannot find commit template"
msgstr "Error: Tidak dapat melakukan commit templat"
@@ -1129,6 +1155,30 @@ msgstr ""
msgid "Fixup Previous Commit"
msgstr "Perbaiki Commit Sebelumnya"
msgid "Flat dark blue"
msgstr ""
msgid "Flat dark green"
msgstr ""
msgid "Flat dark grey"
msgstr ""
msgid "Flat dark red"
msgstr ""
msgid "Flat light blue"
msgstr ""
msgid "Flat light green"
msgstr ""
msgid "Flat light grey"
msgstr ""
msgid "Flat light red"
msgstr ""
msgid "Font Size"
msgstr "Ukuran Font"
@@ -1166,6 +1216,9 @@ msgstr ""
msgid "GPG-sign the merge commit"
msgstr ""
msgid "GUI theme"
msgstr ""
#, python-format
msgid "Gathering info for \"%s\"..."
msgstr "Mengumpulkan info untuk \"%s\"..."
@@ -1209,6 +1262,9 @@ msgstr ""
msgid "Hide Details.."
msgstr ""
msgid "High DPI"
msgstr ""
msgid "History Browser"
msgstr "Penjelajah Histori"
@@ -1237,6 +1293,9 @@ msgstr ""
msgid "Include tags "
msgstr "Sertakan tag "
msgid "Indent Status paths"
msgstr ""
msgid "Indonesian translation"
msgstr ""
@@ -1463,6 +1522,10 @@ msgstr "Buka"
msgid "Open Git Repository..."
msgstr "Bukan Repositori Git..."
#, fuzzy
msgid "Open Parent"
msgstr "Buka yang Terkini"
msgid "Open Parent Directory"
msgstr "Bukan Direktori di Atasnya"
@@ -1495,10 +1558,6 @@ msgstr "Timpa \"%s\""
msgid "Overwrite File?"
msgstr "Timpa Berkas?"
#, python-format
msgid "PATCH %(current)d/%(count)d"
msgstr "PATCH %(current)d/%(count)d"
msgid ""
"Parse arguments using a shell.\n"
"Queries with spaces will require \"double quotes\"."
@@ -2012,6 +2071,11 @@ msgstr "Pilih Repository..."
msgid "Set Upstream Branch"
msgstr "Pilih Upstream Baru"
msgid ""
"Set the sort order for branches and tags.\n"
"Toggle between date-based and version-name-based sorting."
msgstr ""
#, fuzzy
msgid "Set upstream"
msgstr "Pilih Upstream Baru"
@@ -2048,6 +2112,9 @@ msgstr "Bantuan"
msgid "Show History"
msgstr "Tunjukan sejarah"
msgid "Show file counts in Status titles"
msgstr ""
msgid ""
"Show help\n"
"Shortcut: ?"
@@ -2196,15 +2263,15 @@ msgstr "Status"
msgid "Stop tracking paths"
msgstr "Hentikan melacak lokasi"
msgid "Submodules"
msgstr ""
msgid "Summarize Merge Commits"
msgstr "Ringkasan Merge Commit"
msgid "Summary"
msgstr "Ringkasan"
msgid "Summary:"
msgstr "Ringkasan:"
msgid "Tab Width"
msgstr "Lebar Tab"
@@ -2259,6 +2326,12 @@ msgstr "Berkas berikut akan dihapus:"
msgid "The revision expression cannot be empty."
msgstr "Ekspresi revisi tidak boleh kosong."
#, python-format
msgid ""
"The submodule will be updated using\n"
"\"%s\""
msgstr ""
#, python-format
msgid "The worktree will be reset using \"git reset --keep %s\""
msgstr ""
@@ -2393,9 +2466,33 @@ msgstr "Tak Terlacak"
msgid "Untracking: %s"
msgstr "Untracking: %s"
msgid "Update All Submodules..."
msgstr ""
msgid "Update Existing Branch:"
msgstr "Perbarui Cabang yang Ada:"
msgid "Update Submodule"
msgstr ""
msgid "Update Submodule..."
msgstr ""
msgid "Update Submodules"
msgstr ""
msgid "Update all submodules?"
msgstr ""
msgid "Update submodules..."
msgstr ""
msgid "Update this submodule"
msgstr ""
msgid "Update this submodule?"
msgstr ""
msgid "Updating"
msgstr "Sedang memperbarui"
@@ -2499,6 +2596,15 @@ msgstr "tidak diketahui"
msgid "vX.Y.Z"
msgstr "vX.Y.Z"
msgid "x 1"
msgstr ""
msgid "x 1.5"
msgstr ""
msgid "x 2"
msgstr ""
msgid "yyyy-MM-dd"
msgstr "dd-MM-yyyy"
@@ -2573,6 +2679,9 @@ msgstr "dd-MM-yyyy"
#~ msgid "Output: %s"
#~ msgstr "Keluaran: %s"
#~ msgid "PATCH %(current)d/%(count)d"
#~ msgstr "PATCH %(current)d/%(count)d"
#~ msgid "Path to git repository"
#~ msgstr "Lokasi repositori git"
@@ -2604,6 +2713,9 @@ msgstr "dd-MM-yyyy"
#~ msgid "Staging Area"
#~ msgstr "Area Stagnan"
#~ msgid "Summary:"
#~ msgstr "Ringkasan:"
#~ msgid ""
#~ "This PyQt4 does not include QtWebKit.\n"
#~ "The keyboard shortcuts feature is unavailable."
+116 -14
View File
@@ -400,6 +400,12 @@ msgstr ""
msgid "All Repositories"
msgstr "Tutti gli archivi"
#, python-format
msgid ""
"All submodules will be updated using\n"
"\"%s\""
msgstr ""
msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care"
msgstr ""
@@ -432,6 +438,12 @@ msgid ""
"Create an unsigned tag?"
msgstr ""
msgid "Appearance"
msgstr ""
msgid "Appearance settings require an application restart"
msgstr ""
#, fuzzy
msgid "Apply"
msgstr "Apple"
@@ -462,6 +474,9 @@ msgstr "Autore:"
msgid "Authors"
msgstr "Autore:"
msgid "Auto"
msgstr ""
msgid "Auto-Wrap Lines"
msgstr ""
@@ -476,7 +491,7 @@ msgstr "Mostra file"
msgid "Blame..."
msgstr "Rinomina"
msgid "Bold on dark headers instead of italic (restart required)"
msgid "Bold on dark headers instead of italic"
msgstr ""
msgid "Branch"
@@ -800,6 +815,10 @@ msgstr ""
msgid "Date, Time"
msgstr ""
#, fuzzy
msgid "Default"
msgstr "Ripristina valori predefiniti"
msgid "Delete"
msgstr "Elimina"
@@ -1039,6 +1058,14 @@ msgstr ""
msgid "Error running prepare-commitmsg hook"
msgstr "Avvio pre-commit hook..."
#, fuzzy, python-format
msgid "Error updating submodule %s"
msgstr "Errore nel caricamento delle differenze:"
#, fuzzy
msgid "Error updating submodules"
msgstr "Errore nel caricamento delle differenze:"
msgid "Error: Cannot find commit template"
msgstr ""
@@ -1171,6 +1198,30 @@ msgstr ""
msgid "Fixup Previous Commit"
msgstr "Messaggio di fusione:"
msgid "Flat dark blue"
msgstr ""
msgid "Flat dark green"
msgstr ""
msgid "Flat dark grey"
msgstr ""
msgid "Flat dark red"
msgstr ""
msgid "Flat light blue"
msgstr ""
msgid "Flat light green"
msgstr ""
msgid "Flat light grey"
msgstr ""
msgid "Flat light red"
msgstr ""
msgid "Font Size"
msgstr "Dimensione caratteri"
@@ -1206,6 +1257,9 @@ msgstr ""
msgid "GPG-sign the merge commit"
msgstr ""
msgid "GUI theme"
msgstr ""
#, fuzzy, python-format
msgid "Gathering info for \"%s\"..."
msgstr "Caricamento delle differenze di %s..."
@@ -1250,6 +1304,9 @@ msgstr ""
msgid "Hide Details.."
msgstr ""
msgid "High DPI"
msgstr ""
#, fuzzy
msgid "History Browser"
msgstr "File browser"
@@ -1279,6 +1336,9 @@ msgstr ""
msgid "Include tags "
msgstr "Includi etichette"
msgid "Indent Status paths"
msgstr ""
msgid "Indonesian translation"
msgstr ""
@@ -1526,6 +1586,10 @@ msgstr "Apri"
msgid "Open Git Repository..."
msgstr "Apri archivio esistente"
#, fuzzy
msgid "Open Parent"
msgstr "Apri archivio recente:"
#, fuzzy
msgid "Open Parent Directory"
msgstr "Apri archivio recente:"
@@ -1561,10 +1625,6 @@ msgstr ""
msgid "Overwrite File?"
msgstr ""
#, python-format
msgid "PATCH %(current)d/%(count)d"
msgstr ""
msgid ""
"Parse arguments using a shell.\n"
"Queries with spaces will require \"double quotes\"."
@@ -2108,6 +2168,11 @@ msgstr "Archivio Git"
msgid "Set Upstream Branch"
msgstr "Seleziona"
msgid ""
"Set the sort order for branches and tags.\n"
"Toggle between date-based and version-name-based sorting."
msgstr ""
#, fuzzy
msgid "Set upstream"
msgstr "Seleziona"
@@ -2145,6 +2210,9 @@ msgstr "Aiuto"
msgid "Show History"
msgstr ""
msgid "Show file counts in Status titles"
msgstr ""
msgid ""
"Show help\n"
"Shortcut: ?"
@@ -2309,15 +2377,15 @@ msgstr ""
msgid "Stop tracking paths"
msgstr ""
msgid "Submodules"
msgstr ""
msgid "Summarize Merge Commits"
msgstr "Riepilogo nelle revisioni di fusione"
msgid "Summary"
msgstr ""
msgid "Summary:"
msgstr ""
msgid "Tab Width"
msgstr ""
@@ -2374,6 +2442,12 @@ msgstr ""
msgid "The revision expression cannot be empty."
msgstr "L'espressione di revisione è vuota."
#, python-format
msgid ""
"The submodule will be updated using\n"
"\"%s\""
msgstr ""
#, python-format
msgid "The worktree will be reset using \"git reset --keep %s\""
msgstr ""
@@ -2498,9 +2572,34 @@ msgstr "Non tracciato, non preparato per una nuova revisione"
msgid "Untracking: %s"
msgstr ""
msgid "Update All Submodules..."
msgstr ""
msgid "Update Existing Branch:"
msgstr "Aggiorna ramo esistente:"
#, fuzzy
msgid "Update Submodule"
msgstr "Aggiornato"
msgid "Update Submodule..."
msgstr ""
msgid "Update Submodules"
msgstr ""
msgid "Update all submodules?"
msgstr ""
msgid "Update submodules..."
msgstr ""
msgid "Update this submodule"
msgstr ""
msgid "Update this submodule?"
msgstr ""
#, fuzzy
msgid "Updating"
msgstr "Avvio in corso..."
@@ -2605,6 +2704,15 @@ msgstr ""
msgid "vX.Y.Z"
msgstr ""
msgid "x 1"
msgstr ""
msgid "x 1.5"
msgstr ""
msgid "x 2"
msgstr ""
msgid "yyyy-MM-dd"
msgstr ""
@@ -3280,9 +3388,6 @@ msgstr ""
#~ "\n"
#~ "Continuare con l'annullamento delle modifiche attuali?"
#~ msgid "Restore Defaults"
#~ msgstr "Ripristina valori predefiniti"
#~ msgid "Revert changes in these %i files?"
#~ msgstr "Annullare le modifiche in questi %i file?"
@@ -3471,9 +3576,6 @@ msgstr ""
#~ msgid "Unsupported spell checker"
#~ msgstr "Correttore ortografico non supportato"
#~ msgid "Updated"
#~ msgstr "Aggiornato"
#~ msgid "Updating the Git index failed. A rescan will be automatically started to resynchronize git-gui."
#~ msgstr "Impossibile aggiornare l'indice. Ora sarà avviata una nuova analisi che aggiornerà git-gui."
+191 -47
View File
@@ -4,7 +4,8 @@
# しらいし ななこ <nanako3@bluebottle.com>, 2007.
#
msgid ""
msgstr "Project-Id-Version: git-cola VERSION\n"
msgstr ""
"Project-Id-Version: git-cola VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-10-17 01:06-0700\n"
"PO-Revision-Date: 2008-03-15 20:12+0900\n"
@@ -22,7 +23,8 @@ msgid ""
" patches to the list\n"
" </p>\n"
" "
msgstr "\n"
msgstr ""
"\n"
" <p>\n"
" ドラッグ&ドロップまたは<strong>追加</strong>ボタンを押して追加します。\n"
" リストにパッチを適用する\n"
@@ -55,7 +57,8 @@ msgid ""
" <br>\n"
"\n"
" "
msgstr "\n"
msgstr ""
"\n"
" <br>\n"
" Git Cola は様々な言語に翻訳されてきました。\n"
" 以下のリストの皆さまに感謝します。\n"
@@ -94,7 +97,8 @@ msgid ""
" <li> %(pyqt_api_name)s %(pyqt_api_version)s\n"
" </ul>\n"
" "
msgstr "\n"
msgstr ""
"\n"
" <br>\n"
" Git Cola のバージョンは %(cola_version)s、 %(build_version)sの\n"
" <ul>\n"
@@ -114,7 +118,8 @@ msgid ""
" Please use %(bug_link)s to report issues.\n"
" <br>\n"
" "
msgstr "\n"
msgstr ""
"\n"
" <br>\n"
" %(bug_link)s を使って課題を報告してください。\n"
" <br>\n"
@@ -132,7 +137,8 @@ msgid ""
" %(filename)s = file basename\n"
" %(basename)s = file basename without extension\n"
" %(ext)s = file extension\n"
msgstr "\n"
msgstr ""
"\n"
" フォーマットストリング変数\n"
" -----------------------\n"
" %(path)s = ファイルへの相対パス\n"
@@ -178,7 +184,8 @@ msgid ""
"ctrl+enter = accept changes and rebase\n"
"ctrl+q = cancel and abort the rebase\n"
"ctrl+d = launch difftool\n"
msgstr "\n"
msgstr ""
"\n"
"コマンド\n"
"--------\n"
"pick = コミットを使う。\n"
@@ -226,7 +233,8 @@ msgid ""
"\n"
"The up and down arrows change focus between the text entry field\n"
"and the results.\n"
msgstr "\n"
msgstr ""
"\n"
"キーボードショートカット\n"
"------------------\n"
"J, Down = 下に移動\n"
@@ -305,7 +313,8 @@ msgid ""
"\n"
"You should probably skip this file.\n"
"Stage it anyways?"
msgstr "%s マージに衝突があることがわかりました。\n"
msgstr ""
"%s マージに衝突があることがわかりました。\n"
"\n"
"このファイルはおそらくスキップすべきです。\n"
"これをステージングしますか?"
@@ -366,7 +375,8 @@ msgid ""
"A commit template has not been configured.\n"
"Use \"git config\" to define \"commit.template\"\n"
"so that it points to a commit template."
msgstr "コミットテンプレートは変更できません。\n"
msgstr ""
"コミットテンプレートは変更できません。\n"
"\"git config\" を使って、\"commit.template\"を定義してください。\n"
"これはコミットテンプレートを指定します。"
@@ -396,7 +406,8 @@ msgstr "このアクションを中止しますか?"
msgid ""
"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n"
"Recovering uncommitted changes is not possible."
msgstr "現在のマージを中止すると、コミットしていない *全て* の変更を失います。\n"
msgstr ""
"現在のマージを中止すると、コミットしていない *全て* の変更を失います。\n"
"コミットしていない変更を戻すことはできません。"
msgid "Aborting the current merge?"
@@ -414,7 +425,8 @@ msgstr "受け入れ"
msgid ""
"Accept changes and rebase\n"
"Shortcut: Ctrl+Enter"
msgstr "変更を受け入れてrebaseします。\n"
msgstr ""
"変更を受け入れてrebaseします。\n"
"ショートカット: Ctrl+Enter"
msgid "Action Name"
@@ -447,7 +459,8 @@ msgid ""
"\n"
"Remotes can be renamed by selecting one from the list\n"
"and pressing \"enter\", or by double-clicking."
msgstr "リモートリポジトリの追加や削除するには\n"
msgstr ""
"リモートリポジトリの追加や削除するには\n"
"左側のAdd(+) または Delete(-) ボタンを使用します。\n"
"\n"
"リモートリポジトリの名前を変更するには、リストから選択して\n"
@@ -483,6 +496,12 @@ msgstr "年齢"
msgid "All Repositories"
msgstr "全てのリポジトリ"
#, python-format
msgid ""
"All submodules will be updated using\n"
"\"%s\""
msgstr ""
msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care"
msgstr "ファストフォワードではない更新を許可します。\"force\" はリモートリポジトリでコミットを失う可能性があります。使用には注意してください。"
@@ -507,15 +526,23 @@ msgstr "訂正中"
msgid ""
"An action is still running.\n"
"Terminating it could result in data loss."
msgstr "アクション継続中です。\n"
msgstr ""
"アクション継続中です。\n"
"中断は結果としてデータを失うことがありえます。"
msgid ""
"An unsigned, lightweight tag will be created instead.\n"
"Create an unsigned tag?"
msgstr "署名のない、軽量のタグを代わりにに作成します。\n"
msgstr ""
"署名のない、軽量のタグを代わりにに作成します。\n"
"署名なしタグを作成しますか?"
msgid "Appearance"
msgstr ""
msgid "Appearance settings require an application restart"
msgstr ""
msgid "Apply"
msgstr "適用"
@@ -543,6 +570,9 @@ msgstr "著者"
msgid "Authors"
msgstr "著者"
msgid "Auto"
msgstr ""
msgid "Auto-Wrap Lines"
msgstr "自動行折り返し"
@@ -555,8 +585,8 @@ msgstr "責任者ビューアー"
msgid "Blame..."
msgstr "責任者..."
msgid "Bold on dark headers instead of italic (restart required)"
msgstr "イタリックフォントからボールドフォントとダークヘッダに (再起動必要)"
msgid "Bold on dark headers instead of italic"
msgstr "イタリックフォントからボールドフォントとダークヘッダに"
msgid "Branch"
msgstr "ブランチ"
@@ -565,7 +595,8 @@ msgstr "ブランチ"
msgid ""
"Branch \"%(branch)s\" does not exist in \"%(remote)s\".\n"
"A new remote branch will be published."
msgstr "\"%(branch)s\" は \"%(remote)s\" に存在していません。\n"
msgstr ""
"\"%(branch)s\" は \"%(remote)s\" に存在していません。\n"
"新しいリモートブランチを作成し、公開します。"
#, python-format
@@ -625,7 +656,8 @@ msgstr "中止"
msgid ""
"Cancel rebase\n"
"Shortcut: Ctrl+Q"
msgstr "rebaseの中止\n"
msgstr ""
"rebaseの中止\n"
"ショートカット: Ctrl+Q: Ctrl+Q"
msgid "Cannot Amend"
@@ -734,7 +766,8 @@ msgstr "ステージした変更をコミット"
msgid ""
"Commit staged changes\n"
"Shortcut: Ctrl+Enter"
msgstr "ステージした変更をコミット\n"
msgstr ""
"ステージした変更をコミット\n"
"ショートカット: Ctrl+Enter"
msgid "Commit summary"
@@ -844,6 +877,10 @@ msgstr "DAG中..."
msgid "Date, Time"
msgstr "日時"
#, fuzzy
msgid "Default"
msgstr "既定値に戻す"
msgid "Delete"
msgstr "削除"
@@ -1049,6 +1086,14 @@ msgstr "\"%(name)s\" から \"%(new_name)s\" の名前変更エラー"
msgid "Error running prepare-commitmsg hook"
msgstr "コミットメッセージ前フック実行エラー"
#, fuzzy, python-format
msgid "Error updating submodule %s"
msgstr "リモート \"%s\"作成エラー"
#, fuzzy
msgid "Error updating submodules"
msgstr "ファイル編集エラー"
msgid "Error: Cannot find commit template"
msgstr "エラー:コミットテンプレートが見つかりません。"
@@ -1135,7 +1180,8 @@ msgid ""
"File system change monitoring: disabled because the limit on the total number of inotify watches was reached. You may be able to increase the limit on the number of watches by running:\n"
"\n"
" echo fs.inotify.max_user_watches=100000 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p\n"
msgstr "ファイルシステム変更監視: inotify 監視の総数が上限に到達したため無効です。inotifyの監視の総数の上限を増加させるには以下のように実行します。:\n"
msgstr ""
"ファイルシステム変更監視: inotify 監視の総数が上限に到達したため無効です。inotifyの監視の総数の上限を増加させるには以下のように実行します。:\n"
"\n"
" echo fs.inotify.max_user_watches=100000 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p\n"
@@ -1169,6 +1215,30 @@ msgstr "修正"
msgid "Fixup Previous Commit"
msgstr "以前のコミットを修正"
msgid "Flat dark blue"
msgstr ""
msgid "Flat dark green"
msgstr ""
msgid "Flat dark grey"
msgstr ""
msgid "Flat dark red"
msgstr ""
msgid "Flat light blue"
msgstr ""
msgid "Flat light green"
msgstr ""
msgid "Flat light grey"
msgstr ""
msgid "Flat light red"
msgstr ""
msgid "Font Size"
msgstr "フォントサイズ"
@@ -1204,6 +1274,9 @@ msgstr "フランス語翻訳"
msgid "GPG-sign the merge commit"
msgstr "マージコミットのGPG署名"
msgid "GUI theme"
msgstr ""
#, python-format
msgid "Gathering info for \"%s\"..."
msgstr "\"%s\"の情報を収集..."
@@ -1247,6 +1320,9 @@ msgstr "ヘルプ - git-xbase"
msgid "Hide Details.."
msgstr "詳細を隠す。"
msgid "High DPI"
msgstr ""
msgid "History Browser"
msgstr "履歴ブラウザ"
@@ -1274,6 +1350,9 @@ msgstr "ファイル名またはパターンで無視を指定する"
msgid "Include tags "
msgstr "タグを含める "
msgid "Indent Status paths"
msgstr ""
msgid "Indonesian translation"
msgstr "インドネシア語翻訳"
@@ -1319,7 +1398,8 @@ msgstr "ターミナルを起動"
msgid ""
"Launch external diff tool\n"
"Shortcut: Ctrl+D"
msgstr "外部差分ツールを起動\n"
msgstr ""
"外部差分ツールを起動\n"
"ショートカット: Ctrl+D"
msgid "Launch git-cola"
@@ -1451,7 +1531,8 @@ msgid ""
"No changes to commit.\n"
"\n"
"You must stage at least 1 file before you can commit."
msgstr "コミットする変更がありません\n"
msgstr ""
"コミットする変更がありません\n"
"\n"
"コミットする前に少なくとも1ファイルをステージしなければなりません。"
@@ -1473,7 +1554,8 @@ msgstr "ファーストフォワードではないフェッチはローカルの
msgid ""
"Non-fast-forward push overwrites published history!\n"
"(Did you pull first?)"
msgstr "ファーストフォワードではないフェッチは発行した履歴を上書きします!\n"
msgstr ""
"ファーストフォワードではないフェッチは発行した履歴を上書きします!\n"
"(pullを先に行いますか?)"
msgid "Nothing to commit"
@@ -1491,6 +1573,10 @@ msgstr "開く"
msgid "Open Git Repository..."
msgstr "Git リポジトリを開く..."
#, fuzzy
msgid "Open Parent"
msgstr "最近のものを開く"
msgid "Open Parent Directory"
msgstr "親ディレクトリを開く"
@@ -1522,14 +1608,11 @@ msgstr "\"%s\"を上書きしますか?"
msgid "Overwrite File?"
msgstr "ファイルを上書きしますか?"
#, python-format
msgid "PATCH %(current)d/%(count)d"
msgstr "PATCH %(current)d/%(count)d"
msgid ""
"Parse arguments using a shell.\n"
"Queries with spaces will require \"double quotes\"."
msgstr "シェルで引数をパースします。\n"
msgstr ""
"シェルで引数をパースします。\n"
"空白文字のあるクエリは二重引用符で囲む必要があります。"
msgid "Partially Staged"
@@ -1573,7 +1656,8 @@ msgid ""
"- First line: Describe in one sentence what you did.\n"
"- Second line: Blank\n"
"- Remaining lines: Describe why this change is good.\n"
msgstr "コミットメッセージを提供してください。\n"
msgstr ""
"コミットメッセージを提供してください。\n"
"\n"
"良いコミットメッセージは次のフォーマットを持ちます。:\n"
"\n"
@@ -2004,6 +2088,11 @@ msgstr "デフォルトリポジトリを設定"
msgid "Set Upstream Branch"
msgstr "アップストリームブランチを設定"
msgid ""
"Set the sort order for branches and tags.\n"
"Toggle between date-based and version-name-based sorting."
msgstr ""
msgid "Set upstream"
msgstr "アップストリームを設定"
@@ -2037,10 +2126,14 @@ msgstr "ヘルプの表示"
msgid "Show History"
msgstr "履歴の表示"
msgid "Show file counts in Status titles"
msgstr ""
msgid ""
"Show help\n"
"Shortcut: ?"
msgstr "ヘルプの表示\n"
msgstr ""
"ヘルプの表示\n"
"ショートカット: ?"
msgid "Show icon? (if available)"
@@ -2179,15 +2272,15 @@ msgstr "ステータス"
msgid "Stop tracking paths"
msgstr "パスのトラッキングを中止する"
msgid "Submodules"
msgstr ""
msgid "Summarize Merge Commits"
msgstr "マージコミットの要約"
msgid "Summary"
msgstr "要約"
msgid "Summary:"
msgstr "要約:"
msgid "Tab Width"
msgstr "タグ幅"
@@ -2241,6 +2334,12 @@ msgstr "以下のファイルは削除されます。:"
msgid "The revision expression cannot be empty."
msgstr "このリビジョン表記を空にできません。"
#, python-format
msgid ""
"The submodule will be updated using\n"
"\"%s\""
msgstr ""
#, python-format
msgid "The worktree will be reset using \"git reset --keep %s\""
msgstr "このワークツリーは\"git reset --keep %s\"でリセットする。"
@@ -2252,40 +2351,46 @@ msgid ""
"This commit has already been published.\n"
"This operation will rewrite published history.\n"
"You probably don't want to do this."
msgstr "このコミットは既に発行済みです。\n"
msgstr ""
"このコミットは既に発行済みです。\n"
"この操作は、発行済履歴を上書きします。\n"
"この操作は、あなたが望んだ操作ではない可能性が高いです。"
msgid ""
"This operation drops uncommitted changes.\n"
"These changes cannot be recovered."
msgstr "この操作は、コミットしていない変更をドロップします。\n"
msgstr ""
"この操作は、コミットしていない変更をドロップします。\n"
"これらの変更は回復できません。"
msgid ""
"This operation removes uncommitted edits from selected files.\n"
"These changes cannot be recovered."
msgstr "この操作は、選択されたファイルのコミットされていない編集を削除します。\n"
msgstr ""
"この操作は、選択されたファイルのコミットされていない編集を削除します。\n"
"これらの変更は回復できません。"
msgid ""
"This operation removes unstaged edits from selected files.\n"
"These changes cannot be recovered."
msgstr "この操作は、選択されたファイルのステージされていない編集を削除します。\n"
msgstr ""
"この操作は、選択されたファイルのステージされていない編集を削除します。\n"
"これらの変更は回復できません。"
msgid ""
"This repository is currently being rebased.\n"
"Resolve conflicts, commit changes, and run:\n"
" Rebase > Continue"
msgstr "このリポジトリは現在リベースされています。\n"
msgstr ""
"このリポジトリは現在リベースされています。\n"
"衝突を解決し、変更をコミットして実行します。:\n"
" Rebase > Continue"
msgid ""
"This repository is in the middle of a merge.\n"
"Resolve conflicts and commit changes."
msgstr "このリポジトリはマージの中間です。\n"
msgstr ""
"このリポジトリはマージの中間です。\n"
"衝突を解決し、変更をコミットします。:"
msgid "Toggle Enabled"
@@ -2367,9 +2472,38 @@ msgstr "トラック解除済み"
msgid "Untracking: %s"
msgstr "トラック解除中:%s"
msgid "Update All Submodules..."
msgstr ""
msgid "Update Existing Branch:"
msgstr "既存のブランチを更新:"
#, fuzzy
msgid "Update Submodule"
msgstr "更新しました"
msgid "Update Submodule..."
msgstr ""
#, fuzzy
msgid "Update Submodules"
msgstr "サブモジュールを初期化する"
#, fuzzy
msgid "Update all submodules?"
msgstr "サブモジュールを初期化する"
#, fuzzy
msgid "Update submodules..."
msgstr "サブモジュールを初期化する"
#, fuzzy
msgid "Update this submodule"
msgstr "サブモジュールを初期化する"
msgid "Update this submodule?"
msgstr ""
msgid "Updating"
msgstr "更新"
@@ -2412,7 +2546,8 @@ msgstr "はい"
msgid ""
"You are in the middle of a merge.\n"
"Cannot amend while merging."
msgstr "マージ中です。\n"
msgstr ""
"マージ中です。\n"
"マージ中は訂正できません。"
msgid "You cannot rebase with uncommitted changes."
@@ -2469,6 +2604,15 @@ msgstr "不明"
msgid "vX.Y.Z"
msgstr "vX.Y.Z"
msgid "x 1"
msgstr ""
msgid "x 1.5"
msgstr ""
msgid "x 2"
msgstr ""
msgid "yyyy-MM-dd"
msgstr "yyyy-MM-dd"
@@ -3018,6 +3162,9 @@ msgstr "yyyy-MM-dd"
#~ msgid "Originally By:"
#~ msgstr "原作者:"
#~ msgid "PATCH %(current)d/%(count)d"
#~ msgstr "PATCH %(current)d/%(count)d"
#~ msgid "Packed objects waiting for pruning"
#~ msgstr "パックに存在するので捨てて良いオブジェクトの数"
@@ -3131,9 +3278,6 @@ msgstr "yyyy-MM-dd"
#~ "\n"
#~ "リセットしてよろしいですか?"
#~ msgid "Restore Defaults"
#~ msgstr "既定値に戻す"
#~ msgid "Revert changes in these %i files?"
#~ msgstr "これら %i 個のファイルにした変更を元に戻しますか?"
@@ -3206,6 +3350,9 @@ msgstr "yyyy-MM-dd"
#~ msgid "Success"
#~ msgstr "成功"
#~ msgid "Summary:"
#~ msgstr "要約:"
#~ msgid "The 'master' branch has not been initialized."
#~ msgstr "'master' ブランチが初期化されていません"
@@ -3319,9 +3466,6 @@ msgstr "yyyy-MM-dd"
#~ msgid "Unsupported spell checker"
#~ msgstr "サポートされていないスペルチェッカーです"
#~ msgid "Updated"
#~ msgstr "更新しました"
#~ msgid "Updating the Git index failed. A rescan will be automatically started to resynchronize git-gui."
#~ msgstr "GIT インデックスの更新が失敗しました。git-gui と同期をとるために再スキャンします。"
+121 -9
View File
@@ -417,6 +417,12 @@ msgstr "Wiek"
msgid "All Repositories"
msgstr "Wszystkie repozytoria"
#, python-format
msgid ""
"All submodules will be updated using\n"
"\"%s\""
msgstr ""
msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care"
msgstr ""
@@ -452,6 +458,12 @@ msgstr ""
"Zamiast tego zostanie utworzony niepodpisany, lekki znacznik.\n"
"Czy utworzyć niepodpisany znacznik?"
msgid "Appearance"
msgstr ""
msgid "Appearance settings require an application restart"
msgstr ""
msgid "Apply"
msgstr "Zastosuj"
@@ -481,6 +493,9 @@ msgstr "Autor"
msgid "Authors"
msgstr "Autor"
msgid "Auto"
msgstr ""
msgid "Auto-Wrap Lines"
msgstr "Zawijaj wiersze"
@@ -493,8 +508,8 @@ msgstr "Przeglądarka autorów"
msgid "Blame..."
msgstr "Przejrzyj autorów..."
msgid "Bold on dark headers instead of italic (restart required)"
msgstr "Czcionka pogrubiona z ciemnym tłem zamiast pochylonych nagłówków (wymagane ponowne uruchomienie)"
msgid "Bold on dark headers instead of italic"
msgstr "Czcionka pogrubiona z ciemnym tłem zamiast pochylonych nagłówków"
msgid "Branch"
msgstr "Gałąź"
@@ -798,6 +813,9 @@ msgstr "DAG..."
msgid "Date, Time"
msgstr "Data, czas"
msgid "Default"
msgstr ""
msgid "Delete"
msgstr "Usuń"
@@ -1009,6 +1027,14 @@ msgstr "Znaczenie \"%(revision)s\" jako \"%(name)s\""
msgid "Error running prepare-commitmsg hook"
msgstr ""
#, fuzzy, python-format
msgid "Error updating submodule %s"
msgstr "Błąd podczas tworzenia zdalnego repozytorium \"%s\""
#, fuzzy
msgid "Error updating submodules"
msgstr "Błąd edytowania pliku"
msgid "Error: Cannot find commit template"
msgstr "Błąd: Nie można znaleźć szablonu wdrożenia"
@@ -1132,6 +1158,30 @@ msgstr ""
msgid "Fixup Previous Commit"
msgstr "Poprawka do wcześniejszego wdrożenia"
msgid "Flat dark blue"
msgstr ""
msgid "Flat dark green"
msgstr ""
msgid "Flat dark grey"
msgstr ""
msgid "Flat dark red"
msgstr ""
msgid "Flat light blue"
msgstr ""
msgid "Flat light green"
msgstr ""
msgid "Flat light grey"
msgstr ""
msgid "Flat light red"
msgstr ""
msgid "Font Size"
msgstr "Rozmiar czcionki"
@@ -1169,6 +1219,9 @@ msgstr ""
msgid "GPG-sign the merge commit"
msgstr "Podpisz-GPG scalane wdrożenie"
msgid "GUI theme"
msgstr ""
#, python-format
msgid "Gathering info for \"%s\"..."
msgstr "Zbieranie informacji dla \"%s\"..."
@@ -1212,6 +1265,9 @@ msgstr ""
msgid "Hide Details.."
msgstr ""
msgid "High DPI"
msgstr ""
msgid "History Browser"
msgstr "Przeglądarka historii"
@@ -1240,6 +1296,9 @@ msgstr ""
msgid "Include tags "
msgstr "Uwzględnij znaczniki"
msgid "Indent Status paths"
msgstr ""
msgid "Indonesian translation"
msgstr ""
@@ -1462,6 +1521,10 @@ msgstr "Otwórz"
msgid "Open Git Repository..."
msgstr "Otwórz repozytorium Git..."
#, fuzzy
msgid "Open Parent"
msgstr "Otwórz z ostatnich"
msgid "Open Parent Directory"
msgstr "Otwórz katalog nadrzędny"
@@ -1494,10 +1557,6 @@ msgstr "Zastąpić \"%s\"?"
msgid "Overwrite File?"
msgstr "Zastąpić plik?"
#, python-format
msgid "PATCH %(current)d/%(count)d"
msgstr "ŁATA %(current)d/%(count)d"
msgid ""
"Parse arguments using a shell.\n"
"Queries with spaces will require \"double quotes\"."
@@ -2004,6 +2063,11 @@ msgstr "Ustaw domyślne repozytorium"
msgid "Set Upstream Branch"
msgstr "Ustaw źródło odgórne"
msgid ""
"Set the sort order for branches and tags.\n"
"Toggle between date-based and version-name-based sorting."
msgstr ""
msgid "Set upstream"
msgstr "Ustaw źródło odgórne"
@@ -2038,6 +2102,9 @@ msgstr "Pokaż pomoc"
msgid "Show History"
msgstr "Pokaż historię"
msgid "Show file counts in Status titles"
msgstr ""
msgid ""
"Show help\n"
"Shortcut: ?"
@@ -2184,15 +2251,15 @@ msgstr "Stan"
msgid "Stop tracking paths"
msgstr "Zaprzestań zarządzanie ścieżką/ścieżkami"
msgid "Submodules"
msgstr ""
msgid "Summarize Merge Commits"
msgstr "Podsumuj wdrożenia scalające"
msgid "Summary"
msgstr "Nazwa"
msgid "Summary:"
msgstr "Nazwa:"
msgid "Tab Width"
msgstr "Szerokość tabulacji"
@@ -2246,6 +2313,12 @@ msgstr "Zostaną usunięte następujące pliki:"
msgid "The revision expression cannot be empty."
msgstr "Wyrażenie wydania nie może być puste."
#, python-format
msgid ""
"The submodule will be updated using\n"
"\"%s\""
msgstr ""
#, fuzzy, python-format
msgid "The worktree will be reset using \"git reset --keep %s\""
msgstr "Drzewo robocze zostanie wyzerowane przy użyciu \"git reset --merge %s\""
@@ -2380,9 +2453,33 @@ msgstr "Niezarządzane"
msgid "Untracking: %s"
msgstr "Nie zarządzaj: %s"
msgid "Update All Submodules..."
msgstr ""
msgid "Update Existing Branch:"
msgstr "Uaktualnij bieżącą gałąź:"
msgid "Update Submodule"
msgstr ""
msgid "Update Submodule..."
msgstr ""
msgid "Update Submodules"
msgstr ""
msgid "Update all submodules?"
msgstr ""
msgid "Update submodules..."
msgstr ""
msgid "Update this submodule"
msgstr ""
msgid "Update this submodule?"
msgstr ""
msgid "Updating"
msgstr "Uaktualnianie"
@@ -2484,6 +2581,15 @@ msgstr "nieznany"
msgid "vX.Y.Z"
msgstr "vX.Y.Z"
msgid "x 1"
msgstr ""
msgid "x 1.5"
msgstr ""
msgid "x 2"
msgstr ""
msgid "yyyy-MM-dd"
msgstr "yyyy-MM-dd"
@@ -2536,6 +2642,9 @@ msgstr "yyyy-MM-dd"
#~ msgid "Output: %s"
#~ msgstr "Wynik: %s"
#~ msgid "PATCH %(current)d/%(count)d"
#~ msgstr "ŁATA %(current)d/%(count)d"
#~ msgid "Path to git repository"
#~ msgstr "Ścieżka do repozytorium git"
@@ -2555,6 +2664,9 @@ msgstr "yyyy-MM-dd"
#~ msgid "Staging Area"
#~ msgstr "Punkt zbiorczy"
#~ msgid "Summary:"
#~ msgstr "Nazwa:"
#~ msgid ""
#~ "This PyQt4 does not include QtWebKit.\n"
#~ "The keyboard shortcuts feature is unavailable."
+122 -9
View File
@@ -496,6 +496,12 @@ msgstr "Idade"
msgid "All Repositories"
msgstr "Todos os Repositórios"
#, python-format
msgid ""
"All submodules will be updated using\n"
"\"%s\""
msgstr ""
msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care"
msgstr "Permitir atualizações non-fast-forward. Usando \"force\" pode fazer com que o repositório perca commits; use com cuidado."
@@ -531,6 +537,12 @@ msgstr ""
"Uma tag leve e não assinada será criada.\n"
"Criar uma tag não assinada?"
msgid "Appearance"
msgstr ""
msgid "Appearance settings require an application restart"
msgstr ""
msgid "Apply"
msgstr "Aplicar"
@@ -558,6 +570,9 @@ msgstr "Autor"
msgid "Authors"
msgstr "Autores"
msgid "Auto"
msgstr ""
msgid "Auto-Wrap Lines"
msgstr "Auto-Quebra de Linhas"
@@ -570,8 +585,8 @@ msgstr "Visualizador de Blame"
msgid "Blame..."
msgstr "Blame..."
msgid "Bold on dark headers instead of italic (restart required)"
msgstr "Fonte em negrito com o fundo escuro em vez de cabeçalhos em itálico (necessita reiniciar)"
msgid "Bold on dark headers instead of italic"
msgstr "Fonte em negrito com o fundo escuro em vez de cabeçalhos em itálico"
msgid "Branch"
msgstr "Branch"
@@ -863,6 +878,9 @@ msgstr "Visualizar o histórico..."
msgid "Date, Time"
msgstr "Data, Tempo"
msgid "Default"
msgstr ""
msgid "Delete"
msgstr "Deletar"
@@ -1070,6 +1088,14 @@ msgstr "Erro renomeando \"%(name)s\" para \"%(new_name)s\""
msgid "Error running prepare-commitmsg hook"
msgstr "Erro executando prepare-commitmsg hook"
#, fuzzy, python-format
msgid "Error updating submodule %s"
msgstr "Erro criando o remoto \"%s\""
#, fuzzy
msgid "Error updating submodules"
msgstr "Erro Editando Arquivo"
msgid "Error: Cannot find commit template"
msgstr "Erro: Não foi possível encontrar o template do commit"
@@ -1192,6 +1218,30 @@ msgstr ""
msgid "Fixup Previous Commit"
msgstr "Fixup Commit Anterior"
msgid "Flat dark blue"
msgstr ""
msgid "Flat dark green"
msgstr ""
msgid "Flat dark grey"
msgstr ""
msgid "Flat dark red"
msgstr ""
msgid "Flat light blue"
msgstr ""
msgid "Flat light green"
msgstr ""
msgid "Flat light grey"
msgstr ""
msgid "Flat light red"
msgstr ""
msgid "Font Size"
msgstr "Tamanho de Fonte"
@@ -1227,6 +1277,9 @@ msgstr ""
msgid "GPG-sign the merge commit"
msgstr "Assinar com GPG o Commit de Merge"
msgid "GUI theme"
msgstr ""
#, python-format
msgid "Gathering info for \"%s\"..."
msgstr "Reunindo Informação de \"%s\"..."
@@ -1270,6 +1323,9 @@ msgstr "Ajuda - git-xbase"
msgid "Hide Details.."
msgstr "Esconder Detalhes..."
msgid "High DPI"
msgstr ""
msgid "History Browser"
msgstr "Navegador de Histórico"
@@ -1297,6 +1353,9 @@ msgstr "Ignorar nome do arquivo ou padrão"
msgid "Include tags "
msgstr "Incluir tags"
msgid "Indent Status paths"
msgstr ""
msgid "Indonesian translation"
msgstr ""
@@ -1519,6 +1578,10 @@ msgstr "Abrir"
msgid "Open Git Repository..."
msgstr "Abrir o Repositório Git"
#, fuzzy
msgid "Open Parent"
msgstr "Aberto Recentemente"
msgid "Open Parent Directory"
msgstr "Abrir Pasta Pai"
@@ -1551,10 +1614,6 @@ msgstr "Sobrescrever \"%s\"?"
msgid "Overwrite File?"
msgstr "Sobrescrever Arquivo?"
#, python-format
msgid "PATCH %(current)d/%(count)d"
msgstr ""
msgid ""
"Parse arguments using a shell.\n"
"Queries with spaces will require \"double quotes\"."
@@ -2041,6 +2100,11 @@ msgstr "Definir Repositório Padrão"
msgid "Set Upstream Branch"
msgstr "Definir Branch Upstream"
msgid ""
"Set the sort order for branches and tags.\n"
"Toggle between date-based and version-name-based sorting."
msgstr ""
msgid "Set upstream"
msgstr "Definir Upstream"
@@ -2076,6 +2140,9 @@ msgstr "Ajuda"
msgid "Show History"
msgstr "Ver Histórico..."
msgid "Show file counts in Status titles"
msgstr ""
msgid ""
"Show help\n"
"Shortcut: ?"
@@ -2220,15 +2287,15 @@ msgstr ""
msgid "Stop tracking paths"
msgstr "Parar rastreamento de caminhos"
msgid "Submodules"
msgstr ""
msgid "Summarize Merge Commits"
msgstr "Resumir os Commits de Merge"
msgid "Summary"
msgstr "Sumário"
msgid "Summary:"
msgstr "Sumário:"
msgid "Tab Width"
msgstr "Largura da Aba"
@@ -2283,6 +2350,12 @@ msgstr "Os arquivos a seguir serão apagados:"
msgid "The revision expression cannot be empty."
msgstr "A revisão da expressão não pode ser vazia"
#, python-format
msgid ""
"The submodule will be updated using\n"
"\"%s\""
msgstr ""
#, python-format
msgid "The worktree will be reset using \"git reset --keep %s\""
msgstr "O worktree será resetado usando \"git reset --keep %s\""
@@ -2415,9 +2488,37 @@ msgstr "Não rastreado"
msgid "Untracking: %s"
msgstr "Removendo rastreio: %s"
msgid "Update All Submodules..."
msgstr ""
msgid "Update Existing Branch:"
msgstr "Atualizar Branch Existente:"
msgid "Update Submodule"
msgstr ""
msgid "Update Submodule..."
msgstr ""
#, fuzzy
msgid "Update Submodules"
msgstr "Inicializar submodulos"
#, fuzzy
msgid "Update all submodules?"
msgstr "Inicializar submodulos"
#, fuzzy
msgid "Update submodules..."
msgstr "Inicializar submodulos"
#, fuzzy
msgid "Update this submodule"
msgstr "Inicializar submodulos"
msgid "Update this submodule?"
msgstr ""
msgid "Updating"
msgstr "Atualizando"
@@ -2518,6 +2619,15 @@ msgstr "desconhecido"
msgid "vX.Y.Z"
msgstr ""
msgid "x 1"
msgstr ""
msgid "x 1.5"
msgstr ""
msgid "x 2"
msgstr ""
msgid "yyyy-MM-dd"
msgstr ""
@@ -2591,5 +2701,8 @@ msgstr ""
#~ msgid "Select file from \"%s\""
#~ msgstr "Selecione um arquivo de \"%s\""
#~ msgid "Summary:"
#~ msgstr "Sumário:"
#~ msgid "Updating..."
#~ msgstr "Atualização..."
+119 -14
View File
@@ -419,6 +419,12 @@ msgstr "Возраст"
msgid "All Repositories"
msgstr "Все репозитории"
#, python-format
msgid ""
"All submodules will be updated using\n"
"\"%s\""
msgstr ""
msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care"
msgstr ""
@@ -454,6 +460,12 @@ msgstr ""
"Будет создан неподписанный, легкий тег.\n"
"Создать неподписанный тег??"
msgid "Appearance"
msgstr ""
msgid "Appearance settings require an application restart"
msgstr ""
msgid "Apply"
msgstr "Применить"
@@ -483,6 +495,9 @@ msgstr "Автор"
msgid "Authors"
msgstr "Автор"
msgid "Auto"
msgstr ""
msgid "Auto-Wrap Lines"
msgstr "Авто перенос строчек"
@@ -497,7 +512,7 @@ msgstr "Просмотр файла"
msgid "Blame..."
msgstr "Переименовать..."
msgid "Bold on dark headers instead of italic (restart required)"
msgid "Bold on dark headers instead of italic"
msgstr ""
msgid "Branch"
@@ -804,6 +819,10 @@ msgstr ""
msgid "Date, Time"
msgstr "Дата, Время"
#, fuzzy
msgid "Default"
msgstr "Восстановить настройки по умолчанию"
msgid "Delete"
msgstr "Удалить"
@@ -1018,6 +1037,14 @@ msgstr "Добавить тег \"%(revision)s\" к \"%(name)s\""
msgid "Error running prepare-commitmsg hook"
msgstr "Вызов программы поддержки репозитория pre-commit..."
#, fuzzy, python-format
msgid "Error updating submodule %s"
msgstr "Не удалось создать внешную ветвь \"%s\""
#, fuzzy
msgid "Error updating submodules"
msgstr "Ошибка редактирования файла"
msgid "Error: Cannot find commit template"
msgstr "Ошибка: Не получается найти шаблон коммита"
@@ -1139,6 +1166,30 @@ msgstr ""
msgid "Fixup Previous Commit"
msgstr "Исправить предыдущий коммит"
msgid "Flat dark blue"
msgstr ""
msgid "Flat dark green"
msgstr ""
msgid "Flat dark grey"
msgstr ""
msgid "Flat dark red"
msgstr ""
msgid "Flat light blue"
msgstr ""
msgid "Flat light green"
msgstr ""
msgid "Flat light grey"
msgstr ""
msgid "Flat light red"
msgstr ""
msgid "Font Size"
msgstr "Размер шрифта"
@@ -1176,6 +1227,9 @@ msgstr ""
msgid "GPG-sign the merge commit"
msgstr ""
msgid "GUI theme"
msgstr ""
#, python-format
msgid "Gathering info for \"%s\"..."
msgstr "Получение информации о \"%s\"..."
@@ -1219,6 +1273,9 @@ msgstr ""
msgid "Hide Details.."
msgstr ""
msgid "High DPI"
msgstr ""
msgid "History Browser"
msgstr "Просмотрщик истории"
@@ -1247,6 +1304,9 @@ msgstr ""
msgid "Include tags "
msgstr "Включая теги"
msgid "Indent Status paths"
msgstr ""
msgid "Indonesian translation"
msgstr ""
@@ -1472,6 +1532,10 @@ msgstr "Открыть"
msgid "Open Git Repository..."
msgstr "Открыть Git репозиторий..."
#, fuzzy
msgid "Open Parent"
msgstr "Открыть последний"
msgid "Open Parent Directory"
msgstr "Открыть родительский каталог"
@@ -1504,10 +1568,6 @@ msgstr "Перезаписать \"%s\"?"
msgid "Overwrite File?"
msgstr "Перезаписать файл?"
#, python-format
msgid "PATCH %(current)d/%(count)d"
msgstr ""
msgid ""
"Parse arguments using a shell.\n"
"Queries with spaces will require \"double quotes\"."
@@ -2017,6 +2077,11 @@ msgstr "Выбрать репозиторий..."
msgid "Set Upstream Branch"
msgstr "Выбрать"
msgid ""
"Set the sort order for branches and tags.\n"
"Toggle between date-based and version-name-based sorting."
msgstr ""
#, fuzzy
msgid "Set upstream"
msgstr "Выбрать"
@@ -2053,6 +2118,9 @@ msgstr "Показать справку"
msgid "Show History"
msgstr "Показать историю"
msgid "Show file counts in Status titles"
msgstr ""
msgid ""
"Show help\n"
"Shortcut: ?"
@@ -2200,15 +2268,15 @@ msgstr "Статус"
msgid "Stop tracking paths"
msgstr ""
msgid "Submodules"
msgstr ""
msgid "Summarize Merge Commits"
msgstr ""
msgid "Summary"
msgstr "Описание"
msgid "Summary:"
msgstr "Описание:"
msgid "Tab Width"
msgstr "Ширина табов"
@@ -2262,6 +2330,12 @@ msgstr "Следующие файлы будут удалены:"
msgid "The revision expression cannot be empty."
msgstr "Поле версии не может быть пустым."
#, python-format
msgid ""
"The submodule will be updated using\n"
"\"%s\""
msgstr ""
#, python-format
msgid "The worktree will be reset using \"git reset --keep %s\""
msgstr ""
@@ -2396,9 +2470,34 @@ msgstr "Не добавлены в контроль версий"
msgid "Untracking: %s"
msgstr "Не добавлено в контроль версий: %s"
msgid "Update All Submodules..."
msgstr ""
msgid "Update Existing Branch:"
msgstr "Обновить имеющуюся ветвь:"
#, fuzzy
msgid "Update Submodule"
msgstr "Обновлено"
msgid "Update Submodule..."
msgstr ""
msgid "Update Submodules"
msgstr ""
msgid "Update all submodules?"
msgstr ""
msgid "Update submodules..."
msgstr ""
msgid "Update this submodule"
msgstr ""
msgid "Update this submodule?"
msgstr ""
msgid "Updating"
msgstr "Обновление"
@@ -2500,6 +2599,15 @@ msgstr "неизвестно"
msgid "vX.Y.Z"
msgstr ""
msgid "x 1"
msgstr ""
msgid "x 1.5"
msgstr ""
msgid "x 2"
msgstr ""
msgid "yyyy-MM-dd"
msgstr ""
@@ -3205,9 +3313,6 @@ msgstr ""
#~ "\n"
#~ "Продолжить?"
#~ msgid "Restore Defaults"
#~ msgstr "Восстановить настройки по умолчанию"
#~ msgid "Revert changes in these %i files?"
#~ msgstr "Отменить изменения в %i файле(-ах)?"
@@ -3280,6 +3385,9 @@ msgstr ""
#~ msgid "Success"
#~ msgstr "Процесс успешно завершен"
#~ msgid "Summary:"
#~ msgstr "Описание:"
#~ msgid "The 'master' branch has not been initialized."
#~ msgstr "Не инициализирована ветвь 'master'."
@@ -3399,9 +3507,6 @@ msgstr ""
#~ msgid "Unsupported spell checker"
#~ msgstr "Неподдерживаемая программа проверки правописания"
#~ msgid "Updated"
#~ msgstr "Обновлено"
#~ msgid "Updating the Git index failed. A rescan will be automatically started to resynchronize git-gui."
#~ msgstr "Не удалось обновить индекс Git. Состояние репозитория будетперечитано автоматически."
+116 -14
View File
@@ -399,6 +399,12 @@ msgstr ""
msgid "All Repositories"
msgstr "Globalt (alla arkiv)"
#, python-format
msgid ""
"All submodules will be updated using\n"
"\"%s\""
msgstr ""
msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care"
msgstr ""
@@ -431,6 +437,12 @@ msgid ""
"Create an unsigned tag?"
msgstr ""
msgid "Appearance"
msgstr ""
msgid "Appearance settings require an application restart"
msgstr ""
#, fuzzy
msgid "Apply"
msgstr "Äpple"
@@ -461,6 +473,9 @@ msgstr "Författare:"
msgid "Authors"
msgstr "Författare:"
msgid "Auto"
msgstr ""
msgid "Auto-Wrap Lines"
msgstr ""
@@ -475,7 +490,7 @@ msgstr "Filvisare"
msgid "Blame..."
msgstr "Byt namn..."
msgid "Bold on dark headers instead of italic (restart required)"
msgid "Bold on dark headers instead of italic"
msgstr ""
msgid "Branch"
@@ -799,6 +814,10 @@ msgstr ""
msgid "Date, Time"
msgstr ""
#, fuzzy
msgid "Default"
msgstr "Återställ standardvärden"
msgid "Delete"
msgstr "Ta bort"
@@ -1038,6 +1057,14 @@ msgstr ""
msgid "Error running prepare-commitmsg hook"
msgstr "Anropar krok före incheckning..."
#, fuzzy, python-format
msgid "Error updating submodule %s"
msgstr "Fel vid inläsning av differens:"
#, fuzzy
msgid "Error updating submodules"
msgstr "Fel vid inläsning av differens:"
msgid "Error: Cannot find commit template"
msgstr ""
@@ -1170,6 +1197,30 @@ msgstr ""
msgid "Fixup Previous Commit"
msgstr "Incheckningsmeddelande för sammanslagning:"
msgid "Flat dark blue"
msgstr ""
msgid "Flat dark green"
msgstr ""
msgid "Flat dark grey"
msgstr ""
msgid "Flat dark red"
msgstr ""
msgid "Flat light blue"
msgstr ""
msgid "Flat light green"
msgstr ""
msgid "Flat light grey"
msgstr ""
msgid "Flat light red"
msgstr ""
msgid "Font Size"
msgstr "Storlek"
@@ -1205,6 +1256,9 @@ msgstr ""
msgid "GPG-sign the merge commit"
msgstr ""
msgid "GUI theme"
msgstr ""
#, fuzzy, python-format
msgid "Gathering info for \"%s\"..."
msgstr "Läser differens för %s..."
@@ -1249,6 +1303,9 @@ msgstr ""
msgid "Hide Details.."
msgstr ""
msgid "High DPI"
msgstr ""
#, fuzzy
msgid "History Browser"
msgstr "Filbläddrare"
@@ -1278,6 +1335,9 @@ msgstr ""
msgid "Include tags "
msgstr "Ta med taggar"
msgid "Indent Status paths"
msgstr ""
msgid "Indonesian translation"
msgstr ""
@@ -1525,6 +1585,10 @@ msgstr "Öppna"
msgid "Open Git Repository..."
msgstr "Öppna befintligt arkiv"
#, fuzzy
msgid "Open Parent"
msgstr "Öppna tidigare arkiv:"
#, fuzzy
msgid "Open Parent Directory"
msgstr "Öppna tidigare arkiv:"
@@ -1560,10 +1624,6 @@ msgstr ""
msgid "Overwrite File?"
msgstr ""
#, python-format
msgid "PATCH %(current)d/%(count)d"
msgstr ""
msgid ""
"Parse arguments using a shell.\n"
"Queries with spaces will require \"double quotes\"."
@@ -2107,6 +2167,11 @@ msgstr "Gitarkiv"
msgid "Set Upstream Branch"
msgstr "Välj"
msgid ""
"Set the sort order for branches and tags.\n"
"Toggle between date-based and version-name-based sorting."
msgstr ""
#, fuzzy
msgid "Set upstream"
msgstr "Välj"
@@ -2144,6 +2209,9 @@ msgstr "Hjälp"
msgid "Show History"
msgstr ""
msgid "Show file counts in Status titles"
msgstr ""
msgid ""
"Show help\n"
"Shortcut: ?"
@@ -2308,15 +2376,15 @@ msgstr ""
msgid "Stop tracking paths"
msgstr ""
msgid "Submodules"
msgstr ""
msgid "Summarize Merge Commits"
msgstr "Summera sammanslagningsincheckningar"
msgid "Summary"
msgstr ""
msgid "Summary:"
msgstr ""
msgid "Tab Width"
msgstr ""
@@ -2373,6 +2441,12 @@ msgstr ""
msgid "The revision expression cannot be empty."
msgstr "Revisionsuttrycket är tomt."
#, python-format
msgid ""
"The submodule will be updated using\n"
"\"%s\""
msgstr ""
#, python-format
msgid "The worktree will be reset using \"git reset --keep %s\""
msgstr ""
@@ -2497,9 +2571,34 @@ msgstr "Ej spårade, ej köade"
msgid "Untracking: %s"
msgstr ""
msgid "Update All Submodules..."
msgstr ""
msgid "Update Existing Branch:"
msgstr "Uppdatera befintlig gren:"
#, fuzzy
msgid "Update Submodule"
msgstr "Uppdaterad"
msgid "Update Submodule..."
msgstr ""
msgid "Update Submodules"
msgstr ""
msgid "Update all submodules?"
msgstr ""
msgid "Update submodules..."
msgstr ""
msgid "Update this submodule"
msgstr ""
msgid "Update this submodule?"
msgstr ""
#, fuzzy
msgid "Updating"
msgstr "Startar..."
@@ -2604,6 +2703,15 @@ msgstr ""
msgid "vX.Y.Z"
msgstr ""
msgid "x 1"
msgstr ""
msgid "x 1.5"
msgstr ""
msgid "x 2"
msgstr ""
msgid "yyyy-MM-dd"
msgstr ""
@@ -3283,9 +3391,6 @@ msgstr ""
#~ "\n"
#~ "Gå vidare med att återställa de aktuella ändringarna?"
#~ msgid "Restore Defaults"
#~ msgstr "Återställ standardvärden"
#~ msgid "Revert changes in these %i files?"
#~ msgstr "Återställ ändringarna i dessa %i filer?"
@@ -3474,9 +3579,6 @@ msgstr ""
#~ msgid "Unsupported spell checker"
#~ msgstr "Stavningskontrollprogrammet stöds inte"
#~ msgid "Updated"
#~ msgstr "Uppdaterad"
#~ msgid "Updating the Git index failed. A rescan will be automatically started to resynchronize git-gui."
#~ msgstr "Misslyckades med att uppdatera Gitindexet. En omsökning kommer att startas automatiskt för att synkronisera om git-gui."
+117 -8
View File
@@ -420,6 +420,12 @@ msgstr "Yaş"
msgid "All Repositories"
msgstr "Tüm Depolar"
#, python-format
msgid ""
"All submodules will be updated using\n"
"\"%s\""
msgstr ""
msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care"
msgstr ""
@@ -455,6 +461,12 @@ msgstr ""
"An unsigned, lightweight tag will be created instead.\n"
"Create an unsigned tag?"
msgid "Appearance"
msgstr ""
msgid "Appearance settings require an application restart"
msgstr ""
msgid "Apply"
msgstr "Apply"
@@ -484,6 +496,9 @@ msgstr "Author"
msgid "Authors"
msgstr "Author"
msgid "Auto"
msgstr ""
msgid "Auto-Wrap Lines"
msgstr "Auto-Wrap Lines"
@@ -498,7 +513,7 @@ msgstr "Branch Diff Viewer"
msgid "Blame..."
msgstr "Close..."
msgid "Bold on dark headers instead of italic (restart required)"
msgid "Bold on dark headers instead of italic"
msgstr ""
msgid "Branch"
@@ -804,6 +819,9 @@ msgstr "DAG..."
msgid "Date, Time"
msgstr "Date, Time"
msgid "Default"
msgstr ""
msgid "Delete"
msgstr "Sil"
@@ -1017,6 +1035,14 @@ msgstr "Tagging \"%(revision)s\" as \"%(name)s\""
msgid "Error running prepare-commitmsg hook"
msgstr ""
#, fuzzy, python-format
msgid "Error updating submodule %s"
msgstr "Uzak \"%s\" oluşturulurken hata"
#, fuzzy
msgid "Error updating submodules"
msgstr "Dosyayı Düzenlemede Hata"
msgid "Error: Cannot find commit template"
msgstr "Hata: İşleme şablonu bulunamadı"
@@ -1139,6 +1165,30 @@ msgstr ""
msgid "Fixup Previous Commit"
msgstr "Fixup Previous Commit"
msgid "Flat dark blue"
msgstr ""
msgid "Flat dark green"
msgstr ""
msgid "Flat dark grey"
msgstr ""
msgid "Flat dark red"
msgstr ""
msgid "Flat light blue"
msgstr ""
msgid "Flat light green"
msgstr ""
msgid "Flat light grey"
msgstr ""
msgid "Flat light red"
msgstr ""
msgid "Font Size"
msgstr "Font Size"
@@ -1176,6 +1226,9 @@ msgstr ""
msgid "GPG-sign the merge commit"
msgstr "GPG-sign the merge commit"
msgid "GUI theme"
msgstr ""
#, python-format
msgid "Gathering info for \"%s\"..."
msgstr "Gathering info for \"%s\"..."
@@ -1219,6 +1272,9 @@ msgstr ""
msgid "Hide Details.."
msgstr ""
msgid "High DPI"
msgstr ""
msgid "History Browser"
msgstr "Geçmiş Görüntüleyici"
@@ -1247,6 +1303,9 @@ msgstr ""
msgid "Include tags "
msgstr "Include tags "
msgid "Indent Status paths"
msgstr ""
msgid "Indonesian translation"
msgstr ""
@@ -1471,6 +1530,10 @@ msgstr "Open"
msgid "Open Git Repository..."
msgstr "Open Git Repository..."
#, fuzzy
msgid "Open Parent"
msgstr "Open Recent"
msgid "Open Parent Directory"
msgstr "Üst Klasörü Aç"
@@ -1503,10 +1566,6 @@ msgstr "Overwrite \"%s\"?"
msgid "Overwrite File?"
msgstr "Overwrite File?"
#, python-format
msgid "PATCH %(current)d/%(count)d"
msgstr ""
msgid ""
"Parse arguments using a shell.\n"
"Queries with spaces will require \"double quotes\"."
@@ -2014,6 +2073,11 @@ msgstr "Select Repository..."
msgid "Set Upstream Branch"
msgstr "Select New Upstream"
msgid ""
"Set the sort order for branches and tags.\n"
"Toggle between date-based and version-name-based sorting."
msgstr ""
#, fuzzy
msgid "Set upstream"
msgstr "Select New Upstream"
@@ -2050,6 +2114,9 @@ msgstr "Yardımı Göster"
msgid "Show History"
msgstr "Show history"
msgid "Show file counts in Status titles"
msgstr ""
msgid ""
"Show help\n"
"Shortcut: ?"
@@ -2196,15 +2263,15 @@ msgstr "Durum"
msgid "Stop tracking paths"
msgstr "Stop tracking paths"
msgid "Submodules"
msgstr ""
msgid "Summarize Merge Commits"
msgstr "Summarize Merge Commits"
msgid "Summary"
msgstr "Summary"
msgid "Summary:"
msgstr "Özet:"
msgid "Tab Width"
msgstr "Tab Width"
@@ -2258,6 +2325,12 @@ msgstr "Aşağıdaki satırlar silinecek:"
msgid "The revision expression cannot be empty."
msgstr "The revision expression cannot be empty."
#, python-format
msgid ""
"The submodule will be updated using\n"
"\"%s\""
msgstr ""
#, python-format
msgid "The worktree will be reset using \"git reset --keep %s\""
msgstr ""
@@ -2392,9 +2465,33 @@ msgstr "Takip Edilmemiş"
msgid "Untracking: %s"
msgstr "Untracking: %s"
msgid "Update All Submodules..."
msgstr ""
msgid "Update Existing Branch:"
msgstr "Update Existing Branch:"
msgid "Update Submodule"
msgstr ""
msgid "Update Submodule..."
msgstr ""
msgid "Update Submodules"
msgstr ""
msgid "Update all submodules?"
msgstr ""
msgid "Update submodules..."
msgstr ""
msgid "Update this submodule"
msgstr ""
msgid "Update this submodule?"
msgstr ""
msgid "Updating"
msgstr "Updating"
@@ -2496,6 +2593,15 @@ msgstr "unknown"
msgid "vX.Y.Z"
msgstr "vX.Y.Z"
msgid "x 1"
msgstr ""
msgid "x 1.5"
msgstr ""
msgid "x 2"
msgstr ""
msgid "yyyy-MM-dd"
msgstr "yyyy-MM-dd"
@@ -2573,6 +2679,9 @@ msgstr "yyyy-MM-dd"
#~ msgid "Staging Area"
#~ msgstr "Staging Area"
#~ msgid "Summary:"
#~ msgstr "Özet:"
#~ msgid ""
#~ "This PyQt4 does not include QtWebKit.\n"
#~ "The keyboard shortcuts feature is unavailable."
+121 -9
View File
@@ -456,6 +456,12 @@ msgstr "Вік"
msgid "All Repositories"
msgstr "Всі репозиторіїї"
#, python-format
msgid ""
"All submodules will be updated using\n"
"\"%s\""
msgstr ""
msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care"
msgstr "Дозволити оновлення без перемотки. Використання \"примусу\" може призвести до того, що віддалений репозиторій втратить коміти; використовйте це з обережністю"
@@ -491,6 +497,12 @@ msgstr ""
"Замість цього буде створено легкий непідписаний теґ.\n"
"Створити непідписаний теґ?"
msgid "Appearance"
msgstr ""
msgid "Appearance settings require an application restart"
msgstr ""
msgid "Apply"
msgstr "Застосувати"
@@ -519,6 +531,9 @@ msgstr "Автор"
msgid "Authors"
msgstr "Автори"
msgid "Auto"
msgstr ""
msgid "Auto-Wrap Lines"
msgstr "Авто-перенос рядків"
@@ -531,8 +546,8 @@ msgstr "Переглядач анотацій (blame)"
msgid "Blame..."
msgstr "Анотувати (blame)..."
msgid "Bold on dark headers instead of italic (restart required)"
msgstr "Напівжирний з темним фоном шрифт замість заголовків курсивом (потрібне перезавантаження)"
msgid "Bold on dark headers instead of italic"
msgstr "Напівжирний з темним фоном шрифт замість заголовків курсивом"
msgid "Branch"
msgstr "Гілка"
@@ -833,6 +848,9 @@ msgstr "Граф (DAG)..."
msgid "Date, Time"
msgstr "Дата, час"
msgid "Default"
msgstr ""
msgid "Delete"
msgstr "Видалити"
@@ -1043,6 +1061,14 @@ msgstr "Позначення \"%(revision)s\" як \"%(name)s\""
msgid "Error running prepare-commitmsg hook"
msgstr "Помилка застосування prepare-commitmsg гака (hook)"
#, fuzzy, python-format
msgid "Error updating submodule %s"
msgstr "Не вдалось створити віддалений репозиторій \"%s\""
#, fuzzy
msgid "Error updating submodules"
msgstr "Помилка редагування файла"
msgid "Error: Cannot find commit template"
msgstr "Помилка: Не вдається знайти шаблон коміту"
@@ -1164,6 +1190,30 @@ msgstr ""
msgid "Fixup Previous Commit"
msgstr "Виправити попередній коміт"
msgid "Flat dark blue"
msgstr ""
msgid "Flat dark green"
msgstr ""
msgid "Flat dark grey"
msgstr ""
msgid "Flat dark red"
msgstr ""
msgid "Flat light blue"
msgstr ""
msgid "Flat light green"
msgstr ""
msgid "Flat light grey"
msgstr ""
msgid "Flat light red"
msgstr ""
msgid "Font Size"
msgstr "Розмір шрифта"
@@ -1200,6 +1250,9 @@ msgstr "Французький переклад"
msgid "GPG-sign the merge commit"
msgstr "Підписати-GPG коміт злиття"
msgid "GUI theme"
msgstr ""
#, python-format
msgid "Gathering info for \"%s\"..."
msgstr "Збирання інформації для \"%s\"..."
@@ -1243,6 +1296,9 @@ msgstr ""
msgid "Hide Details.."
msgstr ""
msgid "High DPI"
msgstr ""
msgid "History Browser"
msgstr "Переглядач історії"
@@ -1272,6 +1328,9 @@ msgstr "Ігнорувати ім'я файлу або шаблон"
msgid "Include tags "
msgstr "Включити теґ"
msgid "Indent Status paths"
msgstr ""
msgid "Indonesian translation"
msgstr "Індонезійський переклад"
@@ -1491,6 +1550,10 @@ msgstr "Відкрити"
msgid "Open Git Repository..."
msgstr "Відкрити Git репозиторій..."
#, fuzzy
msgid "Open Parent"
msgstr "Відкрити останній"
msgid "Open Parent Directory"
msgstr "Відкрити батьківський каталог"
@@ -1523,10 +1586,6 @@ msgstr "Перезаписати \"%s\"?"
msgid "Overwrite File?"
msgstr "Перезаписати файл?"
#, python-format
msgid "PATCH %(current)d/%(count)d"
msgstr "Латка %(current)d/%(count)d"
msgid ""
"Parse arguments using a shell.\n"
"Queries with spaces will require \"double quotes\"."
@@ -2023,6 +2082,11 @@ msgstr "Встановити репозиторій за замовчуванн
msgid "Set Upstream Branch"
msgstr "Встановити віддалене джерело"
msgid ""
"Set the sort order for branches and tags.\n"
"Toggle between date-based and version-name-based sorting."
msgstr ""
msgid "Set upstream"
msgstr "Встановити віддалене джерело"
@@ -2057,6 +2121,9 @@ msgstr "Показати допомогу"
msgid "Show History"
msgstr "Показати історію"
msgid "Show file counts in Status titles"
msgstr ""
msgid ""
"Show help\n"
"Shortcut: ?"
@@ -2204,15 +2271,15 @@ msgstr "Статус"
msgid "Stop tracking paths"
msgstr "Перестати відслідковувати виділене"
msgid "Submodules"
msgstr ""
msgid "Summarize Merge Commits"
msgstr "Підсумувати коміти злиття"
msgid "Summary"
msgstr "Опис"
msgid "Summary:"
msgstr "Підсумок:"
msgid "Tab Width"
msgstr "Ширина табуляції"
@@ -2266,6 +2333,12 @@ msgstr "Наступні файли будуть видалені:"
msgid "The revision expression cannot be empty."
msgstr "Поле ревізії не може бути порожнім."
#, python-format
msgid ""
"The submodule will be updated using\n"
"\"%s\""
msgstr ""
#, fuzzy, python-format
msgid "The worktree will be reset using \"git reset --keep %s\""
msgstr "Робче дерево буде скинуто, використовуючи \"git reset --merge %s\""
@@ -2399,9 +2472,33 @@ msgstr "Не відслідковується"
msgid "Untracking: %s"
msgstr "Видалення зі списку файлів, що відслідковуються: %s"
msgid "Update All Submodules..."
msgstr ""
msgid "Update Existing Branch:"
msgstr "Оновити існуючу гілку:"
msgid "Update Submodule"
msgstr ""
msgid "Update Submodule..."
msgstr ""
msgid "Update Submodules"
msgstr ""
msgid "Update all submodules?"
msgstr ""
msgid "Update submodules..."
msgstr ""
msgid "Update this submodule"
msgstr ""
msgid "Update this submodule?"
msgstr ""
msgid "Updating"
msgstr "Оновлення"
@@ -2502,6 +2599,15 @@ msgstr "невідомий"
msgid "vX.Y.Z"
msgstr "vX.Y.Z"
msgid "x 1"
msgstr ""
msgid "x 1.5"
msgstr ""
msgid "x 2"
msgstr ""
msgid "yyyy-MM-dd"
msgstr "рррр-ММ-дд"
@@ -2542,6 +2648,9 @@ msgstr "рррр-ММ-дд"
#~ msgid "Output: %s"
#~ msgstr "Вивід: %s"
#~ msgid "PATCH %(current)d/%(count)d"
#~ msgstr "Латка %(current)d/%(count)d"
#~ msgid "Rename remote?"
#~ msgstr "Перейменувати віддалений репозиторій?"
@@ -2551,6 +2660,9 @@ msgstr "рррр-ММ-дд"
#~ msgid "Select file from \"%s\""
#~ msgstr "Вибрати файл з \"%s\""
#~ msgid "Summary:"
#~ msgstr "Підсумок:"
#~ msgid "git clone returned exit code %s"
#~ msgstr "git clone завершилась з кодом %s"
+123 -15
View File
@@ -437,6 +437,12 @@ msgstr "修改时间"
msgid "All Repositories"
msgstr "全部版本库"
#, python-format
msgid ""
"All submodules will be updated using\n"
"\"%s\""
msgstr ""
msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care"
msgstr ""
@@ -472,6 +478,12 @@ msgstr ""
"一个无签名的轻量标签会取而代之.\n"
"创建无签名标签吗?"
msgid "Appearance"
msgstr ""
msgid "Appearance settings require an application restart"
msgstr ""
msgid "Apply"
msgstr "应用"
@@ -500,6 +512,9 @@ msgstr "作者"
msgid "Authors"
msgstr "作者"
msgid "Auto"
msgstr ""
msgid "Auto-Wrap Lines"
msgstr "自动换行"
@@ -512,8 +527,8 @@ msgstr "问责查看器"
msgid "Blame..."
msgstr "问责..."
msgid "Bold on dark headers instead of italic (restart required)"
msgstr "暗色背景粗体字体而斜体头部 (需要重启)"
msgid "Bold on dark headers instead of italic"
msgstr "暗色背景粗体字体而斜体头部"
msgid "Branch"
msgstr "分支"
@@ -813,6 +828,10 @@ msgstr "历史视图..."
msgid "Date, Time"
msgstr "日期, 时间"
#, fuzzy
msgid "Default"
msgstr "恢复默认值"
msgid "Delete"
msgstr "删除"
@@ -1022,6 +1041,14 @@ msgstr "标记 \"%(revision)s\" 为 \"%(name)s\""
msgid "Error running prepare-commitmsg hook"
msgstr ""
#, fuzzy, python-format
msgid "Error updating submodule %s"
msgstr "创建远端 \"%s\" 出错"
#, fuzzy
msgid "Error updating submodules"
msgstr "编辑文件出错"
msgid "Error: Cannot find commit template"
msgstr "错误:无法找到提交模板"
@@ -1140,6 +1167,30 @@ msgstr ""
msgid "Fixup Previous Commit"
msgstr "修正前一次提交"
msgid "Flat dark blue"
msgstr ""
msgid "Flat dark green"
msgstr ""
msgid "Flat dark grey"
msgstr ""
msgid "Flat dark red"
msgstr ""
msgid "Flat light blue"
msgstr ""
msgid "Flat light green"
msgstr ""
msgid "Flat light grey"
msgstr ""
msgid "Flat light red"
msgstr ""
msgid "Font Size"
msgstr "字体大小"
@@ -1176,6 +1227,9 @@ msgstr "法语翻译"
msgid "GPG-sign the merge commit"
msgstr "GPG 签名合并提交"
msgid "GUI theme"
msgstr ""
#, python-format
msgid "Gathering info for \"%s\"..."
msgstr "为 \"%s\" 收集信息..."
@@ -1219,6 +1273,9 @@ msgstr ""
msgid "Hide Details.."
msgstr ""
msgid "High DPI"
msgstr ""
msgid "History Browser"
msgstr "历史浏览器"
@@ -1247,6 +1304,9 @@ msgstr "忽略文件名或匹配模式"
msgid "Include tags "
msgstr "包含标签 "
msgid "Indent Status paths"
msgstr ""
msgid "Indonesian translation"
msgstr "印尼语翻译"
@@ -1468,6 +1528,10 @@ msgstr "打开"
msgid "Open Git Repository..."
msgstr "打开已有版本库..."
#, fuzzy
msgid "Open Parent"
msgstr "打开最近版本库"
msgid "Open Parent Directory"
msgstr "打开上级目录"
@@ -1500,10 +1564,6 @@ msgstr "覆盖 \"%s\" 吗?"
msgid "Overwrite File?"
msgstr "覆盖文件吗?"
#, python-format
msgid "PATCH %(current)d/%(count)d"
msgstr "补丁 %(current)d/%(count)d"
msgid ""
"Parse arguments using a shell.\n"
"Queries with spaces will require \"double quotes\"."
@@ -2000,6 +2060,11 @@ msgstr "选择默认版本库"
msgid "Set Upstream Branch"
msgstr "设置上游"
msgid ""
"Set the sort order for branches and tags.\n"
"Toggle between date-based and version-name-based sorting."
msgstr ""
msgid "Set upstream"
msgstr "设置上游"
@@ -2034,6 +2099,9 @@ msgstr "显示帮助"
msgid "Show History"
msgstr "显示历史"
msgid "Show file counts in Status titles"
msgstr ""
msgid ""
"Show help\n"
"Shortcut: ?"
@@ -2181,15 +2249,15 @@ msgstr "状态"
msgid "Stop tracking paths"
msgstr "停止跟踪路径"
msgid "Submodules"
msgstr ""
msgid "Summarize Merge Commits"
msgstr "概述合并提交"
msgid "Summary"
msgstr "概要"
msgid "Summary:"
msgstr "概要:"
msgid "Tab Width"
msgstr "Tab 宽度"
@@ -2243,6 +2311,12 @@ msgstr "如下文件会被删除:"
msgid "The revision expression cannot be empty."
msgstr "版本表达式不能为空."
#, python-format
msgid ""
"The submodule will be updated using\n"
"\"%s\""
msgstr ""
#, python-format
msgid "The worktree will be reset using \"git reset --keep %s\""
msgstr ""
@@ -2376,9 +2450,34 @@ msgstr "未跟踪"
msgid "Untracking: %s"
msgstr "跟踪: %s"
msgid "Update All Submodules..."
msgstr ""
msgid "Update Existing Branch:"
msgstr "更新已有分支:"
#, fuzzy
msgid "Update Submodule"
msgstr "已更新"
msgid "Update Submodule..."
msgstr ""
msgid "Update Submodules"
msgstr ""
msgid "Update all submodules?"
msgstr ""
msgid "Update submodules..."
msgstr ""
msgid "Update this submodule"
msgstr ""
msgid "Update this submodule?"
msgstr ""
msgid "Updating"
msgstr "更新"
@@ -2479,6 +2578,15 @@ msgstr "未知"
msgid "vX.Y.Z"
msgstr "vX.Y.Z"
msgid "x 1"
msgstr ""
msgid "x 1.5"
msgstr ""
msgid "x 2"
msgstr ""
msgid "yyyy-MM-dd"
msgstr "yyyy-MM-dd"
@@ -3058,6 +3166,9 @@ msgstr "yyyy-MM-dd"
#~ msgid "Output: %s"
#~ msgstr "输出: %s"
#~ msgid "PATCH %(current)d/%(count)d"
#~ msgstr "补丁 %(current)d/%(count)d"
#~ msgid "Packed objects waiting for pruning"
#~ msgstr "压缩对象等待清理"
@@ -3181,9 +3292,6 @@ msgstr "yyyy-MM-dd"
#~ "\n"
#~ "是否要继续复位当前的改动?"
#~ msgid "Restore Defaults"
#~ msgstr "恢复默认值"
#~ msgid "Revert Uncommitted Changes..."
#~ msgstr "撤销未提交修改..."
@@ -3247,6 +3355,9 @@ msgstr "yyyy-MM-dd"
#~ msgid "Success"
#~ msgstr "成功"
#~ msgid "Summary:"
#~ msgstr "概要:"
#~ msgid "The 'master' branch has not been initialized."
#~ msgstr "'master'分支尚未初始化."
@@ -3358,9 +3469,6 @@ msgstr "yyyy-MM-dd"
#~ msgid "Unstage Hunk From Commit"
#~ msgstr "从提交中撤除修改块"
#~ msgid "Updated"
#~ msgstr "已更新"
#~ msgid "Updating the Git index failed. A rescan will be automatically started to resynchronize git-gui."
#~ msgstr "更新 Git 缓存(Index)失败, 重新扫描将自动开始以重新同步 git-gui."
+127 -15
View File
@@ -503,6 +503,12 @@ msgstr "建立時間"
msgid "All Repositories"
msgstr "所有的版控庫"
#, python-format
msgid ""
"All submodules will be updated using\n"
"\"%s\""
msgstr ""
msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care"
msgstr "允許非快速前移式更新。使用「強制」可能會造成遠端版控庫遺失修訂版提交;請小心使用"
@@ -538,6 +544,12 @@ msgstr ""
"一個無簽名的,輕量的標籤將會被建立。\n"
"要建立此無簽名的標籤嗎?"
msgid "Appearance"
msgstr ""
msgid "Appearance settings require an application restart"
msgstr ""
msgid "Apply"
msgstr "套用"
@@ -565,6 +577,9 @@ msgstr "作者"
msgid "Authors"
msgstr "作者群"
msgid "Auto"
msgstr ""
msgid "Auto-Wrap Lines"
msgstr "自動折行"
@@ -577,8 +592,8 @@ msgstr "指謫(blame)查看器"
msgid "Blame..."
msgstr "指摘(Blame)..."
msgid "Bold on dark headers instead of italic (restart required)"
msgstr "標題用帶深色底色的粗體而非斜體(需要重新啟動應用軟體設定才會生效)"
msgid "Bold on dark headers instead of italic"
msgstr "標題用帶深色底色的粗體而非斜體"
msgid "Branch"
msgstr "分支"
@@ -871,6 +886,10 @@ msgstr "有向無環圖(DAG)……"
msgid "Date, Time"
msgstr "時間,日期"
#, fuzzy
msgid "Default"
msgstr "恢復默認值"
msgid "Delete"
msgstr "移除"
@@ -1076,6 +1095,14 @@ msgstr "將「%(name)s」更名為「%(new_name)s」時發生錯誤"
msgid "Error running prepare-commitmsg hook"
msgstr "執行 prepare-commitmsg 掛勾程式時發生錯誤"
#, fuzzy, python-format
msgid "Error updating submodule %s"
msgstr "建立「%s」遠端分支時發生錯誤"
#, fuzzy
msgid "Error updating submodules"
msgstr "編輯檔案發生錯誤"
msgid "Error: Cannot find commit template"
msgstr "錯誤:無法找到修訂版提交範本"
@@ -1197,6 +1224,30 @@ msgstr "修理"
msgid "Fixup Previous Commit"
msgstr "修理先前的修訂版提交"
msgid "Flat dark blue"
msgstr ""
msgid "Flat dark green"
msgstr ""
msgid "Flat dark grey"
msgstr ""
msgid "Flat dark red"
msgstr ""
msgid "Flat light blue"
msgstr ""
msgid "Flat light green"
msgstr ""
msgid "Flat light grey"
msgstr ""
msgid "Flat light red"
msgstr ""
msgid "Font Size"
msgstr "字體大小"
@@ -1232,6 +1283,9 @@ msgstr "法語翻譯"
msgid "GPG-sign the merge commit"
msgstr "用 GPG 簽署合併修訂版提交"
msgid "GUI theme"
msgstr ""
#, python-format
msgid "Gathering info for \"%s\"..."
msgstr "正在蒐集「%s」遠端版控庫的資訊……"
@@ -1275,6 +1329,9 @@ msgstr "尋求幫助 - git-xbase"
msgid "Hide Details.."
msgstr "隱藏詳細資訊……"
msgid "High DPI"
msgstr ""
msgid "History Browser"
msgstr "變更紀錄瀏覽器"
@@ -1302,6 +1359,9 @@ msgstr "忽略檔案名稱或是式樣"
msgid "Include tags "
msgstr "包含標籤 "
msgid "Indent Status paths"
msgstr ""
msgid "Indonesian translation"
msgstr "印度尼西亞語翻譯"
@@ -1522,6 +1582,10 @@ msgstr "開啟"
msgid "Open Git Repository..."
msgstr "開啟一個 Git 版控庫……"
#, fuzzy
msgid "Open Parent"
msgstr "打開最近使用的版控庫"
msgid "Open Parent Directory"
msgstr "開啟上一層目錄"
@@ -1553,10 +1617,6 @@ msgstr "要覆寫「%s」嗎?"
msgid "Overwrite File?"
msgstr "要覆寫檔案嗎?"
#, python-format
msgid "PATCH %(current)d/%(count)d"
msgstr "正在套用 %(current)d/%(count)d 修正"
msgid ""
"Parse arguments using a shell.\n"
"Queries with spaces will require \"double quotes\"."
@@ -2037,6 +2097,11 @@ msgstr "設定預設版控庫"
msgid "Set Upstream Branch"
msgstr "設為上游追蹤分支"
msgid ""
"Set the sort order for branches and tags.\n"
"Toggle between date-based and version-name-based sorting."
msgstr ""
msgid "Set upstream"
msgstr "設為上游追蹤分支"
@@ -2070,6 +2135,9 @@ msgstr "顯示幫助訊息"
msgid "Show History"
msgstr "檢視變更紀錄"
msgid "Show file counts in Status titles"
msgstr ""
msgid ""
"Show help\n"
"Shortcut: ?"
@@ -2213,15 +2281,15 @@ msgstr "狀態"
msgid "Stop tracking paths"
msgstr "停止追蹤路徑"
msgid "Submodules"
msgstr ""
msgid "Summarize Merge Commits"
msgstr "概述合併進來的內容提交(commit)"
msgid "Summary"
msgstr "總結"
msgid "Summary:"
msgstr "總結:"
msgid "Tab Width"
msgstr "Tab 字元的顯示寬度"
@@ -2275,6 +2343,12 @@ msgstr "下列檔案將會被移除:"
msgid "The revision expression cannot be empty."
msgstr "修訂版表達式不可以是空的。"
#, python-format
msgid ""
"The submodule will be updated using\n"
"\"%s\""
msgstr ""
#, python-format
msgid "The worktree will be reset using \"git reset --keep %s\""
msgstr "工作目錄樹將被用「git reset --keep %s」命令重設"
@@ -2407,9 +2481,38 @@ msgstr "未納入版本追蹤"
msgid "Untracking: %s"
msgstr "正在將「%s」移出新修訂版準備區域"
msgid "Update All Submodules..."
msgstr ""
msgid "Update Existing Branch:"
msgstr "是否更新既有分支:"
#, fuzzy
msgid "Update Submodule"
msgstr "已更新"
msgid "Update Submodule..."
msgstr ""
#, fuzzy
msgid "Update Submodules"
msgstr "初始化子模組"
#, fuzzy
msgid "Update all submodules?"
msgstr "初始化子模組"
#, fuzzy
msgid "Update submodules..."
msgstr "初始化子模組"
#, fuzzy
msgid "Update this submodule"
msgstr "初始化子模組"
msgid "Update this submodule?"
msgstr ""
msgid "Updating"
msgstr "正在更新"
@@ -2510,6 +2613,15 @@ msgstr "未知使用者"
msgid "vX.Y.Z"
msgstr "X.Y.Z版本"
msgid "x 1"
msgstr ""
msgid "x 1.5"
msgstr ""
msgid "x 2"
msgstr ""
msgid "yyyy-MM-dd"
msgstr "yyyy-MM-dd"
@@ -3090,6 +3202,9 @@ msgstr "yyyy-MM-dd"
#~ msgid "Output: %s"
#~ msgstr "輸出:%s"
#~ msgid "PATCH %(current)d/%(count)d"
#~ msgstr "正在套用 %(current)d/%(count)d 修正"
#~ msgid "Packed objects waiting for pruning"
#~ msgstr "壓縮對象等待清理"
@@ -3216,9 +3331,6 @@ msgstr "yyyy-MM-dd"
#~ "\n"
#~ "是否要繼續復位當前的改動?"
#~ msgid "Restore Defaults"
#~ msgstr "恢復默認值"
#~ msgid "Revert Uncommitted Changes..."
#~ msgstr "撤銷尚未建立修訂版提交的內容變動"
@@ -3282,6 +3394,9 @@ msgstr "yyyy-MM-dd"
#~ msgid "Success"
#~ msgstr "成功"
#~ msgid "Summary:"
#~ msgstr "總結:"
#~ msgid "The 'master' branch has not been initialized."
#~ msgstr "'master'分支尚未初始化."
@@ -3393,9 +3508,6 @@ msgstr "yyyy-MM-dd"
#~ msgid "Unstage Hunk From Commit"
#~ msgstr "從提交中撤除修改塊"
#~ msgid "Updated"
#~ msgstr "已更新"
#~ msgid "Updating the Git index failed. A rescan will be automatically started to resynchronize git-gui."
#~ msgstr "更新 Git 緩存(Index)失敗, 重新掃瞄將自動開始以重新同步 git-gui."
+10
View File
@@ -37,6 +37,16 @@ Usability, bells and whistles
* `git cola` now has built-in support for HiDPI displays by enabling
Qt's 5.6's `QT_AUTO_SCREEN_SCALE_FACTOR` feature.
* `git cola` now uses HiDPI pixmaps when rendering icons, and the builtin
icons have been updated to look sharp when displayed in HiDPI.
(`#932 <https://github.com/git-cola/git-cola/pull/932>`_)
Development
-----------
* The contribution guidelines for contributors has been updated to mention
how to regenerate the `*.mo` message files.
(`#934 <https://github.com/git-cola/git-cola/pull/934>`_)
.. _v3.3:
git-cola v3.3
+1
View File
@@ -87,6 +87,7 @@ Thanks
* jfessard
* JiCiT
* Jimmy M. Coleman
* Joachim Lusiardi
* Johannes Löhnert
* Johann Schmitz
* Jordan Bedwell