[gitg] Update Simplified Chinese translation.
- From: Aron Xu <aronxu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gitg] Update Simplified Chinese translation.
- Date: Tue, 16 Aug 2011 15:06:47 +0000 (UTC)
commit a1ac9cb0bbaccac2f439a9b2639d884385e997a3
Author: Yingua Wang <wantinghard gmail com>
Date: Tue Aug 16 15:06:34 2011 +0000
Update Simplified Chinese translation.
po/zh_CN.po | 717 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 472 insertions(+), 245 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a2b6e27..30ba2a9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: gitg master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=gitg&component=gitg\n"
-"POT-Creation-Date: 2010-07-22 11:34+0000\n"
-"PO-Revision-Date: 2010-07-27 16:33+0800\n"
+"product=gitg&keywords=I18N+L10N&component=gitg\n"
+"POT-Creation-Date: 2011-08-06 17:00+0000\n"
+"PO-Revision-Date: 2011-08-16 15:05+0000\n"
"Last-Translator: lainme <lainme993 gmail com>\n"
"Language-Team: Chinese (China) <i18n-zh googlegroups com>\n"
"MIME-Version: 1.0\n"
@@ -21,49 +21,64 @@ msgid "Git repository browser"
msgstr "Git çæåæèå"
#. Translators: this is the application name as in g_set_application_name
-#: ../data/gitg.desktop.in.in.h:2 ../gitg/gitg-branch-actions.c:168
-#: ../gitg/gitg-branch-actions.c:221 ../gitg/gitg.c:238
-#: ../gitg/gitg-window.c:1650 ../gitg/gitg-window.c:1664
-#: ../gitg/gitg-window.ui.h:11
+#: ../data/gitg.desktop.in.in.h:2 ../gitg/gitg-branch-actions.c:169
+#: ../gitg/gitg-branch-actions.c:222 ../gitg/gitg.c:184
+#: ../gitg/gitg-window.c:1666 ../gitg/gitg-window.c:1680
+#: ../gitg/gitg-window.ui.h:16
msgid "gitg"
msgstr "gitg"
-#: ../data/gitg.schemas.in.h:1
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:1
+msgid "Allow External Diff Program"
+msgstr "åèåé Diff çå"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:2
+msgid "Allow an external diff program to be used when viewing diffs in gitg."
+msgstr "å gitg äæçååæåèäçåéç diff çåã"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:3
msgid "Column at Which Right Margin is Shown"
msgstr "æçåèèçå"
-#: ../data/gitg.schemas.in.h:2
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:4
msgid "Filter Revisions When Searching"
msgstr "åæçæèæäèçæ"
-#: ../data/gitg.schemas.in.h:3
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:5
+#, fuzzy
msgid ""
"Setting that indicates when an inactive lane should be collapsed. Valid "
"values are 0 - 4, where 0 indicates 'early' and 4 indicates 'late'."
-msgstr ""
+msgstr "èèçæçäææåäæåçèçãææåä 0-4ï0 èçâæâï4 èçâæâã"
-#: ../data/gitg.schemas.in.h:4
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:6
msgid ""
"Setting that indicates whether to show the history in topological order."
msgstr "æçæåäææéåæçååçèçã"
-#: ../data/gitg.schemas.in.h:5
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:7
+#, fuzzy
+#| msgid "Setting that sets the orientation layout of the main view."
+msgid "Setting that sets files view to blame mode."
+msgstr "èåäèåæåååçèçã"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:8
msgid "Setting that sets the orientation layout of the main view."
msgstr "èåäèåæåååçèçã"
-#: ../data/gitg.schemas.in.h:6
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:9
msgid "Show History in Topological Order"
msgstr "äææéåæçåå"
-#: ../data/gitg.schemas.in.h:7
-msgid "Show Main View in Vertical Layout"
-msgstr "äåçååæçäèå"
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:10
+msgid "Show Main View in Vertical or Horizontal Layout"
+msgstr "äççååææåååæçäèå"
-#: ../data/gitg.schemas.in.h:8
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:11
msgid "Show Right Margin in Commit Message View"
msgstr "åæääæèåäæçåèè"
-#: ../data/gitg.schemas.in.h:9
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:12
msgid ""
"Show a right margin indicator in the commit message view. This can be used "
"to easily see where to break the commit message at a particular column."
@@ -71,276 +86,282 @@ msgstr ""
"åæääæèåäæçääåèèæçåãèåäçææäåçåååäåæææää"
"æã"
-#: ../data/gitg.schemas.in.h:10
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:13
+msgid "Show files view in blame mode"
+msgstr ""
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:14
msgid ""
"The column at which the right margin is shown if the right-margin preference "
"is set to TRUE."
msgstr "åæåèèéééèä TRUE çèïæçåèèçåã"
-#: ../data/gitg.schemas.in.h:11
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:15
msgid "The command to handle GITG scheme URLs"
msgstr ""
-#: ../data/gitg.schemas.in.h:12
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:16
msgid "The command to handle GITG scheme URLs."
msgstr ""
-#: ../data/gitg.schemas.in.h:13
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:17
+#, fuzzy
msgid "When to Collapse Inactive Lanes"
-msgstr ""
+msgstr "äææåäæåçèç"
-#: ../data/gitg.schemas.in.h:14
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:18
msgid "Whether command to handle GITG scheme URLs is enabled"
msgstr ""
-#: ../data/gitg.schemas.in.h:15
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:19
msgid "Whether command to handle GITG scheme URLs is enabled."
msgstr ""
-#: ../data/gitg.schemas.in.h:16
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:20
msgid "Whether command to handle GITG scheme URLs needs a terminal"
msgstr ""
-#: ../data/gitg.schemas.in.h:17
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:21
msgid "Whether command to handle GITG scheme URLs needs a terminal."
msgstr ""
-#: ../data/gitg.schemas.in.h:18
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:22
msgid ""
"Whether searching filters the revisions in the history view instead of "
"jumping to the first match."
-msgstr ""
+msgstr "æçææåååèåäçäèèèçéïèæçæèåçääåééã"
-#: ../gitg/gitg-branch-actions.c:271
+#: ../gitg/gitg-branch-actions.c:277
#, c-format
msgid "Branch <%s> could not be removed"
msgstr "åæ <%s> ææåé"
-#: ../gitg/gitg-branch-actions.c:272
+#: ../gitg/gitg-branch-actions.c:278
msgid ""
"This usually means that the branch is not fully merged in HEAD. Do you want "
"to forcefully remove the branch?"
msgstr "èéåèçåæææååååå HEADãææåååéåæåï"
-#: ../gitg/gitg-branch-actions.c:273
+#: ../gitg/gitg-branch-actions.c:279
msgid "Force remove"
msgstr "åååé"
-#: ../gitg/gitg-branch-actions.c:282
+#: ../gitg/gitg-branch-actions.c:293
#, c-format
msgid "Branch <%s> could not be forcefully removed"
msgstr "åæ <%s> ææåååé"
-#: ../gitg/gitg-branch-actions.c:315
+#: ../gitg/gitg-branch-actions.c:326
#, c-format
msgid "Failed to remove remote branch <%s>."
msgstr "ææåéèçåæ <%s>ã"
-#: ../gitg/gitg-branch-actions.c:336
+#: ../gitg/gitg-branch-actions.c:347
#, c-format
msgid "Are you sure you want to remove the remote branch <%s>?"
msgstr "æçåèåéèçåæ <%s> åï"
-#: ../gitg/gitg-branch-actions.c:337
+#: ../gitg/gitg-branch-actions.c:348
msgid "This permanently removes the remote branch."
msgstr "èäæäåéèçåæã"
-#: ../gitg/gitg-branch-actions.c:338 ../gitg/gitg-window.c:2889
+#: ../gitg/gitg-branch-actions.c:349 ../gitg/gitg-window.c:2862
msgid "Remove remote branch"
msgstr "åéèçåæ"
-#: ../gitg/gitg-branch-actions.c:353 ../gitg/gitg-menus.xml.h:11
+#: ../gitg/gitg-branch-actions.c:364 ../gitg/gitg-menus.xml.h:12
msgid "Remove branch"
msgstr "åéåæ"
-#: ../gitg/gitg-branch-actions.c:411
+#: ../gitg/gitg-branch-actions.c:425
#, fuzzy
msgid "Are you sure you want to remove this stash item?"
msgstr "æçåèåéèäåèéåï"
-#: ../gitg/gitg-branch-actions.c:412
+#: ../gitg/gitg-branch-actions.c:426
#, fuzzy
msgid "This permanently removes the stash item"
msgstr "èäæäåéåèé"
-#: ../gitg/gitg-branch-actions.c:413 ../gitg/gitg-window.c:2905
+#: ../gitg/gitg-branch-actions.c:427 ../gitg/gitg-window.c:2878
#, fuzzy
msgid "Remove stash"
msgstr "åéåè"
-#: ../gitg/gitg-branch-actions.c:439
+#: ../gitg/gitg-branch-actions.c:453
#, fuzzy
msgid "Failed to remove stash"
msgstr "ææåéåè"
-#: ../gitg/gitg-branch-actions.c:440
+#: ../gitg/gitg-branch-actions.c:454
#, fuzzy
msgid "The stash item could not be successfully removed"
msgstr "åèéæææååé"
-#: ../gitg/gitg-branch-actions.c:471
+#: ../gitg/gitg-branch-actions.c:485
#, c-format
msgid "Are you sure you want to remove the tag <%s>?"
msgstr "æçåèåéæç <%s> åï"
-#: ../gitg/gitg-branch-actions.c:475 ../gitg/gitg-branch-actions.c:477
-#: ../gitg/gitg-window.c:2911
+#: ../gitg/gitg-branch-actions.c:489 ../gitg/gitg-branch-actions.c:491
+#: ../gitg/gitg-window.c:2884
msgid "Remove tag"
msgstr "åéæç"
-#: ../gitg/gitg-branch-actions.c:494
+#: ../gitg/gitg-branch-actions.c:508
#, c-format
msgid "The tag <%s> could not be successfully removed"
msgstr "æç <%s> æææååé"
-#: ../gitg/gitg-branch-actions.c:498
+#: ../gitg/gitg-branch-actions.c:512
msgid "Failed to remove tag"
msgstr "ææåéæç"
-#: ../gitg/gitg-branch-actions.c:555
+#: ../gitg/gitg-branch-actions.c:575
#, c-format
msgid "Branch <%s> could not be renamed to <%s>"
msgstr "åæ <%s> ææéååä <%s>"
-#: ../gitg/gitg-branch-actions.c:556
+#: ../gitg/gitg-branch-actions.c:576
msgid ""
"This usually means that a branch with that name already exists. Do you want "
"to overwrite the branch?"
msgstr "èéåèçäæäåçåæåçååãææèçèäåæåï"
-#: ../gitg/gitg-branch-actions.c:557
+#: ../gitg/gitg-branch-actions.c:577
msgid "Force rename"
msgstr "ååéåå"
-#: ../gitg/gitg-branch-actions.c:566
+#: ../gitg/gitg-branch-actions.c:592
#, c-format
msgid "Branch <%s> could not be forcefully renamed"
msgstr "åæ <%s> ææååéåå"
-#: ../gitg/gitg-branch-actions.c:606 ../gitg/gitg-preferences.ui.h:14
-#: ../gitg/gitg-repository.ui.h:6 ../gitg/gitg-tag.ui.h:4
+#: ../gitg/gitg-branch-actions.c:632 ../gitg/gitg-new-branch.ui.h:2
+#: ../gitg/gitg-preferences.ui.h:17 ../gitg/gitg-repository.ui.h:6
+#: ../gitg/gitg-tag.ui.h:4
msgid "Name:"
msgstr "åçï"
-#: ../gitg/gitg-branch-actions.c:713
+#: ../gitg/gitg-branch-actions.c:754
#, fuzzy
msgid "Do you want to temporarily stash these changes?"
msgstr "ææäæåèèäåæåï"
-#: ../gitg/gitg-branch-actions.c:717
+#: ../gitg/gitg-branch-actions.c:758
#, fuzzy
msgid "Do you want to stash and reapply these changes?"
msgstr "ææåèåéæåçèäåæï"
-#: ../gitg/gitg-branch-actions.c:722
+#: ../gitg/gitg-branch-actions.c:763
msgid "You have uncommited changes in your current working tree"
msgstr "æååååäæäæææäçåæ"
-#: ../gitg/gitg-branch-actions.c:724
+#: ../gitg/gitg-branch-actions.c:765
#, fuzzy
msgid "Stash changes"
msgstr "åèåæ"
-#: ../gitg/gitg-branch-actions.c:907
+#: ../gitg/gitg-branch-actions.c:1020
msgid "Failed to save current index state"
msgstr "ææäåååçåçæ"
-#: ../gitg/gitg-branch-actions.c:961 ../gitg/gitg-branch-actions.c:1242
-#: ../gitg/gitg-branch-actions.c:1533 ../gitg/gitg-branch-actions.c:1781
+#: ../gitg/gitg-branch-actions.c:1071 ../gitg/gitg-branch-actions.c:1367
+#: ../gitg/gitg-branch-actions.c:1658 ../gitg/gitg-branch-actions.c:1955
#, c-format
msgid "Failed to checkout local branch <%s>"
msgstr "æææåæååæ <%s>"
-#: ../gitg/gitg-branch-actions.c:999
+#: ../gitg/gitg-branch-actions.c:1109
#, c-format
msgid "Failed to checkout remote branch <%s> to local branch <%s>"
msgstr "ææåèçåæ <%s> æååæååæ <%s>"
-#: ../gitg/gitg-branch-actions.c:1038
+#: ../gitg/gitg-branch-actions.c:1148
#, c-format
msgid "Failed to checkout tag <%s> to local branch <%s>"
msgstr "ææåæç <%s> æååæååæ <%s>"
-#: ../gitg/gitg-branch-actions.c:1129
+#: ../gitg/gitg-branch-actions.c:1239
#, c-format
msgid "Failed to rebase %s branch <%s> onto %s branch <%s>"
msgstr "ææèå %s åæ <%s> å %s åæ <%s>"
-#: ../gitg/gitg-branch-actions.c:1133
+#: ../gitg/gitg-branch-actions.c:1243
#, c-format
msgid "Failed to merge %s branch <%s> with %s branch <%s>"
msgstr "ææå %s åæ <%s> ä %s åæ <%s> åå"
-#: ../gitg/gitg-branch-actions.c:1141 ../gitg/gitg-branch-actions.c:1143
-#: ../gitg/gitg-branch-actions.c:1209 ../gitg/gitg-branch-actions.c:1211
-#: ../gitg/gitg-branch-actions.c:1250 ../gitg/gitg-branch-actions.c:1252
-#: ../gitg/gitg-branch-actions.c:1286 ../gitg/gitg-branch-actions.c:1288
-#: ../gitg/gitg-branch-actions.c:1333 ../gitg/gitg-branch-actions.c:1335
+#: ../gitg/gitg-branch-actions.c:1251 ../gitg/gitg-branch-actions.c:1253
+#: ../gitg/gitg-branch-actions.c:1330 ../gitg/gitg-branch-actions.c:1332
+#: ../gitg/gitg-branch-actions.c:1375 ../gitg/gitg-branch-actions.c:1377
+#: ../gitg/gitg-branch-actions.c:1411 ../gitg/gitg-branch-actions.c:1413
+#: ../gitg/gitg-branch-actions.c:1458 ../gitg/gitg-branch-actions.c:1460
msgid "local"
msgstr "æå"
-#: ../gitg/gitg-branch-actions.c:1141 ../gitg/gitg-branch-actions.c:1143
-#: ../gitg/gitg-branch-actions.c:1209 ../gitg/gitg-branch-actions.c:1211
-#: ../gitg/gitg-branch-actions.c:1250 ../gitg/gitg-branch-actions.c:1252
-#: ../gitg/gitg-branch-actions.c:1286 ../gitg/gitg-branch-actions.c:1288
-#: ../gitg/gitg-branch-actions.c:1333 ../gitg/gitg-branch-actions.c:1335
+#: ../gitg/gitg-branch-actions.c:1251 ../gitg/gitg-branch-actions.c:1253
+#: ../gitg/gitg-branch-actions.c:1330 ../gitg/gitg-branch-actions.c:1332
+#: ../gitg/gitg-branch-actions.c:1375 ../gitg/gitg-branch-actions.c:1377
+#: ../gitg/gitg-branch-actions.c:1411 ../gitg/gitg-branch-actions.c:1413
+#: ../gitg/gitg-branch-actions.c:1458 ../gitg/gitg-branch-actions.c:1460
msgid "remote"
msgstr "èç"
-#: ../gitg/gitg-branch-actions.c:1160 ../gitg/gitg-branch-actions.c:1700
+#: ../gitg/gitg-branch-actions.c:1276 ../gitg/gitg-branch-actions.c:1869
#, fuzzy
msgid "The stashed changes have been stored to be reapplied manually"
msgstr "åèçåæåèååïääæåéæåç"
-#: ../gitg/gitg-branch-actions.c:1165 ../gitg/gitg-branch-actions.c:1705
+#: ../gitg/gitg-branch-actions.c:1281 ../gitg/gitg-branch-actions.c:1874
msgid "Failed to checkout previously checked out branch"
msgstr "æææåäåèæåçåæ"
-#: ../gitg/gitg-branch-actions.c:1186 ../gitg/gitg-branch-actions.c:1726
+#: ../gitg/gitg-branch-actions.c:1307 ../gitg/gitg-branch-actions.c:1900
#, fuzzy
msgid "Failed to reapply stash correctly"
msgstr "æææçéæåçåè"
-#: ../gitg/gitg-branch-actions.c:1187 ../gitg/gitg-branch-actions.c:1727
+#: ../gitg/gitg-branch-actions.c:1308 ../gitg/gitg-branch-actions.c:1901
msgid ""
"There might be unresolved conflicts in the working tree or index which you "
"need to resolve manually"
msgstr "ååäææçåäææèåçåçïæéèæåèå"
-#: ../gitg/gitg-branch-actions.c:1208
+#: ../gitg/gitg-branch-actions.c:1329
#, c-format
msgid "Are you sure you want to merge %s branch <%s> onto %s branch <%s>?"
msgstr "æçåèå %s åæ <%s> ååå %s åæ <%s> åï"
-#: ../gitg/gitg-branch-actions.c:1216 ../gitg/gitg-branch-actions.c:1218
-#: ../gitg/gitg-branch-actions.c:1262 ../gitg/gitg-menus.xml.h:6
+#: ../gitg/gitg-branch-actions.c:1337 ../gitg/gitg-branch-actions.c:1339
+#: ../gitg/gitg-branch-actions.c:1387 ../gitg/gitg-menus.xml.h:7
msgid "Merge"
msgstr "åå"
-#: ../gitg/gitg-branch-actions.c:1243
+#: ../gitg/gitg-branch-actions.c:1368
msgid "The branch on which to merge could not be checked out"
msgstr "èååçåæææèæå"
-#: ../gitg/gitg-branch-actions.c:1249
+#: ../gitg/gitg-branch-actions.c:1374
#, c-format
msgid "Merging %s branch <%s> onto %s branch <%s>"
msgstr "åå %s åæ <%s> å %s åæ <%s>"
-#: ../gitg/gitg-branch-actions.c:1285
+#: ../gitg/gitg-branch-actions.c:1410
#, c-format
msgid "Are you sure you want to rebase %s branch <%s> onto %s branch <%s>?"
msgstr "æçåèå %s åæ <%s> èåå %s åæ <%s> åï"
-#: ../gitg/gitg-branch-actions.c:1293 ../gitg/gitg-branch-actions.c:1295
-#: ../gitg/gitg-branch-actions.c:1345 ../gitg/gitg-menus.xml.h:9
+#: ../gitg/gitg-branch-actions.c:1418 ../gitg/gitg-branch-actions.c:1420
+#: ../gitg/gitg-branch-actions.c:1470 ../gitg/gitg-menus.xml.h:10
msgid "Rebase"
msgstr "èå"
-#: ../gitg/gitg-branch-actions.c:1318
+#: ../gitg/gitg-branch-actions.c:1443
msgid "Unable to rebase"
msgstr "ææèå"
-#: ../gitg/gitg-branch-actions.c:1319
+#: ../gitg/gitg-branch-actions.c:1444
#, fuzzy
msgid ""
"There are still uncommitted changes in your working tree and you are trying "
@@ -350,345 +371,483 @@ msgstr ""
"åæçåäæääæææäçåæïèææåèåääåæèååååæåçåæäã"
"éååéãåèæèæäæçåæçåéè"
-#: ../gitg/gitg-branch-actions.c:1332
+#: ../gitg/gitg-branch-actions.c:1457
#, c-format
msgid "Rebasing %s branch <%s> onto %s branch <%s>"
msgstr "æåèå %s åæ <%s> å %s åæ <%s>"
-#: ../gitg/gitg-branch-actions.c:1371
+#: ../gitg/gitg-branch-actions.c:1496
#, fuzzy, c-format
msgid "Failed to push local branch <%s> to remote <%s>"
msgstr "æææéæååæ <%s> åèç <%s>"
-#: ../gitg/gitg-branch-actions.c:1372
+#: ../gitg/gitg-branch-actions.c:1497
msgid ""
"This usually means that the remote branch could not be fast-forwarded. Try "
"fetching the latest changes."
-msgstr ""
+msgstr "èéåæåçèçåæææåèãèåèååææçäæã"
-#: ../gitg/gitg-branch-actions.c:1396
+#: ../gitg/gitg-branch-actions.c:1521
#, fuzzy, c-format
msgid "Are you sure you want to push <%s> to <%s>?"
msgstr "æçåèå <%s> æéå <%s> åï"
-#: ../gitg/gitg-branch-actions.c:1402 ../gitg/gitg-branch-actions.c:1404
-#: ../gitg/gitg-branch-actions.c:1425 ../gitg/gitg-branch-actions.c:1457
-#: ../gitg/gitg-branch-actions.c:1459 ../gitg/gitg-branch-actions.c:1482
+#: ../gitg/gitg-branch-actions.c:1527 ../gitg/gitg-branch-actions.c:1529
+#: ../gitg/gitg-branch-actions.c:1550 ../gitg/gitg-branch-actions.c:1582
+#: ../gitg/gitg-branch-actions.c:1584 ../gitg/gitg-branch-actions.c:1607
#, fuzzy
msgid "Push"
msgstr "æé"
-#: ../gitg/gitg-branch-actions.c:1417
+#: ../gitg/gitg-branch-actions.c:1542
#, fuzzy, c-format
msgid "Pushing local branch <%s> to remote branch <%s>"
msgstr "æååæååæ <%s> æéåèçåæ <%s>"
-#: ../gitg/gitg-branch-actions.c:1451
+#: ../gitg/gitg-branch-actions.c:1576
#, fuzzy, c-format
msgid "Are you sure you want to push <%s> to remote <%s/%s>?"
msgstr "æçåèå <%s> æéåèç <%s/%s> å?"
-#: ../gitg/gitg-branch-actions.c:1469
+#: ../gitg/gitg-branch-actions.c:1594
#, fuzzy, c-format
msgid "Pushing local branch <%s> to remote branch <%s/%s>"
msgstr "æååæååæ <%s> æéåèçåæ <%s/%s>"
-#: ../gitg/gitg-branch-actions.c:1506
+#: ../gitg/gitg-branch-actions.c:1631
#, fuzzy, c-format
msgid "Are you sure you want to apply the stash item to local branch <%s>?"
msgstr "æçåèååèéåçåæååæ <%s> åï"
-#: ../gitg/gitg-branch-actions.c:1511 ../gitg/gitg-branch-actions.c:1513
+#: ../gitg/gitg-branch-actions.c:1636 ../gitg/gitg-branch-actions.c:1638
#, fuzzy
msgid "Apply stash"
msgstr "åçåè"
-#: ../gitg/gitg-branch-actions.c:1552
+#: ../gitg/gitg-branch-actions.c:1677
#, fuzzy, c-format
msgid "The stash could not be applied to local branch <%s>"
msgstr "åèææèåçåæååæ <%s>"
-#: ../gitg/gitg-branch-actions.c:1556
+#: ../gitg/gitg-branch-actions.c:1681
#, fuzzy
msgid "Failed to apply stash"
msgstr "ææåçåè"
-#: ../gitg/gitg-branch-actions.c:1616
+#: ../gitg/gitg-branch-actions.c:1724
+#, fuzzy
+#| msgid "The tag object could not be successfully created"
+msgid "The branch could not be successfully created"
+msgstr "æææååååè"
+
+#: ../gitg/gitg-branch-actions.c:1728
+msgid "Failed to create a branch"
+msgstr "åååæåè"
+
+#: ../gitg/gitg-branch-actions.c:1780
msgid ""
"The tag object could not be successfully created. Please make sure you have "
"a GPG key and the key is unlocked"
msgstr "æææåååæçåèãèçäæææää GPG åéäåéææèéå"
-#: ../gitg/gitg-branch-actions.c:1620
+#: ../gitg/gitg-branch-actions.c:1784
msgid "The tag object could not be successfully created"
msgstr "æææåååæçåè"
-#: ../gitg/gitg-branch-actions.c:1625
+#: ../gitg/gitg-branch-actions.c:1789
msgid "Failed to create tag"
msgstr "ææååæç"
-#: ../gitg/gitg-branch-actions.c:1680
+#: ../gitg/gitg-branch-actions.c:1844
#, c-format
msgid "Failed to cherry-pick on <%s>"
msgstr "ææå <%s> äææ"
-#: ../gitg/gitg-branch-actions.c:1747
+#: ../gitg/gitg-branch-actions.c:1921
#, c-format
msgid "Are you sure you want to cherry-pick that revision on <%s>?"
msgstr "æçåèå <%s> äææéääèçæåï"
-#: ../gitg/gitg-branch-actions.c:1752 ../gitg/gitg-branch-actions.c:1754
-#: ../gitg/gitg-branch-actions.c:1802
+#: ../gitg/gitg-branch-actions.c:1926 ../gitg/gitg-branch-actions.c:1928
+#: ../gitg/gitg-branch-actions.c:1976
msgid "Cherry-pick"
msgstr "ææ"
-#: ../gitg/gitg-branch-actions.c:1782
+#: ../gitg/gitg-branch-actions.c:1956
msgid "The branch on which to cherry-pick could not be checked out"
msgstr "èèèææçåæææèæå"
-#: ../gitg/gitg-branch-actions.c:1789
+#: ../gitg/gitg-branch-actions.c:1963
#, c-format
msgid "Cherry-picking on <%s>"
msgstr "å <%s> äææ"
-#: ../gitg/gitg-branch-actions.c:1857
+#: ../gitg/gitg-branch-actions.c:2031
msgid "Failed to generate format-patch"
msgstr ""
-#: ../gitg/gitg-branch-actions.c:1905
+#: ../gitg/gitg-branch-actions.c:2081
#, c-format
msgid "Generating format-patch for <%s>"
msgstr ""
-#: ../gitg/gitg-branch-actions.c:1913 ../gitg/gitg-menus.xml.h:5
+#: ../gitg/gitg-branch-actions.c:2089 ../gitg/gitg-menus.xml.h:6
msgid "Format patch"
msgstr ""
-#: ../gitg/gitg.c:54
+#: ../gitg/gitg.c:52
msgid "Show the application's version"
msgstr "æçåççåççæ"
-#: ../gitg/gitg.c:55
+#: ../gitg/gitg.c:53
msgid "Start gitg in commit mode"
msgstr "äæäæååå gitg"
-#: ../gitg/gitg.c:56
+#: ../gitg/gitg.c:54
msgid "Select commit after loading the repository"
msgstr "åèåçæååéææä"
-#: ../gitg/gitg.c:66
+#: ../gitg/gitg.c:64
msgid "- git repository viewer"
msgstr "- git çæåæçå"
-#: ../gitg/gitg-commit-view.c:222 ../gitg/gitg-revision-files-panel.c:256
+#: ../gitg/gitg-commit-view.c:300 ../gitg/gitg-revision-files-panel.c:478
msgid "Cannot display file content as text"
msgstr "ææåæäååæçäææ"
-#: ../gitg/gitg-commit-view.c:1156
-msgid "unstage"
-msgstr "æå"
-
-#: ../gitg/gitg-commit-view.c:1157
-msgid "stage"
-msgstr "æå"
-
-#: ../gitg/gitg-commit-view.c:1991
+#: ../gitg/gitg-commit-view.c:2557
msgid "You must first stage some changes before committing"
msgstr "æåæäååééåæåääåæ"
-#: ../gitg/gitg-commit-view.c:1999
+#: ../gitg/gitg-commit-view.c:2565
msgid "Please enter a commit message before committing"
msgstr "èåæäåèåääæääæ"
-#: ../gitg/gitg-commit-view.c:2011
+#: ../gitg/gitg-commit-view.c:2587
msgid ""
"Your user name or email could not be retrieved for use in the sign off "
"message"
-msgstr ""
+msgstr "ææèåæççæåæçåéçäçäçåäæã"
-#: ../gitg/gitg-commit-view.c:2013
+#: ../gitg/gitg-commit-view.c:2593
msgid "Something went wrong while trying to commit"
msgstr "åèæäæåçäääéè"
-#: ../gitg/gitg-commit-view.c:2197
+#: ../gitg/gitg-commit-view.c:2889
msgid "Revert fail"
msgstr "æååè"
-#: ../gitg/gitg-commit-view.c:2208
+#: ../gitg/gitg-commit-view.c:2905
msgid "Are you sure you want to revert these changes?"
msgstr "æçåèæåèäåæåï"
-#: ../gitg/gitg-commit-view.c:2211
+#: ../gitg/gitg-commit-view.c:2909
msgid "Reverting changes is permanent and cannot be undone"
msgstr "æååæææäçåääèæé"
-#: ../gitg/gitg-repository-dialog.c:244 ../gitg/gitg-repository.ui.h:4
+#: ../gitg/gitg-commit-view.c:2988
+#, fuzzy
+#| msgid "Details"
+msgid "Delete Failed"
+msgstr "èæ"
+
+#: ../gitg/gitg-commit-view.c:3006
+#, fuzzy
+#| msgid "Are you sure you want to revert these changes?"
+msgid "Are you sure you want to delete these files?"
+msgstr "æçåèæåèäåæåï"
+
+#: ../gitg/gitg-commit-view.c:3009
+#, fuzzy
+#| msgid "Reverting changes is permanent and cannot be undone"
+msgid "Deleting files is permanent and cannot be undone"
+msgstr "æååæææäçåääèæé"
+
+#: ../gitg/gitg-repository-dialog.c:223 ../gitg/gitg-repository.ui.h:4
msgid "Fetch"
msgstr "èå"
-#: ../gitg/gitg-repository-dialog.c:249
+#: ../gitg/gitg-repository-dialog.c:228
msgid "Cancel"
msgstr "åæ"
-#: ../gitg/gitg-repository-dialog.c:633 ../gitg/gitg-repository.ui.h:7
+#: ../gitg/gitg-repository-dialog.c:551 ../gitg/gitg-repository.ui.h:7
#: ../gitg/gitg-tag.ui.h:5
msgid "Properties"
msgstr "åæ"
-#: ../gitg/gitg-revision-changes-panel.c:278
+#: ../gitg/gitg-revision-changes-panel.c:270 ../gitg/gitg-window.ui.h:5
msgid "Changes"
msgstr "åæ"
-#: ../gitg/gitg-revision-details-panel.c:113
+#: ../gitg/gitg-revision-details-panel.c:118
msgid "Details"
msgstr "èæ"
-#: ../gitg/gitg-revision-files-panel.c:600
+#: ../gitg/gitg-revision-files-panel.c:315 ../gitg/gitg-window.ui.h:3
+msgid "Author"
+msgstr "äè"
+
+#: ../gitg/gitg-revision-files-panel.c:316
+#, fuzzy
+#| msgid "Committer:"
+msgid "Committer"
+msgstr "æäèï"
+
+#: ../gitg/gitg-revision-files-panel.c:317 ../gitg/gitg-window.ui.h:11
+msgid "Subject"
+msgstr "äé"
+
+#: ../gitg/gitg-revision-files-panel.c:884
msgid "Files"
msgstr "æä"
-#: ../gitg/gitg-revision-files-panel.c:769
+#: ../gitg/gitg-revision-files-panel.c:1053
msgid "(Empty)"
msgstr "(çç)"
-#: ../gitg/gitg-window.c:648
+#: ../gitg/gitg-window.c:680
msgid "Select branch"
msgstr "éæåæ"
-#: ../gitg/gitg-window.c:717
+#: ../gitg/gitg-window.c:749
#, fuzzy, c-format
msgid "Push local branch <%s> to remote branch <%s>"
msgstr "åæååæ <%s> æéåèçåæ <%s>"
-#: ../gitg/gitg-window.c:724
+#: ../gitg/gitg-window.c:756
#, c-format
msgid "Merge/rebase local branch <%s> with/on local branch <%s>"
msgstr "åå/èåæååæ <%s> ä/åæååæ <%s>"
-#: ../gitg/gitg-window.c:731
+#: ../gitg/gitg-window.c:763
#, c-format
msgid "Merge/rebase local branch <%s> with/on remote branch <%s>"
msgstr "åå/èåæååæ <%s> ä/åèçåæ <%s>"
-#: ../gitg/gitg-window.c:738
+#: ../gitg/gitg-window.c:770
#, fuzzy, c-format
msgid "Apply stash to local branch <%s>"
msgstr "ååèåçåæååæ <%s>"
-#: ../gitg/gitg-window.c:818
+#: ../gitg/gitg-window.c:850
#, c-format
msgid "Cherry-pick revision on <%s>"
msgstr "å <%s> äææäèçæ"
-#: ../gitg/gitg-window.c:1200
+#: ../gitg/gitg-window.c:1213
#, c-format
msgid "Loaded %d revisions in %.2fs"
-msgstr ""
+msgstr "åèå %d æäèïçæ %.2fs"
-#: ../gitg/gitg-window.c:1222
+#: ../gitg/gitg-window.c:1238
#, c-format
msgid "Loading %d revisions..."
msgstr "æåèå %d äèçæ..."
-#: ../gitg/gitg-window.c:1583
+#: ../gitg/gitg-window.c:1600
msgid "Local branches"
msgstr "æååæ"
-#: ../gitg/gitg-window.c:1604
+#: ../gitg/gitg-window.c:1621
msgid "All branches"
msgstr "ææåæ"
-#: ../gitg/gitg-window.c:1682
+#: ../gitg/gitg-window.c:1698
msgid "Begin loading repository"
msgstr "ååèåçæå"
-#: ../gitg/gitg-window.c:2124
+#: ../gitg/gitg-window.c:2139
msgid "Open git repository"
msgstr "æå git çæå"
-#: ../gitg/gitg-window.c:2222
+#: ../gitg/gitg-window.c:2212
msgid "gitg is a git repository viewer for gtk+/GNOME"
msgstr "gitg æçä gtk+/GNOME çää git çæåæçå"
-#: ../gitg/gitg-window.c:2223
-msgid ""
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place, Suite 330,\n"
-"Boston, MA 02111-1307, USA."
-msgstr ""
-"æçåæèçèäïæåäåéåçèçèäåéäååç GNU é\n"
-"çååèååèçæåäéæåååä/æèåïäçèååèççä\n"
-"çïæ(æææçéæ)ääææçæã\n"
-"\n"
-"æçåçååæåæåäæçïääåäääèïçèæ\n"
-"æåäæçæåçåççéçæçææãæåçèèåç GNU éç\n"
-"ååèååèã\n"
-"\n"
-"æåèéæçåæåä GNU éçååèååèääåæï\n"
-"åæææïèçèçèäåéäåä\n"
-"59 Temple Place, Suite 330, Boston, MA 02111-1307, USA."
-
-#: ../gitg/gitg-window.c:2548
+#: ../gitg/gitg-window.c:2523
msgid "new"
msgstr "æç"
-#: ../gitg/gitg-window.c:2878 ../gitg/gitg-window.c:2916
+#: ../gitg/gitg-window.c:2851 ../gitg/gitg-window.c:2889
#, c-format
msgid "New local branch <%s>"
msgstr "æçæååæ <%s>"
-#: ../gitg/gitg-window.c:2894
+#: ../gitg/gitg-window.c:2867
msgid "Checkout working copy"
msgstr "æååäæè"
-#: ../gitg/gitg-window.c:2895
+#: ../gitg/gitg-window.c:2868
msgid "Remove local branch"
msgstr "åéæååæ"
-#: ../gitg/gitg-window.c:2897
+#: ../gitg/gitg-window.c:2870
msgid "Rename local branch"
msgstr "éååæååæ"
-#: ../gitg/gitg-window.c:3232
+#: ../gitg/gitg-window.c:3233 ../gitg/gitg-window.c:3289
+msgid "Not all fields are correctly filled in"
+msgstr "åéææåæéåæçåå"
+
+#: ../gitg/gitg-window.c:3237
+msgid "Please make sure to fill in the branch name"
+msgstr "èçäååäåæåç"
+
+#: ../gitg/gitg-window.c:3276
msgid "Please make sure to fill in both the tag name and the commit message"
msgstr "èçäåæååæçåçåæääæ"
-#: ../gitg/gitg-window.c:3236
+#: ../gitg/gitg-window.c:3280
msgid "Please make sure to fill in the tag name"
msgstr "èçäååæçåç"
-#: ../gitg/gitg-window.c:3245
-msgid "Not all fields are correctly filled in"
-msgstr "åéææåæéåæçåå"
+#: ../gitg/gitg-window.c:3357
+msgid "Format patch failed for unknown reason"
+msgstr ""
+
+#: ../gitg/gitg-window.c:3361
+msgid "Please check if you have the right permissions to write the file"
+msgstr "èææææåæåæäçæé"
#. Single one, pick filename
-#: ../gitg/gitg-window.c:3340
+#: ../gitg/gitg-window.c:3400
msgid "Save format patch"
msgstr ""
-#: ../libgitg/gitg-repository.c:883
+#: ../libgitg/gitg-encodings.c:144 ../libgitg/gitg-encodings.c:186
+#: ../libgitg/gitg-encodings.c:188 ../libgitg/gitg-encodings.c:190
+#: ../libgitg/gitg-encodings.c:192 ../libgitg/gitg-encodings.c:194
+#: ../libgitg/gitg-encodings.c:196 ../libgitg/gitg-encodings.c:198
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../libgitg/gitg-encodings.c:157 ../libgitg/gitg-encodings.c:181
+#: ../libgitg/gitg-encodings.c:231 ../libgitg/gitg-encodings.c:274
+msgid "Western"
+msgstr "èæ"
+
+#: ../libgitg/gitg-encodings.c:159 ../libgitg/gitg-encodings.c:233
+#: ../libgitg/gitg-encodings.c:270
+msgid "Central European"
+msgstr "äæ"
+
+#: ../libgitg/gitg-encodings.c:161
+msgid "South European"
+msgstr "åæ"
+
+#: ../libgitg/gitg-encodings.c:163 ../libgitg/gitg-encodings.c:177
+#: ../libgitg/gitg-encodings.c:284
+msgid "Baltic"
+msgstr "æççè"
+
+#: ../libgitg/gitg-encodings.c:165 ../libgitg/gitg-encodings.c:235
+#: ../libgitg/gitg-encodings.c:248 ../libgitg/gitg-encodings.c:252
+#: ../libgitg/gitg-encodings.c:254 ../libgitg/gitg-encodings.c:272
+msgid "Cyrillic"
+msgstr "èéåæ"
+
+#: ../libgitg/gitg-encodings.c:167 ../libgitg/gitg-encodings.c:241
+#: ../libgitg/gitg-encodings.c:282
+msgid "Arabic"
+msgstr "éæäè"
+
+#: ../libgitg/gitg-encodings.c:169 ../libgitg/gitg-encodings.c:276
+msgid "Greek"
+msgstr "åè"
+
+#: ../libgitg/gitg-encodings.c:171
+msgid "Hebrew Visual"
+msgstr ""
+
+#: ../libgitg/gitg-encodings.c:173 ../libgitg/gitg-encodings.c:237
+#: ../libgitg/gitg-encodings.c:278
+msgid "Turkish"
+msgstr "åèåè"
+
+#: ../libgitg/gitg-encodings.c:175
+msgid "Nordic"
+msgstr "åæè"
+
+#: ../libgitg/gitg-encodings.c:179
+msgid "Celtic"
+msgstr "ååçè"
+
+#: ../libgitg/gitg-encodings.c:183
+msgid "Romanian"
+msgstr "çéåäè"
+
+#: ../libgitg/gitg-encodings.c:201
+msgid "Armenian"
+msgstr "çåèè"
+
+#: ../libgitg/gitg-encodings.c:203 ../libgitg/gitg-encodings.c:205
+#: ../libgitg/gitg-encodings.c:219
+msgid "Chinese Traditional"
+msgstr "çääæ"
+
+#: ../libgitg/gitg-encodings.c:207
+msgid "Cyrillic/Russian"
+msgstr "ææå/äè"
+
+#: ../libgitg/gitg-encodings.c:210 ../libgitg/gitg-encodings.c:212
+#: ../libgitg/gitg-encodings.c:214 ../libgitg/gitg-encodings.c:244
+#: ../libgitg/gitg-encodings.c:259
+msgid "Japanese"
+msgstr "æè"
+
+#: ../libgitg/gitg-encodings.c:217 ../libgitg/gitg-encodings.c:246
+#: ../libgitg/gitg-encodings.c:250 ../libgitg/gitg-encodings.c:265
+msgid "Korean"
+msgstr "æè"
+
+#: ../libgitg/gitg-encodings.c:222 ../libgitg/gitg-encodings.c:224
+#: ../libgitg/gitg-encodings.c:226
+msgid "Chinese Simplified"
+msgstr "çääæ"
+
+#: ../libgitg/gitg-encodings.c:228
+msgid "Georgian"
+msgstr "æéåäè"
+
+#: ../libgitg/gitg-encodings.c:239 ../libgitg/gitg-encodings.c:280
+msgid "Hebrew"
+msgstr "åäæè"
+
+#: ../libgitg/gitg-encodings.c:256
+msgid "Cyrillic/Ukrainian"
+msgstr "ææå/äååè"
+
+#: ../libgitg/gitg-encodings.c:261 ../libgitg/gitg-encodings.c:267
+#: ../libgitg/gitg-encodings.c:286
+msgid "Vietnamese"
+msgstr "èåè"
+
+#: ../libgitg/gitg-encodings.c:263
+msgid "Thai"
+msgstr "æè"
+
+#: ../libgitg/gitg-encodings.c:479
+msgid "Unknown"
+msgstr "æç"
+
+#: ../libgitg/gitg-repository.c:894
msgid "Staged changes"
msgstr "æåçåæ"
-#: ../libgitg/gitg-repository.c:887
+#: ../libgitg/gitg-repository.c:898
msgid "Unstaged changes"
msgstr "æåçåæ"
-#: ../libgitg/gitg-repository.c:1517
+#: ../libgitg/gitg-repository.c:1540
msgid "Not a valid git repository"
msgstr "äæææç git çæå"
+#: ../libgitg/gitg-smart-charset-converter.c:329
+msgid "It is not possible to detect the encoding automatically"
+msgstr "ææèåææçç"
+
+#. ex:ts=8:noet:
#: ../gitg/gitg-commit-menu.ui.h:1
msgid "Ignore"
msgstr "åç"
@@ -718,40 +877,44 @@ msgstr "æååæ"
msgid "Cherry-pick on..."
msgstr "ææå..."
-#: ../gitg/gitg-menus.xml.h:4 ../gitg/gitg-tag.ui.h:2
+#: ../gitg/gitg-menus.xml.h:4 ../gitg/gitg-new-branch.ui.h:1
+msgid "Create branch"
+msgstr "åååæ"
+
+#: ../gitg/gitg-menus.xml.h:5 ../gitg/gitg-tag.ui.h:2
msgid "Create tag"
msgstr "ååæç"
-#: ../gitg/gitg-menus.xml.h:7
+#: ../gitg/gitg-menus.xml.h:8
msgid "Merge branch with..."
msgstr "åååæä..."
-#: ../gitg/gitg-menus.xml.h:8
+#: ../gitg/gitg-menus.xml.h:9
#, fuzzy
msgid "Push branch to..."
msgstr "æéåæå..."
-#: ../gitg/gitg-menus.xml.h:10
+#: ../gitg/gitg-menus.xml.h:11
msgid "Rebase branch onto..."
msgstr "èååæå..."
-#: ../gitg/gitg-menus.xml.h:12
+#: ../gitg/gitg-menus.xml.h:13
msgid "Rename branch"
msgstr "éåååæ"
-#: ../gitg/gitg-menus.xml.h:13
+#: ../gitg/gitg-menus.xml.h:14
msgid "_Author"
msgstr "äè(_A)"
-#: ../gitg/gitg-menus.xml.h:14
+#: ../gitg/gitg-menus.xml.h:15
msgid "_Date"
msgstr "ææ(_D)"
-#: ../gitg/gitg-menus.xml.h:15
+#: ../gitg/gitg-menus.xml.h:16
msgid "_Hash"
msgstr "åå(_H)"
-#: ../gitg/gitg-menus.xml.h:16
+#: ../gitg/gitg-menus.xml.h:17
msgid "_Subject"
msgstr "äé(_S)"
@@ -760,30 +923,39 @@ msgid "<b>Commit Message</b>"
msgstr "<b>æääæ</b>"
#: ../gitg/gitg-preferences.ui.h:2
+msgid "<b>Diff Program</b>"
+msgstr "<b>Diff çå</b>"
+
+#: ../gitg/gitg-preferences.ui.h:3
msgid "<b>Interface</b>"
msgstr "<b>çé</b>"
-#: ../gitg/gitg-preferences.ui.h:3
+#: ../gitg/gitg-preferences.ui.h:4
msgid "<b>Revisions</b>"
msgstr "<b>äèçæ</b>"
-#: ../gitg/gitg-preferences.ui.h:4 ../gitg/gitg-repository.ui.h:1
+#: ../gitg/gitg-preferences.ui.h:5 ../gitg/gitg-repository.ui.h:1
msgid "<b>User</b>"
msgstr "<b>çæ</b>"
-#: ../gitg/gitg-preferences.ui.h:5
+#: ../gitg/gitg-preferences.ui.h:6
+msgid "Allow external diff program"
+msgstr "åèåé diff çå"
+
+#: ../gitg/gitg-preferences.ui.h:7
+#, fuzzy
msgid "Collapse inactive lanes"
-msgstr ""
+msgstr "æåäæåèç"
-#: ../gitg/gitg-preferences.ui.h:6 ../gitg/gitg-window.ui.h:5
+#: ../gitg/gitg-preferences.ui.h:8 ../gitg/gitg-window.ui.h:7
msgid "Commit"
msgstr "æä"
-#: ../gitg/gitg-preferences.ui.h:7 ../gitg/gitg-repository.ui.h:2
+#: ../gitg/gitg-preferences.ui.h:9 ../gitg/gitg-repository.ui.h:2
msgid "Configuration"
msgstr "éç"
-#: ../gitg/gitg-preferences.ui.h:8
+#: ../gitg/gitg-preferences.ui.h:10
msgid ""
"Configure global git settings. This corresponds to the settings as stored in "
"~/.gitconfig. Repository specific settings can be configured at the "
@@ -792,66 +964,70 @@ msgstr ""
"éçåå git èçãèååä ~/.gitconfig äååçèçãçæåççåèçåäå"
"çæååæäéçã"
-#: ../gitg/gitg-preferences.ui.h:9
+#: ../gitg/gitg-preferences.ui.h:11
+msgid "Diff"
+msgstr "åå"
+
+#: ../gitg/gitg-preferences.ui.h:12
msgid "Display right _margin"
msgstr "æçåèè(_M)"
-#: ../gitg/gitg-preferences.ui.h:10 ../gitg/gitg-repository.ui.h:3
+#: ../gitg/gitg-preferences.ui.h:13 ../gitg/gitg-repository.ui.h:3
msgid "E-mail:"
msgstr "çåéäï"
-#: ../gitg/gitg-preferences.ui.h:11
+#: ../gitg/gitg-preferences.ui.h:14
#, fuzzy
msgid "Early"
-msgstr "æåç"
+msgstr "æå"
-#: ../gitg/gitg-preferences.ui.h:12 ../gitg/gitg-window.ui.h:7
+#: ../gitg/gitg-preferences.ui.h:15 ../gitg/gitg-window.ui.h:10
msgid "History"
msgstr "åå"
-#: ../gitg/gitg-preferences.ui.h:13
+#: ../gitg/gitg-preferences.ui.h:16
#, fuzzy
msgid "Late"
msgstr "åæç"
-#: ../gitg/gitg-preferences.ui.h:15
+#: ../gitg/gitg-preferences.ui.h:18
msgid "Preferences"
msgstr "ééé"
-#: ../gitg/gitg-preferences.ui.h:16
+#: ../gitg/gitg-preferences.ui.h:19
msgid "Preferences that apply to the commit view"
msgstr "åçäæäèåçééé"
-#: ../gitg/gitg-preferences.ui.h:17
+#: ../gitg/gitg-preferences.ui.h:20
msgid "Preferences that apply to the history view"
msgstr "åçäååèåçééé"
-#: ../gitg/gitg-preferences.ui.h:18
+#: ../gitg/gitg-preferences.ui.h:21
msgid "Search filters revisions in the history view"
-msgstr ""
+msgstr "æçæåååèåäçäèèèçé"
-#: ../gitg/gitg-preferences.ui.h:19
+#: ../gitg/gitg-preferences.ui.h:22
msgid "Show history in topological order"
msgstr "äææéåæçåå"
-#: ../gitg/gitg-preferences.ui.h:20
+#: ../gitg/gitg-preferences.ui.h:23
msgid "Show staged changes in history"
msgstr "åååäæçæååæ"
-#: ../gitg/gitg-preferences.ui.h:21
+#: ../gitg/gitg-preferences.ui.h:24
#, fuzzy
msgid "Show stash in history"
msgstr "åååäæçåè"
-#: ../gitg/gitg-preferences.ui.h:22
+#: ../gitg/gitg-preferences.ui.h:25
msgid "Show unstaged changes in history"
msgstr "åååäæçæåçåæ"
-#: ../gitg/gitg-preferences.ui.h:23
+#: ../gitg/gitg-preferences.ui.h:26
msgid "Use vertical layout"
-msgstr "äçåçåå"
+msgstr "äçççåå"
-#: ../gitg/gitg-preferences.ui.h:24
+#: ../gitg/gitg-preferences.ui.h:27
msgid "_Right margin at column:"
msgstr "åçåèè(_R)ï"
@@ -887,9 +1063,13 @@ msgstr "SHAï"
msgid "Subject:"
msgstr "äéï"
+#: ../gitg/gitg-revision-files-panel.ui.h:1
+msgid "Switch to Blame mode"
+msgstr ""
+
#: ../gitg/gitg-tag.ui.h:1
msgid "Create signed tag object"
-msgstr ""
+msgstr "ååçåçæçåè"
#: ../gitg/gitg-tag.ui.h:3
msgid "Message:"
@@ -927,26 +1107,73 @@ msgstr ""
msgid "Amend"
msgstr "äè"
-#: ../gitg/gitg-window.ui.h:3
+#: ../gitg/gitg-window.ui.h:4
msgid "Branch:"
msgstr "åæï"
-#: ../gitg/gitg-window.ui.h:4
+#: ../gitg/gitg-window.ui.h:6
msgid "Co_mmit message"
msgstr "æääæ(_M)"
-#: ../gitg/gitg-window.ui.h:6
+#: ../gitg/gitg-window.ui.h:8
msgid "Context:"
msgstr "ååï"
-#: ../gitg/gitg-window.ui.h:8
-msgid "_Changes"
-msgstr "åæ(_C)"
-
#: ../gitg/gitg-window.ui.h:9
+msgid "Date"
+msgstr "ææ"
+
+#: ../gitg/gitg-window.ui.h:12
+msgid "Unstaged"
+msgstr "æå"
+
+#: ../gitg/gitg-window.ui.h:13
+#, fuzzy
+#| msgid "Commit"
+msgid "_Commit"
+msgstr "æä"
+
+#: ../gitg/gitg-window.ui.h:14
msgid "_Staged"
msgstr "æå(_S)"
-#: ../gitg/gitg-window.ui.h:10
+#: ../gitg/gitg-window.ui.h:15
msgid "_Unstaged"
msgstr "æå(_U)"
+
+#~ msgid "unstage"
+#~ msgstr "æå"
+
+#~ msgid "stage"
+#~ msgstr "æå"
+
+#~ msgid ""
+#~ "This program is free software; you can redistribute it and/or modify\n"
+#~ "it under the terms of the GNU General Public License as published by\n"
+#~ "the Free Software Foundation; either version 2 of the License, or\n"
+#~ "(at your option) any later version.\n"
+#~ "\n"
+#~ "This program is distributed in the hope that it will be useful,\n"
+#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+#~ "GNU General Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License\n"
+#~ "along with this program; if not, write to the Free Software\n"
+#~ "Foundation, Inc., 59 Temple Place, Suite 330,\n"
+#~ "Boston, MA 02111-1307, USA."
+#~ msgstr ""
+#~ "æçåæèçèäïæåäåéåçèçèäåéäååç GNU é\n"
+#~ "çååèååèçæåäéæåååä/æèåïäçèååèççä\n"
+#~ "çïæ(æææçéæ)ääææçæã\n"
+#~ "\n"
+#~ "æçåçååæåæåäæçïääåäääèïçèæ\n"
+#~ "æåäæçæåçåççéçæçææãæåçèèåç GNU éç\n"
+#~ "ååèååèã\n"
+#~ "\n"
+#~ "æåèéæçåæåä GNU éçååèååèääåæï\n"
+#~ "åæææïèçèçèäåéäåä\n"
+#~ "59 Temple Place, Suite 330, Boston, MA 02111-1307, USA."
+
+#~ msgid "_Changes"
+#~ msgstr "åæ(_C)"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]