[gitg] Updated translations

From: Jesse van den Kieboom <jessevdk src gnome org>
To: svn-commits-list gnome org
Subject: [gitg] Updated translations
Date: Sun, 5 Jul 2009 19:34:31 +0000 (UTC)
commit b5ebe282096c4cf387de48fec099f91f215bf5f2
Author: Jesse van den Kieboom <jessevdk gnome org>
Date:   Sun Jul 5 21:30:57 2009 +0200

    Updated translations

 gitg/gitg-menus.xml     |   18 +-
 gitg/gitg-repository.ui |    4 +-
 po/Makefile.in.in       |    4 +-
 po/POTFILES.in          |   10 +-
 po/da.po                |  705 ++++++++++++++++++++++++++++++++++++++--------
 po/es.po                |  700 ++++++++++++++++++++++++++++++++++++++--------
 po/fr.po                |  701 ++++++++++++++++++++++++++++++++++++++--------
 po/gitg.pot             |  638 +++++++++++++++++++++++++++++++++++-------
 po/gl.po                |  701 ++++++++++++++++++++++++++++++++++++++--------
 po/nl.po                |  713 +++++++++++++++++++++++++++++++++++++++--------
 po/pa.po                |  706 ++++++++++++++++++++++++++++++++++++++--------
 po/sv.po                |  707 ++++++++++++++++++++++++++++++++++++++---------
 12 files changed, 4623 insertions(+), 984 deletions(-)
---
diff --git a/gitg/gitg-menus.xml b/gitg/gitg-menus.xml
index c9617aa..bd7b5ba 100644
--- a/gitg/gitg-menus.xml
+++ b/gitg/gitg-menus.xml
@@ -38,34 +38,34 @@
       <object class="GtkActionGroup" id="action_group_ref">
         <child>
           <object class="GtkAction" id="CheckoutAction">
-            <property name="label">Checkout branch</property>
+            <property name="label" translatable="yes">Checkout branch</property>
             <signal name="activate" handler="on_checkout_branch_action_activate"/>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="RemoveAction">
-            <property name="label">Remove branch</property>
+            <property name="label" translatable="yes">Remove branch</property>
             <signal name="activate" handler="on_remove_branch_action_activate"/>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="RebaseAction">
-            <property name="label">Rebase branch onto...</property>
+            <property name="label" translatable="yes">Rebase branch onto...</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="MergeAction">
-            <property name="label">Merge branch with...</property>
+            <property name="label" translatable="yes">Merge branch with...</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="PushAction">
-            <property name="label">Push branch to...</property>
+            <property name="label" translatable="yes">Push branch to...</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="StashAction">
-            <property name="label">Apply stash to...</property>
+            <property name="label" translatable="yes">Apply stash to...</property>
           </object>
         </child>
       </object>
@@ -74,13 +74,13 @@
       <object class="GtkActionGroup" id="action_group_dnd">
         <child>
           <object class="GtkAction" id="MergeDndAction">
-            <property name="label">Merge</property>
+            <property name="label" translatable="yes">Merge</property>
             <signal name="activate" handler="on_merge_branch_action_activate"/>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="RebaseDndAction">
-            <property name="label">Rebase</property>
+            <property name="label" translatable="yes">Rebase</property>
             <signal name="activate" handler="on_rebase_branch_action_activate"/>
           </object>
         </child>
@@ -90,7 +90,7 @@
       <object class="GtkActionGroup" id="action_group_revision">
         <child>
           <object class="GtkAction" id="TagAction">
-            <property name="label">Create tag</property>
+            <property name="label" translatable="yes">Create tag</property>
             <signal name="activate" handler="on_revision_tag_activate"/>
           </object>
         </child>
diff --git a/gitg/gitg-repository.ui b/gitg/gitg-repository.ui
index 1e0bba3..79d866f 100644
--- a/gitg/gitg-repository.ui
+++ b/gitg/gitg-repository.ui
@@ -57,7 +57,7 @@
                         </child>
                         <child>
                           <object class="GtkTreeViewColumn" id="tree_view_remotes_column_name">
-                            <property name="title">Name</property>
+                            <property name="title" translatable="yes">Name</property>
                             <child>
                               <object class="GtkCellRendererText" id="tree_view_remotes_renderer_name">
                                 <property name="editable">True</property>
@@ -71,7 +71,7 @@
                         </child>
                         <child>
                           <object class="GtkTreeViewColumn" id="tree_view_remotes_column_url">
-                            <property name="title">URL</property>
+                            <property name="title" translatable="yes">URL</property>
                             <property name="expand">True</property>
                             <child>
                               <object class="GtkCellRendererText" id="tree_view_remotes_renderer_url">
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 57ef267..c7e8302 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -21,7 +21,7 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -56,7 +56,7 @@ ALL_LINGUAS = @ALL_LINGUAS@
 
 PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
 
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi)
 
 USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2e27e46..67a5668 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,6 +7,12 @@ gitg/gitg-commit-view.c
 gitg/gitg-repository.c
 gitg/gitg-revision-tree-view.c
 gitg/gitg-window.c
-[type: gettext/glade]gitg/gitg-ui.xml
+gitg/gitg-branch-actions.c
+gitg/gitg-repository-dialog.c
+[type: gettext/glade]gitg/gitg-window.ui
+[type: gettext/glade]gitg/gitg-commit-menu.ui
+[type: gettext/glade]gitg/gitg-preferences.ui
+[type: gettext/glade]gitg/gitg-repository.ui
+[type: gettext/glade]gitg/gitg-tag.ui
 [type: gettext/glade]gitg/gitg-menus.xml
-[type: gettext/glade]gitg/gitg-preferences.xml
+[type: gettext/glade]gitg/gitg-ui.xml
diff --git a/po/da.po b/po/da.po
index 3ee28b2..44af069 100644
--- a/po/da.po
+++ b/po/da.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitg master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-11 01:16+0200\n"
+"POT-Creation-Date: 2009-07-05 21:28+0200\n"
 "PO-Revision-Date: 2009-06-05 13:01+01:00\n"
 "Last-Translator: Joe Hansen <joedalton2 yahoo dk>\n"
 "Language-Team: Danish <dansk dansk-gruppen dk>\n"
@@ -24,16 +24,22 @@ msgid "Git repository browser"
 msgstr "Arkivbrowseren Git"
 
 #. Translators: this is the application name as in g_set_application_name
-#: ../data/gitg.desktop.in.in.h:2 ../gitg/gitg.c:169 ../gitg/gitg-window.c:788
-#: ../gitg/gitg-window.c:806 ../gitg/gitg-ui.xml.h:32
+#: ../data/gitg.desktop.in.in.h:2 ../gitg/gitg.c:169
+#: ../gitg/gitg-window.c:1005 ../gitg/gitg-window.c:1018
+#: ../gitg/gitg-branch-actions.c:146 ../gitg/gitg-branch-actions.c:199
+#: ../gitg/gitg-window.ui.h:18
 msgid "gitg"
 msgstr "gitg"
 
 #: ../data/gitg.schemas.in.h:1
+msgid "Column at Which Right Margin is Shown"
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:2
 msgid "Filter Revisions When Searching"
 msgstr "FilterÃ¦ndringer under sÃ¸gning"
 
-#: ../data/gitg.schemas.in.h:2
+#: ../data/gitg.schemas.in.h:3
 msgid ""
 "Setting that indicates when an inactive lane should be collapsed. Valid "
 "values are 0 - 4, where 0 indicates 'early' and 4 indicates 'late'."
@@ -41,11 +47,27 @@ msgstr ""
 "Indstilling som indikerer at en inaktiv bane bÃ¸r foldes sammen. Gyldige "
 "vÃ¦rdier er 0-4, hvor 0 indikerer 'tidlig' og 4 indikerer 'sent'."
 
-#: ../data/gitg.schemas.in.h:3
+#: ../data/gitg.schemas.in.h:4
+msgid "Show Right Margin in Commit Message View"
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:5
+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."
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:6
+msgid ""
+"The column at which the right margin is shown if the right-margin preference "
+"is set to TRUE."
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:7
 msgid "When to Collapse Inactive Lanes"
 msgstr "HvornÃ¥r inaktive baner skal foldes sammen"
 
-#: ../data/gitg.schemas.in.h:4
+#: ../data/gitg.schemas.in.h:8
 msgid ""
 "Whether searching filters the revisions in the history view instead of "
 "jumping to the first match."
@@ -61,51 +83,51 @@ msgstr "Start gitg i integreringstilstand"
 msgid "- git repository viewer"
 msgstr "- arkivviseren git"
 
-#: ../gitg/gitg-commit-view.c:204 ../gitg/gitg-revision-tree-view.c:181
+#: ../gitg/gitg-commit-view.c:208 ../gitg/gitg-revision-tree-view.c:181
 msgid "Cannot display file content as text"
 msgstr "Kan ikke vise filindhold som tekst"
 
-#: ../gitg/gitg-commit-view.c:1410
+#: ../gitg/gitg-commit-view.c:1431
 msgid "You must first stage some changes before committing"
 msgstr "Du skal fÃ¸rst igangsÃ¦tte nogle Ã¦ndringer fÃ¸r du integrerer"
 
-#: ../gitg/gitg-commit-view.c:1418
+#: ../gitg/gitg-commit-view.c:1439
 msgid "Please enter a commit message before committing"
 msgstr "Indtast venligst en integreringstekst fÃ¸r du integrerer"
 
-#: ../gitg/gitg-commit-view.c:1429
+#: ../gitg/gitg-commit-view.c:1451
 msgid ""
 "Your user name or email could not be retrieved for use in the sign off "
 "message"
 msgstr ""
 "Dit brugernavn eller e-post kunne ikke indhentes til brug for afslutbeskeden"
 
-#: ../gitg/gitg-commit-view.c:1431
+#: ../gitg/gitg-commit-view.c:1453
 msgid "Something went wrong while trying to commit"
 msgstr "Noget gik galt mens du integrerede"
 
-#: ../gitg/gitg-commit-view.c:1588
+#: ../gitg/gitg-commit-view.c:1612
 msgid "Revert fail"
 msgstr "Fortryd fejl"
 
-#: ../gitg/gitg-commit-view.c:1599
+#: ../gitg/gitg-commit-view.c:1623
 msgid "Are you sure you want to revert these changes?"
 msgstr "Er du sikker pÃ¥, at du Ã¸nsker at fortryde disse Ã¦ndringer?"
 
-#: ../gitg/gitg-commit-view.c:1602
+#: ../gitg/gitg-commit-view.c:1626
 msgid "Reverting changes is permanent and cannot be undone"
 msgstr "Fortrydelse af Ã¦ndringer er endelig og kan ikke gÃ¸res om"
 
 # godt nok i tvivl her (igangsatte, trin, etape mÃ¥ske arrangerede Ã¦ndringer)
-#: ../gitg/gitg-repository.c:472
+#: ../gitg/gitg-repository.c:591
 msgid "Staged changes"
 msgstr "Igangsatte Ã¦ndringer"
 
-#: ../gitg/gitg-repository.c:474
+#: ../gitg/gitg-repository.c:593
 msgid "Unstaged changes"
 msgstr "Ã?ndringer der ikke er igangsat"
 
-#: ../gitg/gitg-repository.c:981
+#: ../gitg/gitg-repository.c:1148
 msgid "Not a valid git repository"
 msgstr "Ikke et gyldigt gitarkiv"
 
@@ -113,41 +135,61 @@ msgstr "Ikke et gyldigt gitarkiv"
 msgid "(Empty)"
 msgstr "(Tom)"
 
-#: ../gitg/gitg-window.c:347
+#: ../gitg/gitg-window.c:420
 msgid "Select branch"
 msgstr "VÃ¦lg gren"
 
-#: ../gitg/gitg-window.c:533
+#: ../gitg/gitg-window.c:482
+#, c-format
+msgid "Push local branch <%s> to remote branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-window.c:489
+#, c-format
+msgid "Merge/rebase local branch <%s> with/on local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-window.c:496
+#, c-format
+msgid "Merge/rebase local branch <%s> with/on remote branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-window.c:503
+#, c-format
+msgid "Apply stash to local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-window.c:771
 msgid "Begin loading repository"
 msgstr "Begynd indlÃ¦sning af arkiv"
 
-#: ../gitg/gitg-window.c:542
+#: ../gitg/gitg-window.c:780
 #, c-format
 msgid "Loaded %d revisions in %.2fs"
 msgstr "IndlÃ¦ste %d Ã¦ndringer i %.2fs"
 
-#: ../gitg/gitg-window.c:553
+#: ../gitg/gitg-window.c:791
 #, c-format
 msgid "Loading %d revisions..."
 msgstr "IndlÃ¦ser %d Ã¦ndringer..."
 
-#: ../gitg/gitg-window.c:562
+#: ../gitg/gitg-window.c:800
 msgid "Could not find git repository"
 msgstr "Kunne ikke finde gitarkiv"
 
-#: ../gitg/gitg-window.c:698
+#: ../gitg/gitg-window.c:983
 msgid "All branches"
 msgstr "Alle grene"
 
-#: ../gitg/gitg-window.c:863
+#: ../gitg/gitg-window.c:1192
 msgid "Open git repository"
 msgstr "Ã?bn gitarkiv"
 
-#: ../gitg/gitg-window.c:988
+#: ../gitg/gitg-window.c:1313
 msgid "gitg is a git repository viewer for gtk+/GNOME"
 msgstr "gitg er en lÃ¦ser til gitarkiver for gtk'/GNOME"
 
-#: ../gitg/gitg-window.c:989
+#: ../gitg/gitg-window.c:1314
 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"
@@ -165,182 +207,601 @@ msgid ""
 "Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:1
+#: ../gitg/gitg-window.c:1775 ../gitg/gitg-window.c:1809
+#, fuzzy, c-format
+msgid "New local branch <%s>"
+msgstr "Alle grene"
+
+#: ../gitg/gitg-window.c:1787 ../gitg/gitg-branch-actions.c:316
+#, fuzzy
+msgid "Remove remote branch"
+msgstr "VÃ¦lg gren"
+
+#: ../gitg/gitg-window.c:1791
+msgid "Checkout working copy"
+msgstr ""
+
+#: ../gitg/gitg-window.c:1792
+#, fuzzy
+msgid "Remove local branch"
+msgstr "VÃ¦lg gren"
+
+#: ../gitg/gitg-window.c:1800 ../gitg/gitg-branch-actions.c:391
+msgid "Remove stash"
+msgstr ""
+
+#: ../gitg/gitg-window.c:1805 ../gitg/gitg-branch-actions.c:456
+#: ../gitg/gitg-branch-actions.c:458
+#, fuzzy
+msgid "Remove tag"
+msgstr "Fortryd"
+
+#: ../gitg/gitg-window.c:1984
+msgid "Not all fields are correctly filled in"
+msgstr ""
+
+#: ../gitg/gitg-window.c:1986
+msgid "Please make sure to fill in both the tag name and the commit message"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:249
+#, c-format
+msgid "Branch <%s> could not be removed"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:250
+msgid ""
+"This usually means that the branch is not fully merged in HEAD. Do you want "
+"to forcefully remove the branch?"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:251
+msgid "Force remove"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:260
+#, c-format
+msgid "Branch <%s> could not be forcefully removed"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:293
+#, c-format
+msgid "Failed to remove remote branch <%s>."
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:314
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the remote branch <%s>?"
+msgstr "Er du sikker pÃ¥, at du Ã¸nsker at fortryde disse Ã¦ndringer?"
+
+#: ../gitg/gitg-branch-actions.c:315
+msgid "This permanently removes the remote branch."
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:332 ../gitg/gitg-menus.xml.h:9
+#, fuzzy
+msgid "Remove branch"
+msgstr "VÃ¦lg gren"
+
+#: ../gitg/gitg-branch-actions.c:389
+#, fuzzy
+msgid "Are you sure you want to remove this stash item?"
+msgstr "Er du sikker pÃ¥, at du Ã¸nsker at fortryde disse Ã¦ndringer?"
+
+#: ../gitg/gitg-branch-actions.c:390
+msgid "This permanently removes the stash item"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:417
+msgid "Failed to remove stash"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:418
+msgid "The stash item could not be successfully removed"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:452
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the tag <%s>?"
+msgstr "Er du sikker pÃ¥, at du Ã¸nsker at fortryde disse Ã¦ndringer?"
+
+#: ../gitg/gitg-branch-actions.c:475
+#, c-format
+msgid "The tag <%s> could not be successfully removed"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:479
+msgid "Failed to remove tag"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:579
+#, fuzzy
+msgid "Do you want to temporarily stash these changes?"
+msgstr "Er du sikker pÃ¥, at du Ã¸nsker at fortryde disse Ã¦ndringer?"
+
+#: ../gitg/gitg-branch-actions.c:583
+#, fuzzy
+msgid "Do you want to stash and reapply these changes?"
+msgstr "Er du sikker pÃ¥, at du Ã¸nsker at fortryde disse Ã¦ndringer?"
+
+#: ../gitg/gitg-branch-actions.c:588
+msgid "You have uncommited changes in your current working tree"
+msgstr ""
+
+# godt nok i tvivl her (igangsatte, trin, etape mÃ¥ske arrangerede Ã¦ndringer)
+#: ../gitg/gitg-branch-actions.c:590
+#, fuzzy
+msgid "Stash changes"
+msgstr "Igangsatte Ã¦ndringer"
+
+#: ../gitg/gitg-branch-actions.c:766
+msgid "Failed to save current index state"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:820 ../gitg/gitg-branch-actions.c:1102
+#: ../gitg/gitg-branch-actions.c:1397
+#, c-format
+msgid "Failed to checkout local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:858
+#, c-format
+msgid "Failed to checkout remote branch <%s> to local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:898
+#, c-format
+msgid "Failed to checkout tag <%s> to local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:989
+#, c-format
+msgid "Failed to rebase %s branch <%s> onto %s branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:993
+#, c-format
+msgid "Failed to merge %s branch <%s> with %s branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1001 ../gitg/gitg-branch-actions.c:1003
+#: ../gitg/gitg-branch-actions.c:1069 ../gitg/gitg-branch-actions.c:1071
+#: ../gitg/gitg-branch-actions.c:1110 ../gitg/gitg-branch-actions.c:1112
+#: ../gitg/gitg-branch-actions.c:1146 ../gitg/gitg-branch-actions.c:1148
+#: ../gitg/gitg-branch-actions.c:1193 ../gitg/gitg-branch-actions.c:1195
+msgid "local"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1001 ../gitg/gitg-branch-actions.c:1003
+#: ../gitg/gitg-branch-actions.c:1069 ../gitg/gitg-branch-actions.c:1071
+#: ../gitg/gitg-branch-actions.c:1110 ../gitg/gitg-branch-actions.c:1112
+#: ../gitg/gitg-branch-actions.c:1146 ../gitg/gitg-branch-actions.c:1148
+#: ../gitg/gitg-branch-actions.c:1193 ../gitg/gitg-branch-actions.c:1195
+#, fuzzy
+msgid "remote"
+msgstr "TrÃ¦"
+
+#: ../gitg/gitg-branch-actions.c:1020
+msgid "The stashed changes have been stored to be reapplied manually"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1025
+msgid "Failed to checkout previously checked out branch"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1046
+msgid "Failed to reapply stash correctly"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1047
+msgid ""
+"There might be unresolved conflicts in the working tree or index which you "
+"need to resolve manually"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1068
+#, fuzzy, c-format
+msgid "Are you sure you want to merge %s branch <%s> onto %s branch <%s>?"
+msgstr "Er du sikker pÃ¥, at du Ã¸nsker at fortryde disse Ã¦ndringer?"
+
+#: ../gitg/gitg-branch-actions.c:1076 ../gitg/gitg-branch-actions.c:1078
+#: ../gitg/gitg-branch-actions.c:1122 ../gitg/gitg-menus.xml.h:4
+msgid "Merge"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1103
+msgid "The branch on which to merge could not be checked out"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1109
+#, c-format
+msgid "Merging %s branch <%s> onto %s branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1145
+#, fuzzy, c-format
+msgid "Are you sure you want to rebase %s branch <%s> onto %s branch <%s>?"
+msgstr "Er du sikker pÃ¥, at du Ã¸nsker at fortryde disse Ã¦ndringer?"
+
+#: ../gitg/gitg-branch-actions.c:1153 ../gitg/gitg-branch-actions.c:1155
+#: ../gitg/gitg-branch-actions.c:1205 ../gitg/gitg-menus.xml.h:7
+msgid "Rebase"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1178
+msgid "Unable to rebase"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1179
+msgid ""
+"There are still uncommitted changes in your working tree and you are trying "
+"to rebase a branch onto the currently checked out branch. Either remove, "
+"stash or commit your changes first and try again"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1192
+#, c-format
+msgid "Rebasing %s branch <%s> onto %s branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1231
+#, c-format
+msgid "Failed to push local branch <%s> to remote <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1232
+msgid ""
+"This usually means that the remote branch could not be fast-forwarded. Try "
+"fetching the latest changes."
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1256
+#, fuzzy, c-format
+msgid "Are you sure you want to push <%s> to <%s>?"
+msgstr "Er du sikker pÃ¥, at du Ã¸nsker at fortryde disse Ã¦ndringer?"
+
+#: ../gitg/gitg-branch-actions.c:1262 ../gitg/gitg-branch-actions.c:1264
+#: ../gitg/gitg-branch-actions.c:1285 ../gitg/gitg-branch-actions.c:1317
+#: ../gitg/gitg-branch-actions.c:1319 ../gitg/gitg-branch-actions.c:1346
+msgid "Push"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1277 ../gitg/gitg-branch-actions.c:1331
+#, c-format
+msgid "Pushing local branch <%s> to remote branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1311
+#, fuzzy, c-format
+msgid "Are you sure you want to push <%s> to remote <%s>?"
+msgstr "Er du sikker pÃ¥, at du Ã¸nsker at fortryde disse Ã¦ndringer?"
+
+#: ../gitg/gitg-branch-actions.c:1370
+#, fuzzy, c-format
+msgid "Are you sure you want to apply the stash item to local branch <%s>?"
+msgstr "Er du sikker pÃ¥, at du Ã¸nsker at fortryde disse Ã¦ndringer?"
+
+#: ../gitg/gitg-branch-actions.c:1375 ../gitg/gitg-branch-actions.c:1377
+msgid "Apply stash"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1416
+#, c-format
+msgid "The stash could not be applied to local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1420
+msgid "Failed to apply stash"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1466
+msgid ""
+"The tag object could not be successfully created. Please make sure you have "
+"a GPG key and the key is unlocked"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1470
+msgid "The tag object could not be successfully created"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1475
+msgid "Failed to create tag"
+msgstr ""
+
+#: ../gitg/gitg-repository-dialog.c:173 ../gitg/gitg-repository.ui.h:4
+msgid "Fetch"
+msgstr ""
+
+#: ../gitg/gitg-repository-dialog.c:178
+msgid "Cancel"
+msgstr ""
+
+#: ../gitg/gitg-repository-dialog.c:441 ../gitg/gitg-repository.ui.h:7
+#: ../gitg/gitg-tag.ui.h:5
+msgid "Properties"
+msgstr ""
+
+#: ../gitg/gitg-window.ui.h:1
 msgid "Add signed-off-by"
 msgstr "TilfÃ¸j godkendt-af"
 
-#: ../gitg/gitg-ui.xml.h:2
-msgid "Author"
-msgstr "Forfatter"
+#: ../gitg/gitg-window.ui.h:2
+msgid "Amend"
+msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:3
+#: ../gitg/gitg-window.ui.h:3
 msgid "Author:"
 msgstr "Forfatter:"
 
-#: ../gitg/gitg-ui.xml.h:4
+#: ../gitg/gitg-window.ui.h:4
 msgid "Branch:"
 msgstr "Gren:"
 
-#: ../gitg/gitg-ui.xml.h:5
+#: ../gitg/gitg-window.ui.h:5
 msgid "Co_mmit message"
 msgstr "In_tegrer besked"
 
-#: ../gitg/gitg-ui.xml.h:6
+#: ../gitg/gitg-window.ui.h:6 ../gitg/gitg-preferences.ui.h:5
 msgid "Commit"
 msgstr "Integrer"
 
-#: ../gitg/gitg-ui.xml.h:7
+#: ../gitg/gitg-window.ui.h:7
 msgid "Context:"
 msgstr "Kontekst:"
 
-#: ../gitg/gitg-ui.xml.h:8
-msgid "Date"
-msgstr "Dato"
-
-#: ../gitg/gitg-ui.xml.h:9
+#: ../gitg/gitg-window.ui.h:8
 msgid "Date:"
 msgstr "Dato:"
 
-#: ../gitg/gitg-ui.xml.h:10
+#: ../gitg/gitg-window.ui.h:9
 msgid "Details"
 msgstr "Detaljer"
 
-#: ../gitg/gitg-ui.xml.h:11
-msgid "Filename"
-msgstr "Filnavn"
-
-#: ../gitg/gitg-ui.xml.h:12
+#: ../gitg/gitg-window.ui.h:10
 msgid "History"
 msgstr "Historik"
 
-#: ../gitg/gitg-ui.xml.h:13
-msgid "Ignore"
-msgstr "Ignorer"
-
-#: ../gitg/gitg-ui.xml.h:14
+#: ../gitg/gitg-window.ui.h:11
 msgid "Parent:"
 msgstr "ForÃ¦ldre:"
 
-#: ../gitg/gitg-ui.xml.h:15
-msgid "R_ecently Opened"
-msgstr "Ã?bn_et for nylig"
-
-#: ../gitg/gitg-ui.xml.h:16
-msgid "Revert"
-msgstr "Fortryd"
-
-#: ../gitg/gitg-ui.xml.h:17
+#: ../gitg/gitg-window.ui.h:12
 msgid "SHA:"
 msgstr "SHA:"
 
-#: ../gitg/gitg-ui.xml.h:18
-msgid "Stage"
-msgstr "IgangsÃ¦tte"
-
-#: ../gitg/gitg-ui.xml.h:19
-msgid "Subject"
-msgstr "Emne"
-
-#: ../gitg/gitg-ui.xml.h:20
+#: ../gitg/gitg-window.ui.h:13
 msgid "Subject:"
 msgstr "Emne:"
 
-#: ../gitg/gitg-ui.xml.h:21
+#: ../gitg/gitg-window.ui.h:14
 msgid "Tree"
 msgstr "TrÃ¦"
 
-#: ../gitg/gitg-ui.xml.h:22
-msgid "Unstage"
-msgstr "Fortryde igangsÃ¦ttelse"
-
-#: ../gitg/gitg-ui.xml.h:23
-msgid "Unstaged"
-msgstr "Ikke igangsat"
-
-#: ../gitg/gitg-ui.xml.h:24
+#: ../gitg/gitg-window.ui.h:15
 msgid "_Changes"
 msgstr "_Ã?ndringer"
 
-#: ../gitg/gitg-ui.xml.h:25
-msgid "_Edit"
-msgstr "_Rediger"
-
-#: ../gitg/gitg-ui.xml.h:26
-msgid "_File"
-msgstr "_Fil"
-
-#: ../gitg/gitg-ui.xml.h:27
-msgid "_Help"
-msgstr "_HjÃ¦lp"
-
-#: ../gitg/gitg-ui.xml.h:28
-msgid "_Open..."
-msgstr "_Ã?bn..."
-
-#: ../gitg/gitg-ui.xml.h:29
+#: ../gitg/gitg-window.ui.h:16
 msgid "_Staged"
 msgstr "Igang_sat"
 
-#: ../gitg/gitg-ui.xml.h:30
+#: ../gitg/gitg-window.ui.h:17
 msgid "_Unstaged"
 msgstr "_Ikke igangsat"
 
-#: ../gitg/gitg-ui.xml.h:31
-msgid "_View"
-msgstr "_Vis"
+#: ../gitg/gitg-commit-menu.ui.h:1 ../gitg/gitg-ui.xml.h:1
+msgid "Ignore"
+msgstr "Ignorer"
 
-#: ../gitg/gitg-menus.xml.h:1
-msgid "_Author"
-msgstr "_Forfatter"
+#: ../gitg/gitg-commit-menu.ui.h:2 ../gitg/gitg-ui.xml.h:3
+msgid "Revert"
+msgstr "Fortryd"
 
-#: ../gitg/gitg-menus.xml.h:2
-msgid "_Date"
-msgstr "_Dato"
+#: ../gitg/gitg-commit-menu.ui.h:3 ../gitg/gitg-ui.xml.h:4
+msgid "Stage"
+msgstr "IgangsÃ¦tte"
 
-#: ../gitg/gitg-menus.xml.h:3
-msgid "_Hash"
-msgstr "_Hash"
+#: ../gitg/gitg-commit-menu.ui.h:4 ../gitg/gitg-ui.xml.h:5
+msgid "Unstage"
+msgstr "Fortryde igangsÃ¦ttelse"
 
-#: ../gitg/gitg-menus.xml.h:4
-msgid "_Subject"
-msgstr "_Emne"
+#: ../gitg/gitg-preferences.ui.h:1
+#, fuzzy
+msgid "<b>Commit Message</b>"
+msgstr "In_tegrer besked"
 
-#: ../gitg/gitg-preferences.xml.h:1
+#: ../gitg/gitg-preferences.ui.h:2
 msgid "<b>History</b>"
 msgstr "<b>Historik</b>"
 
-#: ../gitg/gitg-preferences.xml.h:2
+#: ../gitg/gitg-preferences.ui.h:3 ../gitg/gitg-repository.ui.h:1
+#, fuzzy
+msgid "<b>User</b>"
+msgstr "<b>Historik</b>"
+
+#: ../gitg/gitg-preferences.ui.h:4
 msgid "Collapse inactive lanes"
 msgstr "Fold inaktive baner sammen"
 
-#: ../gitg/gitg-preferences.xml.h:3
+#: ../gitg/gitg-preferences.ui.h:6 ../gitg/gitg-repository.ui.h:2
+msgid "Configuration"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:7
+msgid ""
+"Configure global git settings. This corresponds to the settings as stored in "
+"~/.gitconfig. Repository specific settings can be configured at the "
+"repository properties."
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:8
+msgid "Display right _margin"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:9 ../gitg/gitg-repository.ui.h:3
+msgid "E-mail:"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:10
 msgid "Early"
 msgstr "Tidlig"
 
-#: ../gitg/gitg-preferences.xml.h:4
+#: ../gitg/gitg-preferences.ui.h:11
 msgid "Late"
 msgstr "Sent"
 
-#: ../gitg/gitg-preferences.xml.h:5
+#: ../gitg/gitg-preferences.ui.h:12 ../gitg/gitg-repository.ui.h:6
+#: ../gitg/gitg-tag.ui.h:4
+#, fuzzy
+msgid "Name:"
+msgstr "Dato:"
+
+#: ../gitg/gitg-preferences.ui.h:13
 msgid "Preferences"
 msgstr "Indstillinger"
 
-#: ../gitg/gitg-preferences.xml.h:6
+#: ../gitg/gitg-preferences.ui.h:14
+msgid "Preferences that apply to the commit view"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:15
+msgid "Preferences that apply to the revision view"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:16
 msgid "Search filters revisions in the history view"
 msgstr "SÃ¸g filterÃ¦ndringer i historikvisningen"
 
-#: ../gitg/gitg-preferences.xml.h:7
+#: ../gitg/gitg-preferences.ui.h:17
 msgid "Show staged changes in history"
 msgstr "Vis igangsatte Ã¦ndringer i historikken"
 
-#: ../gitg/gitg-preferences.xml.h:8
+#: ../gitg/gitg-preferences.ui.h:18
 msgid "Show stash in history"
 msgstr "Vis opbevaring i historikken"
 
-#: ../gitg/gitg-preferences.xml.h:9
+#: ../gitg/gitg-preferences.ui.h:19
 msgid "Show unstaged changes in history"
 msgstr "Vis Ã¦ndringer der ikke er igangsat i historikken"
 
-#: ../gitg/gitg-preferences.xml.h:10
+#: ../gitg/gitg-preferences.ui.h:20
 msgid "View"
 msgstr "Vis"
+
+#: ../gitg/gitg-preferences.ui.h:21
+msgid "_Right margin at column:"
+msgstr ""
+
+#: ../gitg/gitg-repository.ui.h:5
+#, fuzzy
+msgid "Name"
+msgstr "Dato:"
+
+#: ../gitg/gitg-repository.ui.h:8
+msgid "Remotes"
+msgstr ""
+
+#: ../gitg/gitg-repository.ui.h:9
+msgid "URL"
+msgstr ""
+
+#: ../gitg/gitg-repository.ui.h:10
+msgid "gtk-add"
+msgstr ""
+
+#: ../gitg/gitg-repository.ui.h:11
+msgid "gtk-remove"
+msgstr ""
+
+#: ../gitg/gitg-tag.ui.h:1
+msgid "Create signed tag object"
+msgstr ""
+
+#: ../gitg/gitg-tag.ui.h:2 ../gitg/gitg-menus.xml.h:3
+msgid "Create tag"
+msgstr ""
+
+#: ../gitg/gitg-tag.ui.h:3
+msgid "Message:"
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:1
+msgid "Apply stash to..."
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:2
+#, fuzzy
+msgid "Checkout branch"
+msgstr "VÃ¦lg gren"
+
+#: ../gitg/gitg-menus.xml.h:5
+msgid "Merge branch with..."
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:6
+msgid "Push branch to..."
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:8
+msgid "Rebase branch onto..."
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:10
+msgid "_Author"
+msgstr "_Forfatter"
+
+#: ../gitg/gitg-menus.xml.h:11
+msgid "_Date"
+msgstr "_Dato"
+
+#: ../gitg/gitg-menus.xml.h:12
+msgid "_Hash"
+msgstr "_Hash"
+
+#: ../gitg/gitg-menus.xml.h:13
+msgid "_Subject"
+msgstr "_Emne"
+
+#: ../gitg/gitg-ui.xml.h:2
+msgid "R_ecently Opened"
+msgstr "Ã?bn_et for nylig"
+
+#: ../gitg/gitg-ui.xml.h:6
+msgid "_Edit"
+msgstr "_Rediger"
+
+#: ../gitg/gitg-ui.xml.h:7
+msgid "_File"
+msgstr "_Fil"
+
+#: ../gitg/gitg-ui.xml.h:8
+msgid "_Help"
+msgstr "_HjÃ¦lp"
+
+#: ../gitg/gitg-ui.xml.h:9
+msgid "_Open..."
+msgstr "_Ã?bn..."
+
+#: ../gitg/gitg-ui.xml.h:10
+#, fuzzy
+msgid "_Repository"
+msgstr "Ã?bn gitarkiv"
+
+#: ../gitg/gitg-ui.xml.h:11
+msgid "_View"
+msgstr "_Vis"
+
+#~ msgid "Author"
+#~ msgstr "Forfatter"
+
+#~ msgid "Date"
+#~ msgstr "Dato"
+
+#~ msgid "Filename"
+#~ msgstr "Filnavn"
+
+#~ msgid "Subject"
+#~ msgstr "Emne"
+
+#~ msgid "Unstaged"
+#~ msgstr "Ikke igangsat"
diff --git a/po/es.po b/po/es.po
index 6fc288c..2fb7f5d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gitg.po.master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gitg&component=gitg\n";
-"POT-Creation-Date: 2009-06-10 23:17+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-07-05 21:28+0200\n"
 "PO-Revision-Date: 2009-06-11 09:23+0200\n"
 "Last-Translator: Jorge GonzÃ¡lez <jorgegonz svn gnome org>\n"
 "Language-Team: EspaÃ±ol <gnome-es-list gnome org>\n"
@@ -23,26 +23,48 @@ msgid "Git repository browser"
 msgstr "Examinador de repositorios Git"
 
 #. Translators: this is the application name as in g_set_application_name
-#: ../data/gitg.desktop.in.in.h:2 ../gitg/gitg.c:169 ../gitg/gitg-window.c:788
-#: ../gitg/gitg-window.c:806 ../gitg/gitg-ui.xml.h:32
+#: ../data/gitg.desktop.in.in.h:2 ../gitg/gitg.c:169
+#: ../gitg/gitg-window.c:1005 ../gitg/gitg-window.c:1018
+#: ../gitg/gitg-branch-actions.c:146 ../gitg/gitg-branch-actions.c:199
+#: ../gitg/gitg-window.ui.h:18
 msgid "gitg"
 msgstr "gitg"
 
 #: ../data/gitg.schemas.in.h:1
+msgid "Column at Which Right Margin is Shown"
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:2
 msgid "Filter Revisions When Searching"
 msgstr "Filtrar revisiones al buscar"
 
-#: ../data/gitg.schemas.in.h:2
+#: ../data/gitg.schemas.in.h:3
 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 ""
 
-#: ../data/gitg.schemas.in.h:3
+#: ../data/gitg.schemas.in.h:4
+msgid "Show Right Margin in Commit Message View"
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:5
+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."
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:6
+msgid ""
+"The column at which the right margin is shown if the right-margin preference "
+"is set to TRUE."
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:7
 msgid "When to Collapse Inactive Lanes"
 msgstr ""
 
-#: ../data/gitg.schemas.in.h:4
+#: ../data/gitg.schemas.in.h:8
 msgid ""
 "Whether searching filters the revisions in the history view instead of "
 "jumping to the first match."
@@ -56,49 +78,49 @@ msgstr ""
 msgid "- git repository viewer"
 msgstr "- visor de repositorios git"
 
-#: ../gitg/gitg-commit-view.c:204 ../gitg/gitg-revision-tree-view.c:181
+#: ../gitg/gitg-commit-view.c:208 ../gitg/gitg-revision-tree-view.c:181
 msgid "Cannot display file content as text"
 msgstr "No se puede mostrar el contenido del archivo como texto"
 
-#: ../gitg/gitg-commit-view.c:1410
+#: ../gitg/gitg-commit-view.c:1431
 msgid "You must first stage some changes before committing"
 msgstr ""
 
-#: ../gitg/gitg-commit-view.c:1418
+#: ../gitg/gitg-commit-view.c:1439
 msgid "Please enter a commit message before committing"
 msgstr ""
 
-#: ../gitg/gitg-commit-view.c:1429
+#: ../gitg/gitg-commit-view.c:1451
 msgid ""
 "Your user name or email could not be retrieved for use in the sign off "
 "message"
 msgstr ""
 
-#: ../gitg/gitg-commit-view.c:1431
+#: ../gitg/gitg-commit-view.c:1453
 msgid "Something went wrong while trying to commit"
 msgstr ""
 
-#: ../gitg/gitg-commit-view.c:1588
+#: ../gitg/gitg-commit-view.c:1612
 msgid "Revert fail"
 msgstr "FallÃ³ al revertir"
 
-#: ../gitg/gitg-commit-view.c:1599
+#: ../gitg/gitg-commit-view.c:1623
 msgid "Are you sure you want to revert these changes?"
 msgstr "Â¿EstÃ¡ seguro de que quiere revertir estos cambios?"
 
-#: ../gitg/gitg-commit-view.c:1602
+#: ../gitg/gitg-commit-view.c:1626
 msgid "Reverting changes is permanent and cannot be undone"
 msgstr "Revertir los cambios es una acciÃ³n permanente y no se puede deshacer"
 
-#: ../gitg/gitg-repository.c:472
+#: ../gitg/gitg-repository.c:591
 msgid "Staged changes"
 msgstr ""
 
-#: ../gitg/gitg-repository.c:474
+#: ../gitg/gitg-repository.c:593
 msgid "Unstaged changes"
 msgstr ""
 
-#: ../gitg/gitg-repository.c:981
+#: ../gitg/gitg-repository.c:1148
 msgid "Not a valid git repository"
 msgstr "No es un repositorio git vÃ¡lido"
 
@@ -106,41 +128,61 @@ msgstr "No es un repositorio git vÃ¡lido"
 msgid "(Empty)"
 msgstr "(VacÃo)"
 
-#: ../gitg/gitg-window.c:347
+#: ../gitg/gitg-window.c:420
 msgid "Select branch"
 msgstr "Seleccionar rama"
 
-#: ../gitg/gitg-window.c:533
+#: ../gitg/gitg-window.c:482
+#, c-format
+msgid "Push local branch <%s> to remote branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-window.c:489
+#, c-format
+msgid "Merge/rebase local branch <%s> with/on local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-window.c:496
+#, c-format
+msgid "Merge/rebase local branch <%s> with/on remote branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-window.c:503
+#, c-format
+msgid "Apply stash to local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-window.c:771
 msgid "Begin loading repository"
 msgstr ""
 
-#: ../gitg/gitg-window.c:542
+#: ../gitg/gitg-window.c:780
 #, c-format
 msgid "Loaded %d revisions in %.2fs"
 msgstr "%d revisiones cargadas en %.2fs"
 
-#: ../gitg/gitg-window.c:553
+#: ../gitg/gitg-window.c:791
 #, c-format
 msgid "Loading %d revisions..."
 msgstr "Cargando %d revisiones..."
 
-#: ../gitg/gitg-window.c:562
+#: ../gitg/gitg-window.c:800
 msgid "Could not find git repository"
 msgstr "No se pudo encontrar el repositorio git"
 
-#: ../gitg/gitg-window.c:698
+#: ../gitg/gitg-window.c:983
 msgid "All branches"
 msgstr "Todas las ramas"
 
-#: ../gitg/gitg-window.c:863
+#: ../gitg/gitg-window.c:1192
 msgid "Open git repository"
 msgstr "Abrir repositorio git"
 
-#: ../gitg/gitg-window.c:988
+#: ../gitg/gitg-window.c:1313
 msgid "gitg is a git repository viewer for gtk+/GNOME"
 msgstr "gitg es un visor de repositorios git para GTk+/GNOME"
 
-#: ../gitg/gitg-window.c:989
+#: ../gitg/gitg-window.c:1314
 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"
@@ -158,183 +200,595 @@ msgid ""
 "Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:1
+#: ../gitg/gitg-window.c:1775 ../gitg/gitg-window.c:1809
+#, fuzzy, c-format
+msgid "New local branch <%s>"
+msgstr "Todas las ramas"
+
+#: ../gitg/gitg-window.c:1787 ../gitg/gitg-branch-actions.c:316
+#, fuzzy
+msgid "Remove remote branch"
+msgstr "Seleccionar rama"
+
+#: ../gitg/gitg-window.c:1791
+msgid "Checkout working copy"
+msgstr ""
+
+#: ../gitg/gitg-window.c:1792
+#, fuzzy
+msgid "Remove local branch"
+msgstr "Seleccionar rama"
+
+#: ../gitg/gitg-window.c:1800 ../gitg/gitg-branch-actions.c:391
+msgid "Remove stash"
+msgstr ""
+
+#: ../gitg/gitg-window.c:1805 ../gitg/gitg-branch-actions.c:456
+#: ../gitg/gitg-branch-actions.c:458
+#, fuzzy
+msgid "Remove tag"
+msgstr "Revertir"
+
+#: ../gitg/gitg-window.c:1984
+msgid "Not all fields are correctly filled in"
+msgstr ""
+
+#: ../gitg/gitg-window.c:1986
+msgid "Please make sure to fill in both the tag name and the commit message"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:249
+#, c-format
+msgid "Branch <%s> could not be removed"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:250
+msgid ""
+"This usually means that the branch is not fully merged in HEAD. Do you want "
+"to forcefully remove the branch?"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:251
+msgid "Force remove"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:260
+#, c-format
+msgid "Branch <%s> could not be forcefully removed"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:293
+#, c-format
+msgid "Failed to remove remote branch <%s>."
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:314
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the remote branch <%s>?"
+msgstr "Â¿EstÃ¡ seguro de que quiere revertir estos cambios?"
+
+#: ../gitg/gitg-branch-actions.c:315
+msgid "This permanently removes the remote branch."
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:332 ../gitg/gitg-menus.xml.h:9
+#, fuzzy
+msgid "Remove branch"
+msgstr "Seleccionar rama"
+
+#: ../gitg/gitg-branch-actions.c:389
+#, fuzzy
+msgid "Are you sure you want to remove this stash item?"
+msgstr "Â¿EstÃ¡ seguro de que quiere revertir estos cambios?"
+
+#: ../gitg/gitg-branch-actions.c:390
+msgid "This permanently removes the stash item"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:417
+msgid "Failed to remove stash"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:418
+msgid "The stash item could not be successfully removed"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:452
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the tag <%s>?"
+msgstr "Â¿EstÃ¡ seguro de que quiere revertir estos cambios?"
+
+#: ../gitg/gitg-branch-actions.c:475
+#, c-format
+msgid "The tag <%s> could not be successfully removed"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:479
+msgid "Failed to remove tag"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:579
+#, fuzzy
+msgid "Do you want to temporarily stash these changes?"
+msgstr "Â¿EstÃ¡ seguro de que quiere revertir estos cambios?"
+
+#: ../gitg/gitg-branch-actions.c:583
+#, fuzzy
+msgid "Do you want to stash and reapply these changes?"
+msgstr "Â¿EstÃ¡ seguro de que quiere revertir estos cambios?"
+
+#: ../gitg/gitg-branch-actions.c:588
+msgid "You have uncommited changes in your current working tree"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:590
+msgid "Stash changes"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:766
+msgid "Failed to save current index state"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:820 ../gitg/gitg-branch-actions.c:1102
+#: ../gitg/gitg-branch-actions.c:1397
+#, c-format
+msgid "Failed to checkout local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:858
+#, c-format
+msgid "Failed to checkout remote branch <%s> to local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:898
+#, c-format
+msgid "Failed to checkout tag <%s> to local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:989
+#, c-format
+msgid "Failed to rebase %s branch <%s> onto %s branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:993
+#, c-format
+msgid "Failed to merge %s branch <%s> with %s branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1001 ../gitg/gitg-branch-actions.c:1003
+#: ../gitg/gitg-branch-actions.c:1069 ../gitg/gitg-branch-actions.c:1071
+#: ../gitg/gitg-branch-actions.c:1110 ../gitg/gitg-branch-actions.c:1112
+#: ../gitg/gitg-branch-actions.c:1146 ../gitg/gitg-branch-actions.c:1148
+#: ../gitg/gitg-branch-actions.c:1193 ../gitg/gitg-branch-actions.c:1195
+msgid "local"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1001 ../gitg/gitg-branch-actions.c:1003
+#: ../gitg/gitg-branch-actions.c:1069 ../gitg/gitg-branch-actions.c:1071
+#: ../gitg/gitg-branch-actions.c:1110 ../gitg/gitg-branch-actions.c:1112
+#: ../gitg/gitg-branch-actions.c:1146 ../gitg/gitg-branch-actions.c:1148
+#: ../gitg/gitg-branch-actions.c:1193 ../gitg/gitg-branch-actions.c:1195
+#, fuzzy
+msgid "remote"
+msgstr "Ã?rbol"
+
+#: ../gitg/gitg-branch-actions.c:1020
+msgid "The stashed changes have been stored to be reapplied manually"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1025
+msgid "Failed to checkout previously checked out branch"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1046
+msgid "Failed to reapply stash correctly"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1047
+msgid ""
+"There might be unresolved conflicts in the working tree or index which you "
+"need to resolve manually"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1068
+#, fuzzy, c-format
+msgid "Are you sure you want to merge %s branch <%s> onto %s branch <%s>?"
+msgstr "Â¿EstÃ¡ seguro de que quiere revertir estos cambios?"
+
+#: ../gitg/gitg-branch-actions.c:1076 ../gitg/gitg-branch-actions.c:1078
+#: ../gitg/gitg-branch-actions.c:1122 ../gitg/gitg-menus.xml.h:4
+msgid "Merge"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1103
+msgid "The branch on which to merge could not be checked out"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1109
+#, c-format
+msgid "Merging %s branch <%s> onto %s branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1145
+#, fuzzy, c-format
+msgid "Are you sure you want to rebase %s branch <%s> onto %s branch <%s>?"
+msgstr "Â¿EstÃ¡ seguro de que quiere revertir estos cambios?"
+
+#: ../gitg/gitg-branch-actions.c:1153 ../gitg/gitg-branch-actions.c:1155
+#: ../gitg/gitg-branch-actions.c:1205 ../gitg/gitg-menus.xml.h:7
+msgid "Rebase"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1178
+msgid "Unable to rebase"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1179
+msgid ""
+"There are still uncommitted changes in your working tree and you are trying "
+"to rebase a branch onto the currently checked out branch. Either remove, "
+"stash or commit your changes first and try again"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1192
+#, c-format
+msgid "Rebasing %s branch <%s> onto %s branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1231
+#, c-format
+msgid "Failed to push local branch <%s> to remote <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1232
+msgid ""
+"This usually means that the remote branch could not be fast-forwarded. Try "
+"fetching the latest changes."
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1256
+#, fuzzy, c-format
+msgid "Are you sure you want to push <%s> to <%s>?"
+msgstr "Â¿EstÃ¡ seguro de que quiere revertir estos cambios?"
+
+#: ../gitg/gitg-branch-actions.c:1262 ../gitg/gitg-branch-actions.c:1264
+#: ../gitg/gitg-branch-actions.c:1285 ../gitg/gitg-branch-actions.c:1317
+#: ../gitg/gitg-branch-actions.c:1319 ../gitg/gitg-branch-actions.c:1346
+msgid "Push"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1277 ../gitg/gitg-branch-actions.c:1331
+#, c-format
+msgid "Pushing local branch <%s> to remote branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1311
+#, fuzzy, c-format
+msgid "Are you sure you want to push <%s> to remote <%s>?"
+msgstr "Â¿EstÃ¡ seguro de que quiere revertir estos cambios?"
+
+#: ../gitg/gitg-branch-actions.c:1370
+#, fuzzy, c-format
+msgid "Are you sure you want to apply the stash item to local branch <%s>?"
+msgstr "Â¿EstÃ¡ seguro de que quiere revertir estos cambios?"
+
+#: ../gitg/gitg-branch-actions.c:1375 ../gitg/gitg-branch-actions.c:1377
+msgid "Apply stash"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1416
+#, c-format
+msgid "The stash could not be applied to local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1420
+msgid "Failed to apply stash"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1466
+msgid ""
+"The tag object could not be successfully created. Please make sure you have "
+"a GPG key and the key is unlocked"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1470
+msgid "The tag object could not be successfully created"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1475
+msgid "Failed to create tag"
+msgstr ""
+
+#: ../gitg/gitg-repository-dialog.c:173 ../gitg/gitg-repository.ui.h:4
+msgid "Fetch"
+msgstr ""
+
+#: ../gitg/gitg-repository-dialog.c:178
+msgid "Cancel"
+msgstr ""
+
+#: ../gitg/gitg-repository-dialog.c:441 ../gitg/gitg-repository.ui.h:7
+#: ../gitg/gitg-tag.ui.h:5
+msgid "Properties"
+msgstr ""
+
+#: ../gitg/gitg-window.ui.h:1
 msgid "Add signed-off-by"
 msgstr "AÃ¡dir firmado por"
 
-#: ../gitg/gitg-ui.xml.h:2
-msgid "Author"
-msgstr "Autor"
+#: ../gitg/gitg-window.ui.h:2
+msgid "Amend"
+msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:3
+#: ../gitg/gitg-window.ui.h:3
 msgid "Author:"
 msgstr "Autor:"
 
-#: ../gitg/gitg-ui.xml.h:4
+#: ../gitg/gitg-window.ui.h:4
 msgid "Branch:"
 msgstr "Rama:"
 
-#: ../gitg/gitg-ui.xml.h:5
+#: ../gitg/gitg-window.ui.h:5
 msgid "Co_mmit message"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:6
+#: ../gitg/gitg-window.ui.h:6 ../gitg/gitg-preferences.ui.h:5
 msgid "Commit"
 msgstr "Efectuar"
 
-#: ../gitg/gitg-ui.xml.h:7
+#: ../gitg/gitg-window.ui.h:7
 msgid "Context:"
 msgstr "Contexto:"
 
-#: ../gitg/gitg-ui.xml.h:8
-msgid "Date"
-msgstr "Fecha"
-
-#: ../gitg/gitg-ui.xml.h:9
+#: ../gitg/gitg-window.ui.h:8
 msgid "Date:"
 msgstr "Fecha:"
 
-#: ../gitg/gitg-ui.xml.h:10
+#: ../gitg/gitg-window.ui.h:9
 msgid "Details"
 msgstr "Detalles"
 
-#: ../gitg/gitg-ui.xml.h:11
-msgid "Filename"
-msgstr "Nombre de archivo"
-
-#: ../gitg/gitg-ui.xml.h:12
+#: ../gitg/gitg-window.ui.h:10
 msgid "History"
 msgstr "HistÃ³rico"
 
-#: ../gitg/gitg-ui.xml.h:13
-msgid "Ignore"
-msgstr "Ignorar"
-
-#: ../gitg/gitg-ui.xml.h:14
+#: ../gitg/gitg-window.ui.h:11
 msgid "Parent:"
 msgstr "Padre:"
 
-#: ../gitg/gitg-ui.xml.h:15
-msgid "R_ecently Opened"
-msgstr "Abiertos _recientemente"
-
-#: ../gitg/gitg-ui.xml.h:16
-msgid "Revert"
-msgstr "Revertir"
-
-#: ../gitg/gitg-ui.xml.h:17
+#: ../gitg/gitg-window.ui.h:12
 msgid "SHA:"
 msgstr "SHA:"
 
-#: ../gitg/gitg-ui.xml.h:18
-msgid "Stage"
-msgstr ""
-
-#: ../gitg/gitg-ui.xml.h:19
-msgid "Subject"
-msgstr "Asunto"
-
-#: ../gitg/gitg-ui.xml.h:20
+#: ../gitg/gitg-window.ui.h:13
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: ../gitg/gitg-ui.xml.h:21
+#: ../gitg/gitg-window.ui.h:14
 msgid "Tree"
 msgstr "Ã?rbol"
 
-#: ../gitg/gitg-ui.xml.h:22
-msgid "Unstage"
-msgstr ""
-
-#: ../gitg/gitg-ui.xml.h:23
-msgid "Unstaged"
-msgstr ""
-
-#: ../gitg/gitg-ui.xml.h:24
+#: ../gitg/gitg-window.ui.h:15
 msgid "_Changes"
 msgstr "_Cambios"
 
-#: ../gitg/gitg-ui.xml.h:25
-msgid "_Edit"
-msgstr "_Editar"
-
-#: ../gitg/gitg-ui.xml.h:26
-msgid "_File"
-msgstr "_Archivo"
-
-#: ../gitg/gitg-ui.xml.h:27
-msgid "_Help"
-msgstr "Ay_uda"
-
-#: ../gitg/gitg-ui.xml.h:28
-msgid "_Open..."
-msgstr "_Abrirâ?¦"
-
-#: ../gitg/gitg-ui.xml.h:29
+#: ../gitg/gitg-window.ui.h:16
 msgid "_Staged"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:30
+#: ../gitg/gitg-window.ui.h:17
 msgid "_Unstaged"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:31
-msgid "_View"
-msgstr "_Ver"
+#: ../gitg/gitg-commit-menu.ui.h:1 ../gitg/gitg-ui.xml.h:1
+msgid "Ignore"
+msgstr "Ignorar"
 
-#: ../gitg/gitg-menus.xml.h:1
-msgid "_Author"
-msgstr "_Autor"
+#: ../gitg/gitg-commit-menu.ui.h:2 ../gitg/gitg-ui.xml.h:3
+msgid "Revert"
+msgstr "Revertir"
 
-#: ../gitg/gitg-menus.xml.h:2
-msgid "_Date"
-msgstr "_Fecha"
+#: ../gitg/gitg-commit-menu.ui.h:3 ../gitg/gitg-ui.xml.h:4
+msgid "Stage"
+msgstr ""
 
-#: ../gitg/gitg-menus.xml.h:3
-msgid "_Hash"
-msgstr "_Hash"
+#: ../gitg/gitg-commit-menu.ui.h:4 ../gitg/gitg-ui.xml.h:5
+msgid "Unstage"
+msgstr ""
 
-#: ../gitg/gitg-menus.xml.h:4
-msgid "_Subject"
-msgstr "A_sunto"
+#: ../gitg/gitg-preferences.ui.h:1
+msgid "<b>Commit Message</b>"
+msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:1
+#: ../gitg/gitg-preferences.ui.h:2
 msgid "<b>History</b>"
 msgstr "<b>HistÃ³rico</b>"
 
-#: ../gitg/gitg-preferences.xml.h:2
+#: ../gitg/gitg-preferences.ui.h:3 ../gitg/gitg-repository.ui.h:1
+#, fuzzy
+msgid "<b>User</b>"
+msgstr "<b>HistÃ³rico</b>"
+
+#: ../gitg/gitg-preferences.ui.h:4
 msgid "Collapse inactive lanes"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:3
+#: ../gitg/gitg-preferences.ui.h:6 ../gitg/gitg-repository.ui.h:2
+msgid "Configuration"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:7
+msgid ""
+"Configure global git settings. This corresponds to the settings as stored in "
+"~/.gitconfig. Repository specific settings can be configured at the "
+"repository properties."
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:8
+msgid "Display right _margin"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:9 ../gitg/gitg-repository.ui.h:3
+msgid "E-mail:"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:10
 msgid "Early"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:4
+#: ../gitg/gitg-preferences.ui.h:11
 msgid "Late"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:5
+#: ../gitg/gitg-preferences.ui.h:12 ../gitg/gitg-repository.ui.h:6
+#: ../gitg/gitg-tag.ui.h:4
+#, fuzzy
+msgid "Name:"
+msgstr "Fecha:"
+
+#: ../gitg/gitg-preferences.ui.h:13
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../gitg/gitg-preferences.xml.h:6
+#: ../gitg/gitg-preferences.ui.h:14
+msgid "Preferences that apply to the commit view"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:15
+msgid "Preferences that apply to the revision view"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:16
 msgid "Search filters revisions in the history view"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:7
+#: ../gitg/gitg-preferences.ui.h:17
 msgid "Show staged changes in history"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:8
+#: ../gitg/gitg-preferences.ui.h:18
 msgid "Show stash in history"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:9
+#: ../gitg/gitg-preferences.ui.h:19
 msgid "Show unstaged changes in history"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:10
+#: ../gitg/gitg-preferences.ui.h:20
 msgid "View"
 msgstr "Ver"
 
+#: ../gitg/gitg-preferences.ui.h:21
+msgid "_Right margin at column:"
+msgstr ""
+
+#: ../gitg/gitg-repository.ui.h:5
+#, fuzzy
+msgid "Name"
+msgstr "Fecha:"
+
+#: ../gitg/gitg-repository.ui.h:8
+msgid "Remotes"
+msgstr ""
+
+#: ../gitg/gitg-repository.ui.h:9
+msgid "URL"
+msgstr ""
+
+#: ../gitg/gitg-repository.ui.h:10
+msgid "gtk-add"
+msgstr ""
+
+#: ../gitg/gitg-repository.ui.h:11
+msgid "gtk-remove"
+msgstr ""
+
+#: ../gitg/gitg-tag.ui.h:1
+msgid "Create signed tag object"
+msgstr ""
+
+#: ../gitg/gitg-tag.ui.h:2 ../gitg/gitg-menus.xml.h:3
+msgid "Create tag"
+msgstr ""
+
+#: ../gitg/gitg-tag.ui.h:3
+msgid "Message:"
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:1
+msgid "Apply stash to..."
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:2
+#, fuzzy
+msgid "Checkout branch"
+msgstr "Seleccionar rama"
+
+#: ../gitg/gitg-menus.xml.h:5
+msgid "Merge branch with..."
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:6
+msgid "Push branch to..."
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:8
+msgid "Rebase branch onto..."
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:10
+msgid "_Author"
+msgstr "_Autor"
+
+#: ../gitg/gitg-menus.xml.h:11
+msgid "_Date"
+msgstr "_Fecha"
+
+#: ../gitg/gitg-menus.xml.h:12
+msgid "_Hash"
+msgstr "_Hash"
+
+#: ../gitg/gitg-menus.xml.h:13
+msgid "_Subject"
+msgstr "A_sunto"
+
+#: ../gitg/gitg-ui.xml.h:2
+msgid "R_ecently Opened"
+msgstr "Abiertos _recientemente"
+
+#: ../gitg/gitg-ui.xml.h:6
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../gitg/gitg-ui.xml.h:7
+msgid "_File"
+msgstr "_Archivo"
+
+#: ../gitg/gitg-ui.xml.h:8
+msgid "_Help"
+msgstr "Ay_uda"
+
+#: ../gitg/gitg-ui.xml.h:9
+msgid "_Open..."
+msgstr "_Abrirâ?¦"
+
+#: ../gitg/gitg-ui.xml.h:10
+#, fuzzy
+msgid "_Repository"
+msgstr "Abrir repositorio git"
+
+#: ../gitg/gitg-ui.xml.h:11
+msgid "_View"
+msgstr "_Ver"
+
+#~ msgid "Author"
+#~ msgstr "Autor"
+
+#~ msgid "Date"
+#~ msgstr "Fecha"
+
+#~ msgid "Filename"
+#~ msgstr "Nombre de archivo"
+
+#~ msgid "Subject"
+#~ msgstr "Asunto"
diff --git a/po/fr.po b/po/fr.po
index b3b79dc..b9187cc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-22 00:44+0200\n"
+"POT-Creation-Date: 2009-07-05 21:28+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Guilhem Bonnefille <guilhem bonnefille gmail com>\n"
 "Language-Team: \n"
@@ -17,26 +17,48 @@ msgid "Git repository browser"
 msgstr "Butineur de dÃ©pÃ´t Git"
 
 #. Translators: this is the application name as in g_set_application_name
-#: ../data/gitg.desktop.in.in.h:2 ../gitg/gitg.c:169 ../gitg/gitg-window.c:785
-#: ../gitg/gitg-window.c:803 ../gitg/gitg-ui.xml.h:32
+#: ../data/gitg.desktop.in.in.h:2 ../gitg/gitg.c:169
+#: ../gitg/gitg-window.c:1005 ../gitg/gitg-window.c:1018
+#: ../gitg/gitg-branch-actions.c:146 ../gitg/gitg-branch-actions.c:199
+#: ../gitg/gitg-window.ui.h:18
 msgid "gitg"
 msgstr "gitg"
 
 #: ../data/gitg.schemas.in.h:1
-msgid "Filter Revisions When Searching"
+msgid "Column at Which Right Margin is Shown"
 msgstr ""
 
 #: ../data/gitg.schemas.in.h:2
+msgid "Filter Revisions When Searching"
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:3
 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 ""
 
-#: ../data/gitg.schemas.in.h:3
+#: ../data/gitg.schemas.in.h:4
+msgid "Show Right Margin in Commit Message View"
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:5
+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."
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:6
+msgid ""
+"The column at which the right margin is shown if the right-margin preference "
+"is set to TRUE."
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:7
 msgid "When to Collapse Inactive Lanes"
 msgstr ""
 
-#: ../data/gitg.schemas.in.h:4
+#: ../data/gitg.schemas.in.h:8
 msgid ""
 "Whether searching filters the revisions in the history view instead of "
 "jumping to the first match."
@@ -50,49 +72,49 @@ msgstr "DÃ©marrer gitg en mode commit"
 msgid "- git repository viewer"
 msgstr "- butineur pour dÃ©pÃ´t Git"
 
-#: ../gitg/gitg-commit-view.c:204 ../gitg/gitg-revision-tree-view.c:181
+#: ../gitg/gitg-commit-view.c:208 ../gitg/gitg-revision-tree-view.c:181
 msgid "Cannot display file content as text"
 msgstr "Impossible d'afficher ce fichier en texte"
 
-#: ../gitg/gitg-commit-view.c:1166
+#: ../gitg/gitg-commit-view.c:1431
 msgid "You must first stage some changes before committing"
 msgstr ""
 
-#: ../gitg/gitg-commit-view.c:1174
+#: ../gitg/gitg-commit-view.c:1439
 msgid "Please enter a commit message before committing"
 msgstr "S'il vous plaÃ®t, entrez un message avant d'archiver les modifications"
 
-#: ../gitg/gitg-commit-view.c:1185
+#: ../gitg/gitg-commit-view.c:1451
 msgid ""
 "Your user name or email could not be retrieved for use in the sign off "
 "message"
 msgstr ""
 
-#: ../gitg/gitg-commit-view.c:1187
+#: ../gitg/gitg-commit-view.c:1453
 msgid "Something went wrong while trying to commit"
 msgstr ""
 
-#: ../gitg/gitg-commit-view.c:1355
+#: ../gitg/gitg-commit-view.c:1612
 msgid "Revert fail"
 msgstr "Ã?chec d'annulation"
 
-#: ../gitg/gitg-commit-view.c:1366
+#: ../gitg/gitg-commit-view.c:1623
 msgid "Are you sure you want to revert these changes?"
 msgstr "Ã?tes-vous sÃ»r de vouloir annuler ces modifications ?"
 
-#: ../gitg/gitg-commit-view.c:1369
+#: ../gitg/gitg-commit-view.c:1626
 msgid "Reverting changes is permanent and cannot be undone"
 msgstr "Il n'est pas possible de revenir sur une annulation de modifications"
 
-#: ../gitg/gitg-repository.c:472
+#: ../gitg/gitg-repository.c:591
 msgid "Staged changes"
 msgstr ""
 
-#: ../gitg/gitg-repository.c:474
+#: ../gitg/gitg-repository.c:593
 msgid "Unstaged changes"
 msgstr ""
 
-#: ../gitg/gitg-repository.c:983
+#: ../gitg/gitg-repository.c:1148
 msgid "Not a valid git repository"
 msgstr "DÃ©pÃ´t Git invalide"
 
@@ -100,41 +122,61 @@ msgstr "DÃ©pÃ´t Git invalide"
 msgid "(Empty)"
 msgstr "(Vide)"
 
-#: ../gitg/gitg-window.c:346
+#: ../gitg/gitg-window.c:420
 msgid "Select branch"
 msgstr "SÃ©lectionner une branche"
 
-#: ../gitg/gitg-window.c:532
+#: ../gitg/gitg-window.c:482
+#, c-format
+msgid "Push local branch <%s> to remote branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-window.c:489
+#, c-format
+msgid "Merge/rebase local branch <%s> with/on local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-window.c:496
+#, c-format
+msgid "Merge/rebase local branch <%s> with/on remote branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-window.c:503
+#, c-format
+msgid "Apply stash to local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-window.c:771
 msgid "Begin loading repository"
 msgstr "DÃ©marrage du chargement du dÃ©pÃ´t"
 
-#: ../gitg/gitg-window.c:541
+#: ../gitg/gitg-window.c:780
 #, c-format
 msgid "Loaded %d revisions in %.2fs"
 msgstr "%d rÃ©visions chargÃ©es en %.2fs"
 
-#: ../gitg/gitg-window.c:552
+#: ../gitg/gitg-window.c:791
 #, c-format
 msgid "Loading %d revisions..."
 msgstr "Chargement de %d rÃ©visions..."
 
-#: ../gitg/gitg-window.c:561
+#: ../gitg/gitg-window.c:800
 msgid "Could not find git repository"
 msgstr "Impossible de trouver le dÃ©pÃ´t Git"
 
-#: ../gitg/gitg-window.c:697
+#: ../gitg/gitg-window.c:983
 msgid "All branches"
 msgstr "Toutes les branches"
 
-#: ../gitg/gitg-window.c:860
+#: ../gitg/gitg-window.c:1192
 msgid "Open git repository"
 msgstr "Ouvrir un dÃ©pÃ´t Git"
 
-#: ../gitg/gitg-window.c:982
+#: ../gitg/gitg-window.c:1313
 msgid "gitg is a git repository viewer for gtk+/GNOME"
 msgstr "gitg est un butineur pour dÃ©pÃ´t Git utilisant gtk+/GNOME"
 
-#: ../gitg/gitg-window.c:983
+#: ../gitg/gitg-window.c:1314
 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"
@@ -152,186 +194,599 @@ msgid ""
 "Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:1
+#: ../gitg/gitg-window.c:1775 ../gitg/gitg-window.c:1809
+#, fuzzy, c-format
+msgid "New local branch <%s>"
+msgstr "Toutes les branches"
+
+#: ../gitg/gitg-window.c:1787 ../gitg/gitg-branch-actions.c:316
+#, fuzzy
+msgid "Remove remote branch"
+msgstr "SÃ©lectionner une branche"
+
+#: ../gitg/gitg-window.c:1791
+msgid "Checkout working copy"
+msgstr ""
+
+#: ../gitg/gitg-window.c:1792
+#, fuzzy
+msgid "Remove local branch"
+msgstr "SÃ©lectionner une branche"
+
+#: ../gitg/gitg-window.c:1800 ../gitg/gitg-branch-actions.c:391
+msgid "Remove stash"
+msgstr ""
+
+#: ../gitg/gitg-window.c:1805 ../gitg/gitg-branch-actions.c:456
+#: ../gitg/gitg-branch-actions.c:458
+#, fuzzy
+msgid "Remove tag"
+msgstr "Annuler"
+
+#: ../gitg/gitg-window.c:1984
+msgid "Not all fields are correctly filled in"
+msgstr ""
+
+#: ../gitg/gitg-window.c:1986
+msgid "Please make sure to fill in both the tag name and the commit message"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:249
+#, c-format
+msgid "Branch <%s> could not be removed"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:250
+msgid ""
+"This usually means that the branch is not fully merged in HEAD. Do you want "
+"to forcefully remove the branch?"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:251
+msgid "Force remove"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:260
+#, c-format
+msgid "Branch <%s> could not be forcefully removed"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:293
+#, c-format
+msgid "Failed to remove remote branch <%s>."
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:314
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the remote branch <%s>?"
+msgstr "Ã?tes-vous sÃ»r de vouloir annuler ces modifications ?"
+
+#: ../gitg/gitg-branch-actions.c:315
+msgid "This permanently removes the remote branch."
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:332 ../gitg/gitg-menus.xml.h:9
+#, fuzzy
+msgid "Remove branch"
+msgstr "SÃ©lectionner une branche"
+
+#: ../gitg/gitg-branch-actions.c:389
+#, fuzzy
+msgid "Are you sure you want to remove this stash item?"
+msgstr "Ã?tes-vous sÃ»r de vouloir annuler ces modifications ?"
+
+#: ../gitg/gitg-branch-actions.c:390
+msgid "This permanently removes the stash item"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:417
+msgid "Failed to remove stash"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:418
+msgid "The stash item could not be successfully removed"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:452
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the tag <%s>?"
+msgstr "Ã?tes-vous sÃ»r de vouloir annuler ces modifications ?"
+
+#: ../gitg/gitg-branch-actions.c:475
+#, c-format
+msgid "The tag <%s> could not be successfully removed"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:479
+msgid "Failed to remove tag"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:579
+#, fuzzy
+msgid "Do you want to temporarily stash these changes?"
+msgstr "Ã?tes-vous sÃ»r de vouloir annuler ces modifications ?"
+
+#: ../gitg/gitg-branch-actions.c:583
+#, fuzzy
+msgid "Do you want to stash and reapply these changes?"
+msgstr "Ã?tes-vous sÃ»r de vouloir annuler ces modifications ?"
+
+#: ../gitg/gitg-branch-actions.c:588
+msgid "You have uncommited changes in your current working tree"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:590
+msgid "Stash changes"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:766
+msgid "Failed to save current index state"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:820 ../gitg/gitg-branch-actions.c:1102
+#: ../gitg/gitg-branch-actions.c:1397
+#, c-format
+msgid "Failed to checkout local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:858
+#, c-format
+msgid "Failed to checkout remote branch <%s> to local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:898
+#, c-format
+msgid "Failed to checkout tag <%s> to local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:989
+#, c-format
+msgid "Failed to rebase %s branch <%s> onto %s branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:993
+#, c-format
+msgid "Failed to merge %s branch <%s> with %s branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1001 ../gitg/gitg-branch-actions.c:1003
+#: ../gitg/gitg-branch-actions.c:1069 ../gitg/gitg-branch-actions.c:1071
+#: ../gitg/gitg-branch-actions.c:1110 ../gitg/gitg-branch-actions.c:1112
+#: ../gitg/gitg-branch-actions.c:1146 ../gitg/gitg-branch-actions.c:1148
+#: ../gitg/gitg-branch-actions.c:1193 ../gitg/gitg-branch-actions.c:1195
+msgid "local"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1001 ../gitg/gitg-branch-actions.c:1003
+#: ../gitg/gitg-branch-actions.c:1069 ../gitg/gitg-branch-actions.c:1071
+#: ../gitg/gitg-branch-actions.c:1110 ../gitg/gitg-branch-actions.c:1112
+#: ../gitg/gitg-branch-actions.c:1146 ../gitg/gitg-branch-actions.c:1148
+#: ../gitg/gitg-branch-actions.c:1193 ../gitg/gitg-branch-actions.c:1195
+#, fuzzy
+msgid "remote"
+msgstr "Arborescence"
+
+#: ../gitg/gitg-branch-actions.c:1020
+msgid "The stashed changes have been stored to be reapplied manually"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1025
+msgid "Failed to checkout previously checked out branch"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1046
+msgid "Failed to reapply stash correctly"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1047
+msgid ""
+"There might be unresolved conflicts in the working tree or index which you "
+"need to resolve manually"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1068
+#, fuzzy, c-format
+msgid "Are you sure you want to merge %s branch <%s> onto %s branch <%s>?"
+msgstr "Ã?tes-vous sÃ»r de vouloir annuler ces modifications ?"
+
+#: ../gitg/gitg-branch-actions.c:1076 ../gitg/gitg-branch-actions.c:1078
+#: ../gitg/gitg-branch-actions.c:1122 ../gitg/gitg-menus.xml.h:4
+msgid "Merge"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1103
+msgid "The branch on which to merge could not be checked out"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1109
+#, c-format
+msgid "Merging %s branch <%s> onto %s branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1145
+#, fuzzy, c-format
+msgid "Are you sure you want to rebase %s branch <%s> onto %s branch <%s>?"
+msgstr "Ã?tes-vous sÃ»r de vouloir annuler ces modifications ?"
+
+#: ../gitg/gitg-branch-actions.c:1153 ../gitg/gitg-branch-actions.c:1155
+#: ../gitg/gitg-branch-actions.c:1205 ../gitg/gitg-menus.xml.h:7
+msgid "Rebase"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1178
+msgid "Unable to rebase"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1179
+msgid ""
+"There are still uncommitted changes in your working tree and you are trying "
+"to rebase a branch onto the currently checked out branch. Either remove, "
+"stash or commit your changes first and try again"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1192
+#, c-format
+msgid "Rebasing %s branch <%s> onto %s branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1231
+#, c-format
+msgid "Failed to push local branch <%s> to remote <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1232
+msgid ""
+"This usually means that the remote branch could not be fast-forwarded. Try "
+"fetching the latest changes."
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1256
+#, fuzzy, c-format
+msgid "Are you sure you want to push <%s> to <%s>?"
+msgstr "Ã?tes-vous sÃ»r de vouloir annuler ces modifications ?"
+
+#: ../gitg/gitg-branch-actions.c:1262 ../gitg/gitg-branch-actions.c:1264
+#: ../gitg/gitg-branch-actions.c:1285 ../gitg/gitg-branch-actions.c:1317
+#: ../gitg/gitg-branch-actions.c:1319 ../gitg/gitg-branch-actions.c:1346
+msgid "Push"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1277 ../gitg/gitg-branch-actions.c:1331
+#, c-format
+msgid "Pushing local branch <%s> to remote branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1311
+#, fuzzy, c-format
+msgid "Are you sure you want to push <%s> to remote <%s>?"
+msgstr "Ã?tes-vous sÃ»r de vouloir annuler ces modifications ?"
+
+#: ../gitg/gitg-branch-actions.c:1370
+#, fuzzy, c-format
+msgid "Are you sure you want to apply the stash item to local branch <%s>?"
+msgstr "Ã?tes-vous sÃ»r de vouloir annuler ces modifications ?"
+
+#: ../gitg/gitg-branch-actions.c:1375 ../gitg/gitg-branch-actions.c:1377
+msgid "Apply stash"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1416
+#, c-format
+msgid "The stash could not be applied to local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1420
+msgid "Failed to apply stash"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1466
+msgid ""
+"The tag object could not be successfully created. Please make sure you have "
+"a GPG key and the key is unlocked"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1470
+msgid "The tag object could not be successfully created"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1475
+msgid "Failed to create tag"
+msgstr ""
+
+#: ../gitg/gitg-repository-dialog.c:173 ../gitg/gitg-repository.ui.h:4
+msgid "Fetch"
+msgstr ""
+
+#: ../gitg/gitg-repository-dialog.c:178
+msgid "Cancel"
+msgstr ""
+
+#: ../gitg/gitg-repository-dialog.c:441 ../gitg/gitg-repository.ui.h:7
+#: ../gitg/gitg-tag.ui.h:5
+msgid "Properties"
+msgstr ""
+
+#: ../gitg/gitg-window.ui.h:1
 msgid "Add signed-off-by"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:2
-msgid "Author"
-msgstr "Auteur"
+#: ../gitg/gitg-window.ui.h:2
+msgid "Amend"
+msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:3
+#: ../gitg/gitg-window.ui.h:3
 msgid "Author:"
 msgstr "Auteur :"
 
-#: ../gitg/gitg-ui.xml.h:4
+#: ../gitg/gitg-window.ui.h:4
 msgid "Branch:"
 msgstr "Branche :"
 
-#: ../gitg/gitg-ui.xml.h:5
+#: ../gitg/gitg-window.ui.h:5
 msgid "Co_mmit message"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:6
+#: ../gitg/gitg-window.ui.h:6 ../gitg/gitg-preferences.ui.h:5
 msgid "Commit"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:7
+#: ../gitg/gitg-window.ui.h:7
 msgid "Context:"
 msgstr "Contexte :"
 
-#: ../gitg/gitg-ui.xml.h:8
-msgid "Date"
-msgstr "Date"
-
-#: ../gitg/gitg-ui.xml.h:9
+#: ../gitg/gitg-window.ui.h:8
 msgid "Date:"
 msgstr "Date :"
 
-#: ../gitg/gitg-ui.xml.h:10
+#: ../gitg/gitg-window.ui.h:9
 msgid "Details"
 msgstr "DÃ©tails"
 
-#: ../gitg/gitg-ui.xml.h:11
-msgid "Filename"
-msgstr "Nom du fichier"
-
-#: ../gitg/gitg-ui.xml.h:12
+#: ../gitg/gitg-window.ui.h:10
 msgid "History"
 msgstr "Historique"
 
-#: ../gitg/gitg-ui.xml.h:13
-msgid "Ignore"
-msgstr "Ignorer"
-
-#: ../gitg/gitg-ui.xml.h:14
+#: ../gitg/gitg-window.ui.h:11
 msgid "Parent:"
 msgstr "Parent :"
 
-#: ../gitg/gitg-ui.xml.h:15
-#, fuzzy
-msgid "R_ecently Opened"
-msgstr "RÃ©cemment ouvert"
-
-#: ../gitg/gitg-ui.xml.h:16
-msgid "Revert"
-msgstr "Annuler"
-
-#: ../gitg/gitg-ui.xml.h:17
+#: ../gitg/gitg-window.ui.h:12
 msgid "SHA:"
 msgstr "SHA :"
 
-#: ../gitg/gitg-ui.xml.h:18
-msgid "Stage"
-msgstr ""
-
-#: ../gitg/gitg-ui.xml.h:19
-msgid "Subject"
-msgstr "Sujet"
-
-#: ../gitg/gitg-ui.xml.h:20
+#: ../gitg/gitg-window.ui.h:13
 msgid "Subject:"
 msgstr "Sujet :"
 
-#: ../gitg/gitg-ui.xml.h:21
+#: ../gitg/gitg-window.ui.h:14
 msgid "Tree"
 msgstr "Arborescence"
 
-#: ../gitg/gitg-ui.xml.h:22
-msgid "Unstage"
-msgstr ""
-
-#: ../gitg/gitg-ui.xml.h:23
-msgid "Unstaged"
-msgstr ""
-
-#: ../gitg/gitg-ui.xml.h:24
+#: ../gitg/gitg-window.ui.h:15
 msgid "_Changes"
 msgstr "_Modifications"
 
-#: ../gitg/gitg-ui.xml.h:25
-msgid "_Edit"
-msgstr "_Editer"
-
-#: ../gitg/gitg-ui.xml.h:26
-msgid "_File"
-msgstr "_Fichier"
-
-#: ../gitg/gitg-ui.xml.h:27
-msgid "_Help"
-msgstr "_Aide"
-
-#: ../gitg/gitg-ui.xml.h:28
-msgid "_Open..."
-msgstr ""
-
-#: ../gitg/gitg-ui.xml.h:29
+#: ../gitg/gitg-window.ui.h:16
 msgid "_Staged"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:30
+#: ../gitg/gitg-window.ui.h:17
 msgid "_Unstaged"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:31
-msgid "_View"
-msgstr "_Vue"
+#: ../gitg/gitg-commit-menu.ui.h:1 ../gitg/gitg-ui.xml.h:1
+msgid "Ignore"
+msgstr "Ignorer"
 
-#: ../gitg/gitg-menus.xml.h:1
-msgid "_Author"
-msgstr "_Auteur"
+#: ../gitg/gitg-commit-menu.ui.h:2 ../gitg/gitg-ui.xml.h:3
+msgid "Revert"
+msgstr "Annuler"
 
-#: ../gitg/gitg-menus.xml.h:2
-msgid "_Date"
-msgstr "_Date"
+#: ../gitg/gitg-commit-menu.ui.h:3 ../gitg/gitg-ui.xml.h:4
+msgid "Stage"
+msgstr ""
 
-#: ../gitg/gitg-menus.xml.h:3
-msgid "_Hash"
-msgstr "_Hash"
+#: ../gitg/gitg-commit-menu.ui.h:4 ../gitg/gitg-ui.xml.h:5
+msgid "Unstage"
+msgstr ""
 
-#: ../gitg/gitg-menus.xml.h:4
-msgid "_Subject"
-msgstr "_Sujet"
+#: ../gitg/gitg-preferences.ui.h:1
+msgid "<b>Commit Message</b>"
+msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:1
+#: ../gitg/gitg-preferences.ui.h:2
 msgid "<b>History</b>"
 msgstr "<b>Historique</b>"
 
-#: ../gitg/gitg-preferences.xml.h:2
+#: ../gitg/gitg-preferences.ui.h:3 ../gitg/gitg-repository.ui.h:1
+#, fuzzy
+msgid "<b>User</b>"
+msgstr "<b>Historique</b>"
+
+#: ../gitg/gitg-preferences.ui.h:4
 msgid "Collapse inactive lanes"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:3
+#: ../gitg/gitg-preferences.ui.h:6 ../gitg/gitg-repository.ui.h:2
+msgid "Configuration"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:7
+msgid ""
+"Configure global git settings. This corresponds to the settings as stored in "
+"~/.gitconfig. Repository specific settings can be configured at the "
+"repository properties."
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:8
+msgid "Display right _margin"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:9 ../gitg/gitg-repository.ui.h:3
+msgid "E-mail:"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:10
 msgid "Early"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:4
+#: ../gitg/gitg-preferences.ui.h:11
 msgid "Late"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:5
+#: ../gitg/gitg-preferences.ui.h:12 ../gitg/gitg-repository.ui.h:6
+#: ../gitg/gitg-tag.ui.h:4
+#, fuzzy
+msgid "Name:"
+msgstr "Date :"
+
+#: ../gitg/gitg-preferences.ui.h:13
 msgid "Preferences"
 msgstr "PrÃ©fÃ©rences"
 
-#: ../gitg/gitg-preferences.xml.h:6
+#: ../gitg/gitg-preferences.ui.h:14
+msgid "Preferences that apply to the commit view"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:15
+msgid "Preferences that apply to the revision view"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:16
 msgid "Search filters revisions in the history view"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:7
+#: ../gitg/gitg-preferences.ui.h:17
 msgid "Show staged changes in history"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:8
+#: ../gitg/gitg-preferences.ui.h:18
 msgid "Show stash in history"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:9
+#: ../gitg/gitg-preferences.ui.h:19
 msgid "Show unstaged changes in history"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:10
+#: ../gitg/gitg-preferences.ui.h:20
 msgid "View"
 msgstr "Vue"
 
+#: ../gitg/gitg-preferences.ui.h:21
+msgid "_Right margin at column:"
+msgstr ""
+
+#: ../gitg/gitg-repository.ui.h:5
+#, fuzzy
+msgid "Name"
+msgstr "Date :"
+
+#: ../gitg/gitg-repository.ui.h:8
+msgid "Remotes"
+msgstr ""
+
+#: ../gitg/gitg-repository.ui.h:9
+msgid "URL"
+msgstr ""
+
+#: ../gitg/gitg-repository.ui.h:10
+msgid "gtk-add"
+msgstr ""
+
+#: ../gitg/gitg-repository.ui.h:11
+msgid "gtk-remove"
+msgstr ""
+
+#: ../gitg/gitg-tag.ui.h:1
+msgid "Create signed tag object"
+msgstr ""
+
+#: ../gitg/gitg-tag.ui.h:2 ../gitg/gitg-menus.xml.h:3
+msgid "Create tag"
+msgstr ""
+
+#: ../gitg/gitg-tag.ui.h:3
+msgid "Message:"
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:1
+msgid "Apply stash to..."
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:2
+#, fuzzy
+msgid "Checkout branch"
+msgstr "SÃ©lectionner une branche"
+
+#: ../gitg/gitg-menus.xml.h:5
+msgid "Merge branch with..."
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:6
+msgid "Push branch to..."
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:8
+msgid "Rebase branch onto..."
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:10
+msgid "_Author"
+msgstr "_Auteur"
+
+#: ../gitg/gitg-menus.xml.h:11
+msgid "_Date"
+msgstr "_Date"
+
+#: ../gitg/gitg-menus.xml.h:12
+msgid "_Hash"
+msgstr "_Hash"
+
+#: ../gitg/gitg-menus.xml.h:13
+msgid "_Subject"
+msgstr "_Sujet"
+
+#: ../gitg/gitg-ui.xml.h:2
+#, fuzzy
+msgid "R_ecently Opened"
+msgstr "RÃ©cemment ouvert"
+
+#: ../gitg/gitg-ui.xml.h:6
+msgid "_Edit"
+msgstr "_Editer"
+
+#: ../gitg/gitg-ui.xml.h:7
+msgid "_File"
+msgstr "_Fichier"
+
+#: ../gitg/gitg-ui.xml.h:8
+msgid "_Help"
+msgstr "_Aide"
+
+#: ../gitg/gitg-ui.xml.h:9
+msgid "_Open..."
+msgstr ""
+
+#: ../gitg/gitg-ui.xml.h:10
+#, fuzzy
+msgid "_Repository"
+msgstr "Ouvrir un dÃ©pÃ´t Git"
+
+#: ../gitg/gitg-ui.xml.h:11
+msgid "_View"
+msgstr "_Vue"
+
+#~ msgid "Author"
+#~ msgstr "Auteur"
+
+#~ msgid "Date"
+#~ msgstr "Date"
+
+#~ msgid "Filename"
+#~ msgstr "Nom du fichier"
+
+#~ msgid "Subject"
+#~ msgstr "Sujet"
+
 #~ msgid "Co_mment"
 #~ msgstr "Co_mmentaire"
diff --git a/po/gitg.pot b/po/gitg.pot
index c2a71ee..b549504 100644
--- a/po/gitg.pot
+++ b/po/gitg.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-11 01:16+0200\n"
+"POT-Creation-Date: 2009-07-05 21:28+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL ADDRESS>\n"
 "Language-Team: LANGUAGE <LL li org>\n"
@@ -21,26 +21,48 @@ msgid "Git repository browser"
 msgstr ""
 
 #. Translators: this is the application name as in g_set_application_name
-#: ../data/gitg.desktop.in.in.h:2 ../gitg/gitg.c:169 ../gitg/gitg-window.c:788
-#: ../gitg/gitg-window.c:806 ../gitg/gitg-ui.xml.h:32
+#: ../data/gitg.desktop.in.in.h:2 ../gitg/gitg.c:169
+#: ../gitg/gitg-window.c:1005 ../gitg/gitg-window.c:1018
+#: ../gitg/gitg-branch-actions.c:146 ../gitg/gitg-branch-actions.c:199
+#: ../gitg/gitg-window.ui.h:18
 msgid "gitg"
 msgstr ""
 
 #: ../data/gitg.schemas.in.h:1
-msgid "Filter Revisions When Searching"
+msgid "Column at Which Right Margin is Shown"
 msgstr ""
 
 #: ../data/gitg.schemas.in.h:2
+msgid "Filter Revisions When Searching"
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:3
 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 ""
 
-#: ../data/gitg.schemas.in.h:3
+#: ../data/gitg.schemas.in.h:4
+msgid "Show Right Margin in Commit Message View"
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:5
+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."
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:6
+msgid ""
+"The column at which the right margin is shown if the right-margin preference "
+"is set to TRUE."
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:7
 msgid "When to Collapse Inactive Lanes"
 msgstr ""
 
-#: ../data/gitg.schemas.in.h:4
+#: ../data/gitg.schemas.in.h:8
 msgid ""
 "Whether searching filters the revisions in the history view instead of "
 "jumping to the first match."
@@ -54,49 +76,49 @@ msgstr ""
 msgid "- git repository viewer"
 msgstr ""
 
-#: ../gitg/gitg-commit-view.c:204 ../gitg/gitg-revision-tree-view.c:181
+#: ../gitg/gitg-commit-view.c:208 ../gitg/gitg-revision-tree-view.c:181
 msgid "Cannot display file content as text"
 msgstr ""
 
-#: ../gitg/gitg-commit-view.c:1410
+#: ../gitg/gitg-commit-view.c:1431
 msgid "You must first stage some changes before committing"
 msgstr ""
 
-#: ../gitg/gitg-commit-view.c:1418
+#: ../gitg/gitg-commit-view.c:1439
 msgid "Please enter a commit message before committing"
 msgstr ""
 
-#: ../gitg/gitg-commit-view.c:1429
+#: ../gitg/gitg-commit-view.c:1451
 msgid ""
 "Your user name or email could not be retrieved for use in the sign off "
 "message"
 msgstr ""
 
-#: ../gitg/gitg-commit-view.c:1431
+#: ../gitg/gitg-commit-view.c:1453
 msgid "Something went wrong while trying to commit"
 msgstr ""
 
-#: ../gitg/gitg-commit-view.c:1588
+#: ../gitg/gitg-commit-view.c:1612
 msgid "Revert fail"
 msgstr ""
 
-#: ../gitg/gitg-commit-view.c:1599
+#: ../gitg/gitg-commit-view.c:1623
 msgid "Are you sure you want to revert these changes?"
 msgstr ""
 
-#: ../gitg/gitg-commit-view.c:1602
+#: ../gitg/gitg-commit-view.c:1626
 msgid "Reverting changes is permanent and cannot be undone"
 msgstr ""
 
-#: ../gitg/gitg-repository.c:472
+#: ../gitg/gitg-repository.c:591
 msgid "Staged changes"
 msgstr ""
 
-#: ../gitg/gitg-repository.c:474
+#: ../gitg/gitg-repository.c:593
 msgid "Unstaged changes"
 msgstr ""
 
-#: ../gitg/gitg-repository.c:981
+#: ../gitg/gitg-repository.c:1148
 msgid "Not a valid git repository"
 msgstr ""
 
@@ -104,41 +126,61 @@ msgstr ""
 msgid "(Empty)"
 msgstr ""
 
-#: ../gitg/gitg-window.c:347
+#: ../gitg/gitg-window.c:420
 msgid "Select branch"
 msgstr ""
 
-#: ../gitg/gitg-window.c:533
+#: ../gitg/gitg-window.c:482
+#, c-format
+msgid "Push local branch <%s> to remote branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-window.c:489
+#, c-format
+msgid "Merge/rebase local branch <%s> with/on local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-window.c:496
+#, c-format
+msgid "Merge/rebase local branch <%s> with/on remote branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-window.c:503
+#, c-format
+msgid "Apply stash to local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-window.c:771
 msgid "Begin loading repository"
 msgstr ""
 
-#: ../gitg/gitg-window.c:542
+#: ../gitg/gitg-window.c:780
 #, c-format
 msgid "Loaded %d revisions in %.2fs"
 msgstr ""
 
-#: ../gitg/gitg-window.c:553
+#: ../gitg/gitg-window.c:791
 #, c-format
 msgid "Loading %d revisions..."
 msgstr ""
 
-#: ../gitg/gitg-window.c:562
+#: ../gitg/gitg-window.c:800
 msgid "Could not find git repository"
 msgstr ""
 
-#: ../gitg/gitg-window.c:698
+#: ../gitg/gitg-window.c:983
 msgid "All branches"
 msgstr ""
 
-#: ../gitg/gitg-window.c:863
+#: ../gitg/gitg-window.c:1192
 msgid "Open git repository"
 msgstr ""
 
-#: ../gitg/gitg-window.c:988
+#: ../gitg/gitg-window.c:1313
 msgid "gitg is a git repository viewer for gtk+/GNOME"
 msgstr ""
 
-#: ../gitg/gitg-window.c:989
+#: ../gitg/gitg-window.c:1314
 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"
@@ -156,182 +198,570 @@ msgid ""
 "Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:1
-msgid "Add signed-off-by"
+#: ../gitg/gitg-window.c:1775 ../gitg/gitg-window.c:1809
+#, c-format
+msgid "New local branch <%s>"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:2
-msgid "Author"
+#: ../gitg/gitg-window.c:1787 ../gitg/gitg-branch-actions.c:316
+msgid "Remove remote branch"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:3
-msgid "Author:"
+#: ../gitg/gitg-window.c:1791
+msgid "Checkout working copy"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:4
-msgid "Branch:"
+#: ../gitg/gitg-window.c:1792
+msgid "Remove local branch"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:5
-msgid "Co_mmit message"
+#: ../gitg/gitg-window.c:1800 ../gitg/gitg-branch-actions.c:391
+msgid "Remove stash"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:6
-msgid "Commit"
+#: ../gitg/gitg-window.c:1805 ../gitg/gitg-branch-actions.c:456
+#: ../gitg/gitg-branch-actions.c:458
+msgid "Remove tag"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:7
-msgid "Context:"
+#: ../gitg/gitg-window.c:1984
+msgid "Not all fields are correctly filled in"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:8
-msgid "Date"
+#: ../gitg/gitg-window.c:1986
+msgid "Please make sure to fill in both the tag name and the commit message"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:9
-msgid "Date:"
+#: ../gitg/gitg-branch-actions.c:249
+#, c-format
+msgid "Branch <%s> could not be removed"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:10
-msgid "Details"
+#: ../gitg/gitg-branch-actions.c:250
+msgid ""
+"This usually means that the branch is not fully merged in HEAD. Do you want "
+"to forcefully remove the branch?"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:11
-msgid "Filename"
+#: ../gitg/gitg-branch-actions.c:251
+msgid "Force remove"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:12
-msgid "History"
+#: ../gitg/gitg-branch-actions.c:260
+#, c-format
+msgid "Branch <%s> could not be forcefully removed"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:13
-msgid "Ignore"
+#: ../gitg/gitg-branch-actions.c:293
+#, c-format
+msgid "Failed to remove remote branch <%s>."
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:14
-msgid "Parent:"
+#: ../gitg/gitg-branch-actions.c:314
+#, c-format
+msgid "Are you sure you want to remove the remote branch <%s>?"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:15
-msgid "R_ecently Opened"
+#: ../gitg/gitg-branch-actions.c:315
+msgid "This permanently removes the remote branch."
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:16
-msgid "Revert"
+#: ../gitg/gitg-branch-actions.c:332 ../gitg/gitg-menus.xml.h:9
+msgid "Remove branch"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:17
-msgid "SHA:"
+#: ../gitg/gitg-branch-actions.c:389
+msgid "Are you sure you want to remove this stash item?"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:18
-msgid "Stage"
+#: ../gitg/gitg-branch-actions.c:390
+msgid "This permanently removes the stash item"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:19
-msgid "Subject"
+#: ../gitg/gitg-branch-actions.c:417
+msgid "Failed to remove stash"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:20
-msgid "Subject:"
+#: ../gitg/gitg-branch-actions.c:418
+msgid "The stash item could not be successfully removed"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:21
-msgid "Tree"
+#: ../gitg/gitg-branch-actions.c:452
+#, c-format
+msgid "Are you sure you want to remove the tag <%s>?"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:22
-msgid "Unstage"
+#: ../gitg/gitg-branch-actions.c:475
+#, c-format
+msgid "The tag <%s> could not be successfully removed"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:23
-msgid "Unstaged"
+#: ../gitg/gitg-branch-actions.c:479
+msgid "Failed to remove tag"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:24
-msgid "_Changes"
+#: ../gitg/gitg-branch-actions.c:579
+msgid "Do you want to temporarily stash these changes?"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:25
-msgid "_Edit"
+#: ../gitg/gitg-branch-actions.c:583
+msgid "Do you want to stash and reapply these changes?"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:26
-msgid "_File"
+#: ../gitg/gitg-branch-actions.c:588
+msgid "You have uncommited changes in your current working tree"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:27
-msgid "_Help"
+#: ../gitg/gitg-branch-actions.c:590
+msgid "Stash changes"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:28
-msgid "_Open..."
+#: ../gitg/gitg-branch-actions.c:766
+msgid "Failed to save current index state"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:820 ../gitg/gitg-branch-actions.c:1102
+#: ../gitg/gitg-branch-actions.c:1397
+#, c-format
+msgid "Failed to checkout local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:858
+#, c-format
+msgid "Failed to checkout remote branch <%s> to local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:898
+#, c-format
+msgid "Failed to checkout tag <%s> to local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:989
+#, c-format
+msgid "Failed to rebase %s branch <%s> onto %s branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:993
+#, c-format
+msgid "Failed to merge %s branch <%s> with %s branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1001 ../gitg/gitg-branch-actions.c:1003
+#: ../gitg/gitg-branch-actions.c:1069 ../gitg/gitg-branch-actions.c:1071
+#: ../gitg/gitg-branch-actions.c:1110 ../gitg/gitg-branch-actions.c:1112
+#: ../gitg/gitg-branch-actions.c:1146 ../gitg/gitg-branch-actions.c:1148
+#: ../gitg/gitg-branch-actions.c:1193 ../gitg/gitg-branch-actions.c:1195
+msgid "local"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1001 ../gitg/gitg-branch-actions.c:1003
+#: ../gitg/gitg-branch-actions.c:1069 ../gitg/gitg-branch-actions.c:1071
+#: ../gitg/gitg-branch-actions.c:1110 ../gitg/gitg-branch-actions.c:1112
+#: ../gitg/gitg-branch-actions.c:1146 ../gitg/gitg-branch-actions.c:1148
+#: ../gitg/gitg-branch-actions.c:1193 ../gitg/gitg-branch-actions.c:1195
+msgid "remote"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1020
+msgid "The stashed changes have been stored to be reapplied manually"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1025
+msgid "Failed to checkout previously checked out branch"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1046
+msgid "Failed to reapply stash correctly"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1047
+msgid ""
+"There might be unresolved conflicts in the working tree or index which you "
+"need to resolve manually"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1068
+#, c-format
+msgid "Are you sure you want to merge %s branch <%s> onto %s branch <%s>?"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1076 ../gitg/gitg-branch-actions.c:1078
+#: ../gitg/gitg-branch-actions.c:1122 ../gitg/gitg-menus.xml.h:4
+msgid "Merge"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1103
+msgid "The branch on which to merge could not be checked out"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1109
+#, c-format
+msgid "Merging %s branch <%s> onto %s branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1145
+#, c-format
+msgid "Are you sure you want to rebase %s branch <%s> onto %s branch <%s>?"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1153 ../gitg/gitg-branch-actions.c:1155
+#: ../gitg/gitg-branch-actions.c:1205 ../gitg/gitg-menus.xml.h:7
+msgid "Rebase"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1178
+msgid "Unable to rebase"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1179
+msgid ""
+"There are still uncommitted changes in your working tree and you are trying "
+"to rebase a branch onto the currently checked out branch. Either remove, "
+"stash or commit your changes first and try again"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1192
+#, c-format
+msgid "Rebasing %s branch <%s> onto %s branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1231
+#, c-format
+msgid "Failed to push local branch <%s> to remote <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1232
+msgid ""
+"This usually means that the remote branch could not be fast-forwarded. Try "
+"fetching the latest changes."
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1256
+#, c-format
+msgid "Are you sure you want to push <%s> to <%s>?"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1262 ../gitg/gitg-branch-actions.c:1264
+#: ../gitg/gitg-branch-actions.c:1285 ../gitg/gitg-branch-actions.c:1317
+#: ../gitg/gitg-branch-actions.c:1319 ../gitg/gitg-branch-actions.c:1346
+msgid "Push"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1277 ../gitg/gitg-branch-actions.c:1331
+#, c-format
+msgid "Pushing local branch <%s> to remote branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1311
+#, c-format
+msgid "Are you sure you want to push <%s> to remote <%s>?"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1370
+#, c-format
+msgid "Are you sure you want to apply the stash item to local branch <%s>?"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1375 ../gitg/gitg-branch-actions.c:1377
+msgid "Apply stash"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1416
+#, c-format
+msgid "The stash could not be applied to local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1420
+msgid "Failed to apply stash"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1466
+msgid ""
+"The tag object could not be successfully created. Please make sure you have "
+"a GPG key and the key is unlocked"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1470
+msgid "The tag object could not be successfully created"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1475
+msgid "Failed to create tag"
+msgstr ""
+
+#: ../gitg/gitg-repository-dialog.c:173 ../gitg/gitg-repository.ui.h:4
+msgid "Fetch"
+msgstr ""
+
+#: ../gitg/gitg-repository-dialog.c:178
+msgid "Cancel"
+msgstr ""
+
+#: ../gitg/gitg-repository-dialog.c:441 ../gitg/gitg-repository.ui.h:7
+#: ../gitg/gitg-tag.ui.h:5
+msgid "Properties"
+msgstr ""
+
+#: ../gitg/gitg-window.ui.h:1
+msgid "Add signed-off-by"
+msgstr ""
+
+#: ../gitg/gitg-window.ui.h:2
+msgid "Amend"
+msgstr ""
+
+#: ../gitg/gitg-window.ui.h:3
+msgid "Author:"
+msgstr ""
+
+#: ../gitg/gitg-window.ui.h:4
+msgid "Branch:"
+msgstr ""
+
+#: ../gitg/gitg-window.ui.h:5
+msgid "Co_mmit message"
+msgstr ""
+
+#: ../gitg/gitg-window.ui.h:6 ../gitg/gitg-preferences.ui.h:5
+msgid "Commit"
+msgstr ""
+
+#: ../gitg/gitg-window.ui.h:7
+msgid "Context:"
+msgstr ""
+
+#: ../gitg/gitg-window.ui.h:8
+msgid "Date:"
+msgstr ""
+
+#: ../gitg/gitg-window.ui.h:9
+msgid "Details"
+msgstr ""
+
+#: ../gitg/gitg-window.ui.h:10
+msgid "History"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:29
+#: ../gitg/gitg-window.ui.h:11
+msgid "Parent:"
+msgstr ""
+
+#: ../gitg/gitg-window.ui.h:12
+msgid "SHA:"
+msgstr ""
+
+#: ../gitg/gitg-window.ui.h:13
+msgid "Subject:"
+msgstr ""
+
+#: ../gitg/gitg-window.ui.h:14
+msgid "Tree"
+msgstr ""
+
+#: ../gitg/gitg-window.ui.h:15
+msgid "_Changes"
+msgstr ""
+
+#: ../gitg/gitg-window.ui.h:16
 msgid "_Staged"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:30
+#: ../gitg/gitg-window.ui.h:17
 msgid "_Unstaged"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:31
-msgid "_View"
+#: ../gitg/gitg-commit-menu.ui.h:1 ../gitg/gitg-ui.xml.h:1
+msgid "Ignore"
 msgstr ""
 
-#: ../gitg/gitg-menus.xml.h:1
-msgid "_Author"
+#: ../gitg/gitg-commit-menu.ui.h:2 ../gitg/gitg-ui.xml.h:3
+msgid "Revert"
 msgstr ""
 
-#: ../gitg/gitg-menus.xml.h:2
-msgid "_Date"
+#: ../gitg/gitg-commit-menu.ui.h:3 ../gitg/gitg-ui.xml.h:4
+msgid "Stage"
 msgstr ""
 
-#: ../gitg/gitg-menus.xml.h:3
-msgid "_Hash"
+#: ../gitg/gitg-commit-menu.ui.h:4 ../gitg/gitg-ui.xml.h:5
+msgid "Unstage"
 msgstr ""
 
-#: ../gitg/gitg-menus.xml.h:4
-msgid "_Subject"
+#: ../gitg/gitg-preferences.ui.h:1
+msgid "<b>Commit Message</b>"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:1
+#: ../gitg/gitg-preferences.ui.h:2
 msgid "<b>History</b>"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:2
+#: ../gitg/gitg-preferences.ui.h:3 ../gitg/gitg-repository.ui.h:1
+msgid "<b>User</b>"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:4
 msgid "Collapse inactive lanes"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:3
+#: ../gitg/gitg-preferences.ui.h:6 ../gitg/gitg-repository.ui.h:2
+msgid "Configuration"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:7
+msgid ""
+"Configure global git settings. This corresponds to the settings as stored in "
+"~/.gitconfig. Repository specific settings can be configured at the "
+"repository properties."
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:8
+msgid "Display right _margin"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:9 ../gitg/gitg-repository.ui.h:3
+msgid "E-mail:"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:10
 msgid "Early"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:4
+#: ../gitg/gitg-preferences.ui.h:11
 msgid "Late"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:5
+#: ../gitg/gitg-preferences.ui.h:12 ../gitg/gitg-repository.ui.h:6
+#: ../gitg/gitg-tag.ui.h:4
+msgid "Name:"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:13
 msgid "Preferences"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:6
+#: ../gitg/gitg-preferences.ui.h:14
+msgid "Preferences that apply to the commit view"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:15
+msgid "Preferences that apply to the revision view"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:16
 msgid "Search filters revisions in the history view"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:7
+#: ../gitg/gitg-preferences.ui.h:17
 msgid "Show staged changes in history"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:8
+#: ../gitg/gitg-preferences.ui.h:18
 msgid "Show stash in history"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:9
+#: ../gitg/gitg-preferences.ui.h:19
 msgid "Show unstaged changes in history"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:10
+#: ../gitg/gitg-preferences.ui.h:20
 msgid "View"
 msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:21
+msgid "_Right margin at column:"
+msgstr ""
+
+#: ../gitg/gitg-repository.ui.h:5
+msgid "Name"
+msgstr ""
+
+#: ../gitg/gitg-repository.ui.h:8
+msgid "Remotes"
+msgstr ""
+
+#: ../gitg/gitg-repository.ui.h:9
+msgid "URL"
+msgstr ""
+
+#: ../gitg/gitg-repository.ui.h:10
+msgid "gtk-add"
+msgstr ""
+
+#: ../gitg/gitg-repository.ui.h:11
+msgid "gtk-remove"
+msgstr ""
+
+#: ../gitg/gitg-tag.ui.h:1
+msgid "Create signed tag object"
+msgstr ""
+
+#: ../gitg/gitg-tag.ui.h:2 ../gitg/gitg-menus.xml.h:3
+msgid "Create tag"
+msgstr ""
+
+#: ../gitg/gitg-tag.ui.h:3
+msgid "Message:"
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:1
+msgid "Apply stash to..."
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:2
+msgid "Checkout branch"
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:5
+msgid "Merge branch with..."
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:6
+msgid "Push branch to..."
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:8
+msgid "Rebase branch onto..."
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:10
+msgid "_Author"
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:11
+msgid "_Date"
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:12
+msgid "_Hash"
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:13
+msgid "_Subject"
+msgstr ""
+
+#: ../gitg/gitg-ui.xml.h:2
+msgid "R_ecently Opened"
+msgstr ""
+
+#: ../gitg/gitg-ui.xml.h:6
+msgid "_Edit"
+msgstr ""
+
+#: ../gitg/gitg-ui.xml.h:7
+msgid "_File"
+msgstr ""
+
+#: ../gitg/gitg-ui.xml.h:8
+msgid "_Help"
+msgstr ""
+
+#: ../gitg/gitg-ui.xml.h:9
+msgid "_Open..."
+msgstr ""
+
+#: ../gitg/gitg-ui.xml.h:10
+msgid "_Repository"
+msgstr ""
+
+#: ../gitg/gitg-ui.xml.h:11
+msgid "_View"
+msgstr ""
diff --git a/po/gl.po b/po/gl.po
index d8aa35e..f8b5a80 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-22 00:44+0200\n"
+"POT-Creation-Date: 2009-07-05 21:28+0200\n"
 "PO-Revision-Date: 2009-04-21 12:27+0200\n"
 "Last-Translator: Ignacio Casal Quinteiro <icq gnome org>\n"
 "Language-Team: Galician <proxecto trasno net>\n"
@@ -21,26 +21,48 @@ msgid "Git repository browser"
 msgstr "Examinador de repositorios Git"
 
 #. Translators: this is the application name as in g_set_application_name
-#: ../data/gitg.desktop.in.in.h:2 ../gitg/gitg.c:169 ../gitg/gitg-window.c:785
-#: ../gitg/gitg-window.c:803 ../gitg/gitg-ui.xml.h:32
+#: ../data/gitg.desktop.in.in.h:2 ../gitg/gitg.c:169
+#: ../gitg/gitg-window.c:1005 ../gitg/gitg-window.c:1018
+#: ../gitg/gitg-branch-actions.c:146 ../gitg/gitg-branch-actions.c:199
+#: ../gitg/gitg-window.ui.h:18
 msgid "gitg"
 msgstr "gitg"
 
 #: ../data/gitg.schemas.in.h:1
-msgid "Filter Revisions When Searching"
+msgid "Column at Which Right Margin is Shown"
 msgstr ""
 
 #: ../data/gitg.schemas.in.h:2
+msgid "Filter Revisions When Searching"
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:3
 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 ""
 
-#: ../data/gitg.schemas.in.h:3
+#: ../data/gitg.schemas.in.h:4
+msgid "Show Right Margin in Commit Message View"
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:5
+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."
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:6
+msgid ""
+"The column at which the right margin is shown if the right-margin preference "
+"is set to TRUE."
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:7
 msgid "When to Collapse Inactive Lanes"
 msgstr ""
 
-#: ../data/gitg.schemas.in.h:4
+#: ../data/gitg.schemas.in.h:8
 msgid ""
 "Whether searching filters the revisions in the history view instead of "
 "jumping to the first match."
@@ -54,49 +76,49 @@ msgstr "Iniciar gitg en modo commit"
 msgid "- git repository viewer"
 msgstr "- visor de repositorios git"
 
-#: ../gitg/gitg-commit-view.c:204 ../gitg/gitg-revision-tree-view.c:181
+#: ../gitg/gitg-commit-view.c:208 ../gitg/gitg-revision-tree-view.c:181
 msgid "Cannot display file content as text"
 msgstr "Non se pode mostrar o contido do ficheiro como texto"
 
-#: ../gitg/gitg-commit-view.c:1166
+#: ../gitg/gitg-commit-view.c:1431
 msgid "You must first stage some changes before committing"
 msgstr ""
 
-#: ../gitg/gitg-commit-view.c:1174
+#: ../gitg/gitg-commit-view.c:1439
 msgid "Please enter a commit message before committing"
 msgstr "Introduza unha mensaxe de commit antes de facer commit"
 
-#: ../gitg/gitg-commit-view.c:1185
+#: ../gitg/gitg-commit-view.c:1451
 msgid ""
 "Your user name or email could not be retrieved for use in the sign off "
 "message"
 msgstr ""
 
-#: ../gitg/gitg-commit-view.c:1187
+#: ../gitg/gitg-commit-view.c:1453
 msgid "Something went wrong while trying to commit"
 msgstr ""
 
-#: ../gitg/gitg-commit-view.c:1355
+#: ../gitg/gitg-commit-view.c:1612
 msgid "Revert fail"
 msgstr "Fallou ao reverter"
 
-#: ../gitg/gitg-commit-view.c:1366
+#: ../gitg/gitg-commit-view.c:1623
 msgid "Are you sure you want to revert these changes?"
 msgstr "EstÃ¡ seguro de que quere reverter os cambios?"
 
-#: ../gitg/gitg-commit-view.c:1369
+#: ../gitg/gitg-commit-view.c:1626
 msgid "Reverting changes is permanent and cannot be undone"
 msgstr ""
 
-#: ../gitg/gitg-repository.c:472
+#: ../gitg/gitg-repository.c:591
 msgid "Staged changes"
 msgstr ""
 
-#: ../gitg/gitg-repository.c:474
+#: ../gitg/gitg-repository.c:593
 msgid "Unstaged changes"
 msgstr ""
 
-#: ../gitg/gitg-repository.c:983
+#: ../gitg/gitg-repository.c:1148
 msgid "Not a valid git repository"
 msgstr "Non Ã© un repositorio git vÃ¡lido"
 
@@ -104,41 +126,61 @@ msgstr "Non Ã© un repositorio git vÃ¡lido"
 msgid "(Empty)"
 msgstr "(Baleiro)"
 
-#: ../gitg/gitg-window.c:346
+#: ../gitg/gitg-window.c:420
 msgid "Select branch"
 msgstr "Seleccionar rama"
 
-#: ../gitg/gitg-window.c:532
+#: ../gitg/gitg-window.c:482
+#, c-format
+msgid "Push local branch <%s> to remote branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-window.c:489
+#, c-format
+msgid "Merge/rebase local branch <%s> with/on local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-window.c:496
+#, c-format
+msgid "Merge/rebase local branch <%s> with/on remote branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-window.c:503
+#, c-format
+msgid "Apply stash to local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-window.c:771
 msgid "Begin loading repository"
 msgstr "Comezar cargando repositorio"
 
-#: ../gitg/gitg-window.c:541
+#: ../gitg/gitg-window.c:780
 #, c-format
 msgid "Loaded %d revisions in %.2fs"
 msgstr "Cargadas %d revisiÃ³ns en %.2fs"
 
-#: ../gitg/gitg-window.c:552
+#: ../gitg/gitg-window.c:791
 #, c-format
 msgid "Loading %d revisions..."
 msgstr "Cargando %d revisiÃ³ns..."
 
-#: ../gitg/gitg-window.c:561
+#: ../gitg/gitg-window.c:800
 msgid "Could not find git repository"
 msgstr "Non se puido encontrar o repositorio git"
 
-#: ../gitg/gitg-window.c:697
+#: ../gitg/gitg-window.c:983
 msgid "All branches"
 msgstr "Todas as ramas"
 
-#: ../gitg/gitg-window.c:860
+#: ../gitg/gitg-window.c:1192
 msgid "Open git repository"
 msgstr "Abrir repositorio git"
 
-#: ../gitg/gitg-window.c:982
+#: ../gitg/gitg-window.c:1313
 msgid "gitg is a git repository viewer for gtk+/GNOME"
 msgstr "gitg Ã© un visor de repositorios git para gtk+/Gnome"
 
-#: ../gitg/gitg-window.c:983
+#: ../gitg/gitg-window.c:1314
 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"
@@ -156,186 +198,599 @@ msgid ""
 "Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:1
+#: ../gitg/gitg-window.c:1775 ../gitg/gitg-window.c:1809
+#, fuzzy, c-format
+msgid "New local branch <%s>"
+msgstr "Todas as ramas"
+
+#: ../gitg/gitg-window.c:1787 ../gitg/gitg-branch-actions.c:316
+#, fuzzy
+msgid "Remove remote branch"
+msgstr "Seleccionar rama"
+
+#: ../gitg/gitg-window.c:1791
+msgid "Checkout working copy"
+msgstr ""
+
+#: ../gitg/gitg-window.c:1792
+#, fuzzy
+msgid "Remove local branch"
+msgstr "Seleccionar rama"
+
+#: ../gitg/gitg-window.c:1800 ../gitg/gitg-branch-actions.c:391
+msgid "Remove stash"
+msgstr ""
+
+#: ../gitg/gitg-window.c:1805 ../gitg/gitg-branch-actions.c:456
+#: ../gitg/gitg-branch-actions.c:458
+#, fuzzy
+msgid "Remove tag"
+msgstr "Reverter"
+
+#: ../gitg/gitg-window.c:1984
+msgid "Not all fields are correctly filled in"
+msgstr ""
+
+#: ../gitg/gitg-window.c:1986
+msgid "Please make sure to fill in both the tag name and the commit message"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:249
+#, c-format
+msgid "Branch <%s> could not be removed"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:250
+msgid ""
+"This usually means that the branch is not fully merged in HEAD. Do you want "
+"to forcefully remove the branch?"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:251
+msgid "Force remove"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:260
+#, c-format
+msgid "Branch <%s> could not be forcefully removed"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:293
+#, c-format
+msgid "Failed to remove remote branch <%s>."
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:314
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the remote branch <%s>?"
+msgstr "EstÃ¡ seguro de que quere reverter os cambios?"
+
+#: ../gitg/gitg-branch-actions.c:315
+msgid "This permanently removes the remote branch."
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:332 ../gitg/gitg-menus.xml.h:9
+#, fuzzy
+msgid "Remove branch"
+msgstr "Seleccionar rama"
+
+#: ../gitg/gitg-branch-actions.c:389
+#, fuzzy
+msgid "Are you sure you want to remove this stash item?"
+msgstr "EstÃ¡ seguro de que quere reverter os cambios?"
+
+#: ../gitg/gitg-branch-actions.c:390
+msgid "This permanently removes the stash item"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:417
+msgid "Failed to remove stash"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:418
+msgid "The stash item could not be successfully removed"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:452
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the tag <%s>?"
+msgstr "EstÃ¡ seguro de que quere reverter os cambios?"
+
+#: ../gitg/gitg-branch-actions.c:475
+#, c-format
+msgid "The tag <%s> could not be successfully removed"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:479
+msgid "Failed to remove tag"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:579
+#, fuzzy
+msgid "Do you want to temporarily stash these changes?"
+msgstr "EstÃ¡ seguro de que quere reverter os cambios?"
+
+#: ../gitg/gitg-branch-actions.c:583
+#, fuzzy
+msgid "Do you want to stash and reapply these changes?"
+msgstr "EstÃ¡ seguro de que quere reverter os cambios?"
+
+#: ../gitg/gitg-branch-actions.c:588
+msgid "You have uncommited changes in your current working tree"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:590
+msgid "Stash changes"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:766
+msgid "Failed to save current index state"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:820 ../gitg/gitg-branch-actions.c:1102
+#: ../gitg/gitg-branch-actions.c:1397
+#, c-format
+msgid "Failed to checkout local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:858
+#, c-format
+msgid "Failed to checkout remote branch <%s> to local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:898
+#, c-format
+msgid "Failed to checkout tag <%s> to local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:989
+#, c-format
+msgid "Failed to rebase %s branch <%s> onto %s branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:993
+#, c-format
+msgid "Failed to merge %s branch <%s> with %s branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1001 ../gitg/gitg-branch-actions.c:1003
+#: ../gitg/gitg-branch-actions.c:1069 ../gitg/gitg-branch-actions.c:1071
+#: ../gitg/gitg-branch-actions.c:1110 ../gitg/gitg-branch-actions.c:1112
+#: ../gitg/gitg-branch-actions.c:1146 ../gitg/gitg-branch-actions.c:1148
+#: ../gitg/gitg-branch-actions.c:1193 ../gitg/gitg-branch-actions.c:1195
+msgid "local"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1001 ../gitg/gitg-branch-actions.c:1003
+#: ../gitg/gitg-branch-actions.c:1069 ../gitg/gitg-branch-actions.c:1071
+#: ../gitg/gitg-branch-actions.c:1110 ../gitg/gitg-branch-actions.c:1112
+#: ../gitg/gitg-branch-actions.c:1146 ../gitg/gitg-branch-actions.c:1148
+#: ../gitg/gitg-branch-actions.c:1193 ../gitg/gitg-branch-actions.c:1195
+#, fuzzy
+msgid "remote"
+msgstr "Ã?rbore"
+
+#: ../gitg/gitg-branch-actions.c:1020
+msgid "The stashed changes have been stored to be reapplied manually"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1025
+msgid "Failed to checkout previously checked out branch"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1046
+msgid "Failed to reapply stash correctly"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1047
+msgid ""
+"There might be unresolved conflicts in the working tree or index which you "
+"need to resolve manually"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1068
+#, fuzzy, c-format
+msgid "Are you sure you want to merge %s branch <%s> onto %s branch <%s>?"
+msgstr "EstÃ¡ seguro de que quere reverter os cambios?"
+
+#: ../gitg/gitg-branch-actions.c:1076 ../gitg/gitg-branch-actions.c:1078
+#: ../gitg/gitg-branch-actions.c:1122 ../gitg/gitg-menus.xml.h:4
+msgid "Merge"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1103
+msgid "The branch on which to merge could not be checked out"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1109
+#, c-format
+msgid "Merging %s branch <%s> onto %s branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1145
+#, fuzzy, c-format
+msgid "Are you sure you want to rebase %s branch <%s> onto %s branch <%s>?"
+msgstr "EstÃ¡ seguro de que quere reverter os cambios?"
+
+#: ../gitg/gitg-branch-actions.c:1153 ../gitg/gitg-branch-actions.c:1155
+#: ../gitg/gitg-branch-actions.c:1205 ../gitg/gitg-menus.xml.h:7
+msgid "Rebase"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1178
+msgid "Unable to rebase"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1179
+msgid ""
+"There are still uncommitted changes in your working tree and you are trying "
+"to rebase a branch onto the currently checked out branch. Either remove, "
+"stash or commit your changes first and try again"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1192
+#, c-format
+msgid "Rebasing %s branch <%s> onto %s branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1231
+#, c-format
+msgid "Failed to push local branch <%s> to remote <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1232
+msgid ""
+"This usually means that the remote branch could not be fast-forwarded. Try "
+"fetching the latest changes."
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1256
+#, fuzzy, c-format
+msgid "Are you sure you want to push <%s> to <%s>?"
+msgstr "EstÃ¡ seguro de que quere reverter os cambios?"
+
+#: ../gitg/gitg-branch-actions.c:1262 ../gitg/gitg-branch-actions.c:1264
+#: ../gitg/gitg-branch-actions.c:1285 ../gitg/gitg-branch-actions.c:1317
+#: ../gitg/gitg-branch-actions.c:1319 ../gitg/gitg-branch-actions.c:1346
+msgid "Push"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1277 ../gitg/gitg-branch-actions.c:1331
+#, c-format
+msgid "Pushing local branch <%s> to remote branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1311
+#, fuzzy, c-format
+msgid "Are you sure you want to push <%s> to remote <%s>?"
+msgstr "EstÃ¡ seguro de que quere reverter os cambios?"
+
+#: ../gitg/gitg-branch-actions.c:1370
+#, fuzzy, c-format
+msgid "Are you sure you want to apply the stash item to local branch <%s>?"
+msgstr "EstÃ¡ seguro de que quere reverter os cambios?"
+
+#: ../gitg/gitg-branch-actions.c:1375 ../gitg/gitg-branch-actions.c:1377
+msgid "Apply stash"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1416
+#, c-format
+msgid "The stash could not be applied to local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1420
+msgid "Failed to apply stash"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1466
+msgid ""
+"The tag object could not be successfully created. Please make sure you have "
+"a GPG key and the key is unlocked"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1470
+msgid "The tag object could not be successfully created"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1475
+msgid "Failed to create tag"
+msgstr ""
+
+#: ../gitg/gitg-repository-dialog.c:173 ../gitg/gitg-repository.ui.h:4
+msgid "Fetch"
+msgstr ""
+
+#: ../gitg/gitg-repository-dialog.c:178
+msgid "Cancel"
+msgstr ""
+
+#: ../gitg/gitg-repository-dialog.c:441 ../gitg/gitg-repository.ui.h:7
+#: ../gitg/gitg-tag.ui.h:5
+msgid "Properties"
+msgstr ""
+
+#: ../gitg/gitg-window.ui.h:1
 msgid "Add signed-off-by"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:2
-msgid "Author"
-msgstr "Autor"
+#: ../gitg/gitg-window.ui.h:2
+msgid "Amend"
+msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:3
+#: ../gitg/gitg-window.ui.h:3
 msgid "Author:"
 msgstr "Autor:"
 
-#: ../gitg/gitg-ui.xml.h:4
+#: ../gitg/gitg-window.ui.h:4
 msgid "Branch:"
 msgstr "Rama:"
 
-#: ../gitg/gitg-ui.xml.h:5
+#: ../gitg/gitg-window.ui.h:5
 msgid "Co_mmit message"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:6
+#: ../gitg/gitg-window.ui.h:6 ../gitg/gitg-preferences.ui.h:5
 msgid "Commit"
 msgstr "Facer commit"
 
-#: ../gitg/gitg-ui.xml.h:7
+#: ../gitg/gitg-window.ui.h:7
 msgid "Context:"
 msgstr "Contexto:"
 
-#: ../gitg/gitg-ui.xml.h:8
-msgid "Date"
-msgstr "Data"
-
-#: ../gitg/gitg-ui.xml.h:9
+#: ../gitg/gitg-window.ui.h:8
 msgid "Date:"
 msgstr "Data:"
 
-#: ../gitg/gitg-ui.xml.h:10
+#: ../gitg/gitg-window.ui.h:9
 msgid "Details"
 msgstr "Detalles"
 
-#: ../gitg/gitg-ui.xml.h:11
-msgid "Filename"
-msgstr "Nome de ficheiro"
-
-#: ../gitg/gitg-ui.xml.h:12
+#: ../gitg/gitg-window.ui.h:10
 msgid "History"
 msgstr "Historial"
 
-#: ../gitg/gitg-ui.xml.h:13
-msgid "Ignore"
-msgstr "Ignorar"
-
-#: ../gitg/gitg-ui.xml.h:14
+#: ../gitg/gitg-window.ui.h:11
 msgid "Parent:"
 msgstr "Pai:"
 
-#: ../gitg/gitg-ui.xml.h:15
-#, fuzzy
-msgid "R_ecently Opened"
-msgstr "Aberto recentemente"
-
-#: ../gitg/gitg-ui.xml.h:16
-msgid "Revert"
-msgstr "Reverter"
-
-#: ../gitg/gitg-ui.xml.h:17
+#: ../gitg/gitg-window.ui.h:12
 msgid "SHA:"
 msgstr "SHA:"
 
-#: ../gitg/gitg-ui.xml.h:18
-msgid "Stage"
-msgstr ""
-
-#: ../gitg/gitg-ui.xml.h:19
-msgid "Subject"
-msgstr "Asunto"
-
-#: ../gitg/gitg-ui.xml.h:20
+#: ../gitg/gitg-window.ui.h:13
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: ../gitg/gitg-ui.xml.h:21
+#: ../gitg/gitg-window.ui.h:14
 msgid "Tree"
 msgstr "Ã?rbore"
 
-#: ../gitg/gitg-ui.xml.h:22
-msgid "Unstage"
-msgstr ""
-
-#: ../gitg/gitg-ui.xml.h:23
-msgid "Unstaged"
-msgstr ""
-
-#: ../gitg/gitg-ui.xml.h:24
+#: ../gitg/gitg-window.ui.h:15
 msgid "_Changes"
 msgstr "_Cambios"
 
-#: ../gitg/gitg-ui.xml.h:25
-msgid "_Edit"
-msgstr "_Editar"
-
-#: ../gitg/gitg-ui.xml.h:26
-msgid "_File"
-msgstr "_Ficheiro"
-
-#: ../gitg/gitg-ui.xml.h:27
-msgid "_Help"
-msgstr "A_xuda"
-
-#: ../gitg/gitg-ui.xml.h:28
-msgid "_Open..."
-msgstr "_Abrir..."
-
-#: ../gitg/gitg-ui.xml.h:29
+#: ../gitg/gitg-window.ui.h:16
 msgid "_Staged"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:30
+#: ../gitg/gitg-window.ui.h:17
 msgid "_Unstaged"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:31
-msgid "_View"
-msgstr "_Ver"
+#: ../gitg/gitg-commit-menu.ui.h:1 ../gitg/gitg-ui.xml.h:1
+msgid "Ignore"
+msgstr "Ignorar"
 
-#: ../gitg/gitg-menus.xml.h:1
-msgid "_Author"
-msgstr "_Autor"
+#: ../gitg/gitg-commit-menu.ui.h:2 ../gitg/gitg-ui.xml.h:3
+msgid "Revert"
+msgstr "Reverter"
 
-#: ../gitg/gitg-menus.xml.h:2
-msgid "_Date"
-msgstr "_Data"
+#: ../gitg/gitg-commit-menu.ui.h:3 ../gitg/gitg-ui.xml.h:4
+msgid "Stage"
+msgstr ""
 
-#: ../gitg/gitg-menus.xml.h:3
-msgid "_Hash"
-msgstr "_Hash"
+#: ../gitg/gitg-commit-menu.ui.h:4 ../gitg/gitg-ui.xml.h:5
+msgid "Unstage"
+msgstr ""
 
-#: ../gitg/gitg-menus.xml.h:4
-msgid "_Subject"
-msgstr "A_sunto"
+#: ../gitg/gitg-preferences.ui.h:1
+msgid "<b>Commit Message</b>"
+msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:1
+#: ../gitg/gitg-preferences.ui.h:2
 msgid "<b>History</b>"
 msgstr "<b>Historial</b>"
 
-#: ../gitg/gitg-preferences.xml.h:2
+#: ../gitg/gitg-preferences.ui.h:3 ../gitg/gitg-repository.ui.h:1
+#, fuzzy
+msgid "<b>User</b>"
+msgstr "<b>Historial</b>"
+
+#: ../gitg/gitg-preferences.ui.h:4
 msgid "Collapse inactive lanes"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:3
+#: ../gitg/gitg-preferences.ui.h:6 ../gitg/gitg-repository.ui.h:2
+msgid "Configuration"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:7
+msgid ""
+"Configure global git settings. This corresponds to the settings as stored in "
+"~/.gitconfig. Repository specific settings can be configured at the "
+"repository properties."
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:8
+msgid "Display right _margin"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:9 ../gitg/gitg-repository.ui.h:3
+msgid "E-mail:"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:10
 msgid "Early"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:4
+#: ../gitg/gitg-preferences.ui.h:11
 msgid "Late"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:5
+#: ../gitg/gitg-preferences.ui.h:12 ../gitg/gitg-repository.ui.h:6
+#: ../gitg/gitg-tag.ui.h:4
+#, fuzzy
+msgid "Name:"
+msgstr "Data:"
+
+#: ../gitg/gitg-preferences.ui.h:13
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../gitg/gitg-preferences.xml.h:6
+#: ../gitg/gitg-preferences.ui.h:14
+msgid "Preferences that apply to the commit view"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:15
+msgid "Preferences that apply to the revision view"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:16
 msgid "Search filters revisions in the history view"
 msgstr "Buscar revisiÃ³ns filtradas no visor do historial"
 
-#: ../gitg/gitg-preferences.xml.h:7
+#: ../gitg/gitg-preferences.ui.h:17
 msgid "Show staged changes in history"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:8
+#: ../gitg/gitg-preferences.ui.h:18
 msgid "Show stash in history"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:9
+#: ../gitg/gitg-preferences.ui.h:19
 msgid "Show unstaged changes in history"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:10
+#: ../gitg/gitg-preferences.ui.h:20
 msgid "View"
 msgstr "Ver"
 
+#: ../gitg/gitg-preferences.ui.h:21
+msgid "_Right margin at column:"
+msgstr ""
+
+#: ../gitg/gitg-repository.ui.h:5
+#, fuzzy
+msgid "Name"
+msgstr "Data:"
+
+#: ../gitg/gitg-repository.ui.h:8
+msgid "Remotes"
+msgstr ""
+
+#: ../gitg/gitg-repository.ui.h:9
+msgid "URL"
+msgstr ""
+
+#: ../gitg/gitg-repository.ui.h:10
+msgid "gtk-add"
+msgstr ""
+
+#: ../gitg/gitg-repository.ui.h:11
+msgid "gtk-remove"
+msgstr ""
+
+#: ../gitg/gitg-tag.ui.h:1
+msgid "Create signed tag object"
+msgstr ""
+
+#: ../gitg/gitg-tag.ui.h:2 ../gitg/gitg-menus.xml.h:3
+msgid "Create tag"
+msgstr ""
+
+#: ../gitg/gitg-tag.ui.h:3
+msgid "Message:"
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:1
+msgid "Apply stash to..."
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:2
+#, fuzzy
+msgid "Checkout branch"
+msgstr "Seleccionar rama"
+
+#: ../gitg/gitg-menus.xml.h:5
+msgid "Merge branch with..."
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:6
+msgid "Push branch to..."
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:8
+msgid "Rebase branch onto..."
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:10
+msgid "_Author"
+msgstr "_Autor"
+
+#: ../gitg/gitg-menus.xml.h:11
+msgid "_Date"
+msgstr "_Data"
+
+#: ../gitg/gitg-menus.xml.h:12
+msgid "_Hash"
+msgstr "_Hash"
+
+#: ../gitg/gitg-menus.xml.h:13
+msgid "_Subject"
+msgstr "A_sunto"
+
+#: ../gitg/gitg-ui.xml.h:2
+#, fuzzy
+msgid "R_ecently Opened"
+msgstr "Aberto recentemente"
+
+#: ../gitg/gitg-ui.xml.h:6
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../gitg/gitg-ui.xml.h:7
+msgid "_File"
+msgstr "_Ficheiro"
+
+#: ../gitg/gitg-ui.xml.h:8
+msgid "_Help"
+msgstr "A_xuda"
+
+#: ../gitg/gitg-ui.xml.h:9
+msgid "_Open..."
+msgstr "_Abrir..."
+
+#: ../gitg/gitg-ui.xml.h:10
+#, fuzzy
+msgid "_Repository"
+msgstr "Abrir repositorio git"
+
+#: ../gitg/gitg-ui.xml.h:11
+msgid "_View"
+msgstr "_Ver"
+
+#~ msgid "Author"
+#~ msgstr "Autor"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid "Filename"
+#~ msgstr "Nome de ficheiro"
+
+#~ msgid "Subject"
+#~ msgstr "Asunto"
+
 #~ msgid "Co_mment"
 #~ msgstr "Co_mentario"
diff --git a/po/nl.po b/po/nl.po
index 70dd9f9..de7e7ff 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-22 00:44+0200\n"
+"POT-Creation-Date: 2009-07-05 21:28+0200\n"
 "PO-Revision-Date: 2009-02-28 20:18+0100\n"
 "Last-Translator: Jesse van den Kieboom <jessevdk gnome org>\n"
 "Language-Team: \n"
@@ -21,16 +21,22 @@ msgid "Git repository browser"
 msgstr "Git repository bekijker"
 
 #. Translators: this is the application name as in g_set_application_name
-#: ../data/gitg.desktop.in.in.h:2 ../gitg/gitg.c:169 ../gitg/gitg-window.c:785
-#: ../gitg/gitg-window.c:803 ../gitg/gitg-ui.xml.h:32
+#: ../data/gitg.desktop.in.in.h:2 ../gitg/gitg.c:169
+#: ../gitg/gitg-window.c:1005 ../gitg/gitg-window.c:1018
+#: ../gitg/gitg-branch-actions.c:146 ../gitg/gitg-branch-actions.c:199
+#: ../gitg/gitg-window.ui.h:18
 msgid "gitg"
 msgstr "gitg"
 
 #: ../data/gitg.schemas.in.h:1
+msgid "Column at Which Right Margin is Shown"
+msgstr "Kolom waar de rechterkantlijn getoond wordt"
+
+#: ../data/gitg.schemas.in.h:2
 msgid "Filter Revisions When Searching"
 msgstr "Filter revisies bij zoeken"
 
-#: ../data/gitg.schemas.in.h:2
+#: ../data/gitg.schemas.in.h:3
 msgid ""
 "Setting that indicates when an inactive lane should be collapsed. Valid "
 "values are 0 - 4, where 0 indicates 'early' and 4 indicates 'late'."
@@ -38,11 +44,32 @@ msgstr ""
 "Instelling die aangeeft wanneer een inactieve baan ingebouwd moet worden. "
 "Geldige waarden zijn 0 - 4, waarbij 0 'vroeg' en 4 'laat' betekent."
 
-#: ../data/gitg.schemas.in.h:3
+#: ../data/gitg.schemas.in.h:4
+msgid "Show Right Margin in Commit Message View"
+msgstr "Toon rechterkantlijn in commit bericht beeld"
+
+#: ../data/gitg.schemas.in.h:5
+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."
+msgstr ""
+"Toon een margin aan de rechterzijde van het commit bericht venster. Dit kan "
+"worden gebruikt om eenvoudig te zien waar een commit bericht afgebroken moet "
+"worden op een bepaalde kolom."
+
+#: ../data/gitg.schemas.in.h:6
+msgid ""
+"The column at which the right margin is shown if the right-margin preference "
+"is set to TRUE."
+msgstr ""
+"De kolom waar de rechterkantlijn getoond wordt wanneer de right-margin "
+"voorkeur WAAR is."
+
+#: ../data/gitg.schemas.in.h:7
 msgid "When to Collapse Inactive Lanes"
 msgstr "Wannneer inactieve lanen ingevouwd moeten worden"
 
-#: ../data/gitg.schemas.in.h:4
+#: ../data/gitg.schemas.in.h:8
 msgid ""
 "Whether searching filters the revisions in the history view instead of "
 "jumping to the first match."
@@ -58,19 +85,19 @@ msgstr "Open gitg in commit mode"
 msgid "- git repository viewer"
 msgstr "- git repository bekijker"
 
-#: ../gitg/gitg-commit-view.c:204 ../gitg/gitg-revision-tree-view.c:181
+#: ../gitg/gitg-commit-view.c:208 ../gitg/gitg-revision-tree-view.c:181
 msgid "Cannot display file content as text"
 msgstr "Kan bestandsinhoud niet weergeven als tekst"
 
-#: ../gitg/gitg-commit-view.c:1166
+#: ../gitg/gitg-commit-view.c:1431
 msgid "You must first stage some changes before committing"
 msgstr "Je moet eerst wijzigingen plaatsen voordat je commit"
 
-#: ../gitg/gitg-commit-view.c:1174
+#: ../gitg/gitg-commit-view.c:1439
 msgid "Please enter a commit message before committing"
 msgstr "Vul eerst een commit bericht in voordat je commit"
 
-#: ../gitg/gitg-commit-view.c:1185
+#: ../gitg/gitg-commit-view.c:1451
 msgid ""
 "Your user name or email could not be retrieved for use in the sign off "
 "message"
@@ -78,32 +105,32 @@ msgstr ""
 "Je gebruikersnaam of e-mail kon niet worden achterhaald voor gebruik in de "
 "ondertekening"
 
-#: ../gitg/gitg-commit-view.c:1187
+#: ../gitg/gitg-commit-view.c:1453
 msgid "Something went wrong while trying to commit"
 msgstr "Er is iets mis gegaan tijdens het committen"
 
-#: ../gitg/gitg-commit-view.c:1355
+#: ../gitg/gitg-commit-view.c:1612
 msgid "Revert fail"
 msgstr "Terugdraaien faalde"
 
-#: ../gitg/gitg-commit-view.c:1366
+#: ../gitg/gitg-commit-view.c:1623
 msgid "Are you sure you want to revert these changes?"
 msgstr "Weet je zeker dat je deze wijzigingen wilt terugdraaien?"
 
-#: ../gitg/gitg-commit-view.c:1369
+#: ../gitg/gitg-commit-view.c:1626
 msgid "Reverting changes is permanent and cannot be undone"
 msgstr ""
 "Wijzigingen terugdraaien is permanent en kan niet ongedaan gemaakt worden"
 
-#: ../gitg/gitg-repository.c:472
+#: ../gitg/gitg-repository.c:591
 msgid "Staged changes"
 msgstr "Geplaatste wijzigingen"
 
-#: ../gitg/gitg-repository.c:474
+#: ../gitg/gitg-repository.c:593
 msgid "Unstaged changes"
 msgstr "Ongeplaatste wijzigingen"
 
-#: ../gitg/gitg-repository.c:983
+#: ../gitg/gitg-repository.c:1148
 msgid "Not a valid git repository"
 msgstr "Geen geldige git repository"
 
@@ -111,41 +138,61 @@ msgstr "Geen geldige git repository"
 msgid "(Empty)"
 msgstr "(Leeg)"
 
-#: ../gitg/gitg-window.c:346
+#: ../gitg/gitg-window.c:420
 msgid "Select branch"
 msgstr "Selecteer tak"
 
-#: ../gitg/gitg-window.c:532
+#: ../gitg/gitg-window.c:482
+#, c-format
+msgid "Push local branch <%s> to remote branch <%s>"
+msgstr "Publiceer lokale tak <%s> naar afgelegen tak <%s>"
+
+#: ../gitg/gitg-window.c:489
+#, c-format
+msgid "Merge/rebase local branch <%s> with/on local branch <%s>"
+msgstr "Voeg samen/baseer lokale tak <%s> met/op lokale tak <%s>"
+
+#: ../gitg/gitg-window.c:496
+#, c-format
+msgid "Merge/rebase local branch <%s> with/on remote branch <%s>"
+msgstr "Voeg samen/baseer lokale tak <%s> met/op afgelegen tak <%s>"
+
+#: ../gitg/gitg-window.c:503
+#, c-format
+msgid "Apply stash to local branch <%s>"
+msgstr "Pas opslag toe op lokale tak <%s>"
+
+#: ../gitg/gitg-window.c:771
 msgid "Begin loading repository"
 msgstr "Begin laden van repository"
 
-#: ../gitg/gitg-window.c:541
+#: ../gitg/gitg-window.c:780
 #, c-format
 msgid "Loaded %d revisions in %.2fs"
 msgstr "%d revisies ingeladen in %.2fs"
 
-#: ../gitg/gitg-window.c:552
+#: ../gitg/gitg-window.c:791
 #, c-format
 msgid "Loading %d revisions..."
 msgstr "Laden van %d revisies..."
 
-#: ../gitg/gitg-window.c:561
+#: ../gitg/gitg-window.c:800
 msgid "Could not find git repository"
 msgstr "Kon git repository niet vinden"
 
-#: ../gitg/gitg-window.c:697
+#: ../gitg/gitg-window.c:983
 msgid "All branches"
 msgstr "Alle takken"
 
-#: ../gitg/gitg-window.c:860
+#: ../gitg/gitg-window.c:1192
 msgid "Open git repository"
 msgstr "Open git repository"
 
-#: ../gitg/gitg-window.c:982
+#: ../gitg/gitg-window.c:1313
 msgid "gitg is a git repository viewer for gtk+/GNOME"
 msgstr "gitg is een repository bekijker voor gtk+/GNOME"
 
-#: ../gitg/gitg-window.c:983
+#: ../gitg/gitg-window.c:1314
 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"
@@ -180,186 +227,606 @@ msgstr ""
 "de Free Software Foundation, Inc.,\n"
 "59 Temple Place, Suite 330, Boston, MA 02111-1307 USA"
 
-#: ../gitg/gitg-ui.xml.h:1
+#: ../gitg/gitg-window.c:1775 ../gitg/gitg-window.c:1809
+#, c-format
+msgid "New local branch <%s>"
+msgstr "Nieuwe lokale tak <%s>"
+
+#: ../gitg/gitg-window.c:1787 ../gitg/gitg-branch-actions.c:316
+msgid "Remove remote branch"
+msgstr "Verwijder afgelegen tak"
+
+#: ../gitg/gitg-window.c:1791
+msgid "Checkout working copy"
+msgstr "Werkkopie uitchecken"
+
+#: ../gitg/gitg-window.c:1792
+msgid "Remove local branch"
+msgstr "Verwijder lokale tak"
+
+#: ../gitg/gitg-window.c:1800 ../gitg/gitg-branch-actions.c:391
+msgid "Remove stash"
+msgstr "Verwijder tijdelijke opslag"
+
+#: ../gitg/gitg-window.c:1805 ../gitg/gitg-branch-actions.c:456
+#: ../gitg/gitg-branch-actions.c:458
+msgid "Remove tag"
+msgstr "Verwijder tag"
+
+#: ../gitg/gitg-window.c:1984
+msgid "Not all fields are correctly filled in"
+msgstr "Niet alle velden zijn correct ingevuld"
+
+#: ../gitg/gitg-window.c:1986
+msgid "Please make sure to fill in both the tag name and the commit message"
+msgstr "Zorg ervoor dat zowel de tag naam als het commit bericht ingevuld zijn"
+
+#: ../gitg/gitg-branch-actions.c:249
+#, c-format
+msgid "Branch <%s> could not be removed"
+msgstr "Tak <%s> kon niet worden verwijderd"
+
+#: ../gitg/gitg-branch-actions.c:250
+msgid ""
+"This usually means that the branch is not fully merged in HEAD. Do you want "
+"to forcefully remove the branch?"
+msgstr ""
+"This betekent doorgaans dat de take niet volledig samengevoegd is in HEAD. "
+"Wil je het verwijderen van de tak forceren?"
+
+#: ../gitg/gitg-branch-actions.c:251
+msgid "Force remove"
+msgstr "Forceerd verwijderen"
+
+#: ../gitg/gitg-branch-actions.c:260
+#, c-format
+msgid "Branch <%s> could not be forcefully removed"
+msgstr "Tak <%s> kon niet geforceerd worden verwijderd"
+
+#: ../gitg/gitg-branch-actions.c:293
+#, c-format
+msgid "Failed to remove remote branch <%s>."
+msgstr "Afgelegen tak <%s> kon niet worden verwijderd."
+
+#: ../gitg/gitg-branch-actions.c:314
+#, c-format
+msgid "Are you sure you want to remove the remote branch <%s>?"
+msgstr "Weet je zeker dat je de afgelegen tak <%s> wilt verwijderen?"
+
+#: ../gitg/gitg-branch-actions.c:315
+msgid "This permanently removes the remote branch."
+msgstr "De afgelegen tak wordt permanent verwijderd."
+
+#: ../gitg/gitg-branch-actions.c:332 ../gitg/gitg-menus.xml.h:9
+msgid "Remove branch"
+msgstr "Verwijder tak"
+
+#: ../gitg/gitg-branch-actions.c:389
+msgid "Are you sure you want to remove this stash item?"
+msgstr "Weet je zeker dat je deze tijdelijke opslag wilt verwijderen?"
+
+#: ../gitg/gitg-branch-actions.c:390
+msgid "This permanently removes the stash item"
+msgstr "De tijdelijke opslag wordt permanent verwijderd"
+
+#: ../gitg/gitg-branch-actions.c:417
+msgid "Failed to remove stash"
+msgstr "Kon tijdelijke opslag niet verwijderen"
+
+#: ../gitg/gitg-branch-actions.c:418
+msgid "The stash item could not be successfully removed"
+msgstr "De tijdelijke opslag kon niet succesvol worden verwijderd"
+
+#: ../gitg/gitg-branch-actions.c:452
+#, c-format
+msgid "Are you sure you want to remove the tag <%s>?"
+msgstr "Weet je zeker dat je de tag <%s> wilt verwijderen?"
+
+#: ../gitg/gitg-branch-actions.c:475
+#, c-format
+msgid "The tag <%s> could not be successfully removed"
+msgstr "De tag <%s> kon niet succesvol worden verwijderd"
+
+#: ../gitg/gitg-branch-actions.c:479
+msgid "Failed to remove tag"
+msgstr "Tag kon niet worden verwijderd"
+
+#: ../gitg/gitg-branch-actions.c:579
+msgid "Do you want to temporarily stash these changes?"
+msgstr "Wil je de wijzigingen tijdelijk opslaan?"
+
+#: ../gitg/gitg-branch-actions.c:583
+msgid "Do you want to stash and reapply these changes?"
+msgstr "Wil je de wijzigingen tijdelijk opslaan en opnieuw toepassen?"
+
+#: ../gitg/gitg-branch-actions.c:588
+msgid "You have uncommited changes in your current working tree"
+msgstr "Je hebt wijzigingen in de werkkopie die nog niet gecommit zijn"
+
+#: ../gitg/gitg-branch-actions.c:590
+msgid "Stash changes"
+msgstr "Tijdelijk opslaan"
+
+#: ../gitg/gitg-branch-actions.c:766
+msgid "Failed to save current index state"
+msgstr "Index kon niet worden opgeslagen"
+
+#: ../gitg/gitg-branch-actions.c:820 ../gitg/gitg-branch-actions.c:1102
+#: ../gitg/gitg-branch-actions.c:1397
+#, c-format
+msgid "Failed to checkout local branch <%s>"
+msgstr "Lokale tak <%s> kon niet worden uitgechecked"
+
+#: ../gitg/gitg-branch-actions.c:858
+#, c-format
+msgid "Failed to checkout remote branch <%s> to local branch <%s>"
+msgstr "Afgelegen tak <%s> kon niet worden uitgechecked naar lokale tak <%s>"
+
+#: ../gitg/gitg-branch-actions.c:898
+#, c-format
+msgid "Failed to checkout tag <%s> to local branch <%s>"
+msgstr "Tag <%s> kon niet worden uitgechecked naar lokale tak <%s>"
+
+#: ../gitg/gitg-branch-actions.c:989
+#, c-format
+msgid "Failed to rebase %s branch <%s> onto %s branch <%s>"
+msgstr "Kon %s tak <%s> niet opnieuw baseren op %s tak <%s>"
+
+#: ../gitg/gitg-branch-actions.c:993
+#, c-format
+msgid "Failed to merge %s branch <%s> with %s branch <%s>"
+msgstr "Kon %s tak <%s> niet samenvoegen met %s tak <%s>"
+
+#: ../gitg/gitg-branch-actions.c:1001 ../gitg/gitg-branch-actions.c:1003
+#: ../gitg/gitg-branch-actions.c:1069 ../gitg/gitg-branch-actions.c:1071
+#: ../gitg/gitg-branch-actions.c:1110 ../gitg/gitg-branch-actions.c:1112
+#: ../gitg/gitg-branch-actions.c:1146 ../gitg/gitg-branch-actions.c:1148
+#: ../gitg/gitg-branch-actions.c:1193 ../gitg/gitg-branch-actions.c:1195
+msgid "local"
+msgstr "lokale"
+
+#: ../gitg/gitg-branch-actions.c:1001 ../gitg/gitg-branch-actions.c:1003
+#: ../gitg/gitg-branch-actions.c:1069 ../gitg/gitg-branch-actions.c:1071
+#: ../gitg/gitg-branch-actions.c:1110 ../gitg/gitg-branch-actions.c:1112
+#: ../gitg/gitg-branch-actions.c:1146 ../gitg/gitg-branch-actions.c:1148
+#: ../gitg/gitg-branch-actions.c:1193 ../gitg/gitg-branch-actions.c:1195
+msgid "remote"
+msgstr "afgelegen"
+
+#: ../gitg/gitg-branch-actions.c:1020
+msgid "The stashed changes have been stored to be reapplied manually"
+msgstr ""
+"De wijzigingen zijn tijdelijk opgeslagen en kunnen handmatig worden toegepast"
+
+#: ../gitg/gitg-branch-actions.c:1025
+msgid "Failed to checkout previously checked out branch"
+msgstr "Kon vorige uitgecheckte tak niet opnieuw uitchecken"
+
+#: ../gitg/gitg-branch-actions.c:1046
+msgid "Failed to reapply stash correctly"
+msgstr "Kon tijdelijke opgeslagen wijzigingen niet toepassen"
+
+#: ../gitg/gitg-branch-actions.c:1047
+msgid ""
+"There might be unresolved conflicts in the working tree or index which you "
+"need to resolve manually"
+msgstr ""
+"Het kan zijn dat er onopgeloste conflicten in de werkkopie zijn die "
+"handmatig moeten worden opgelost"
+
+#: ../gitg/gitg-branch-actions.c:1068
+#, c-format
+msgid "Are you sure you want to merge %s branch <%s> onto %s branch <%s>?"
+msgstr "Weet je zeker dat je %s tak <%s> wilt samenvoegen met %s tak <%s>?"
+
+#: ../gitg/gitg-branch-actions.c:1076 ../gitg/gitg-branch-actions.c:1078
+#: ../gitg/gitg-branch-actions.c:1122 ../gitg/gitg-menus.xml.h:4
+msgid "Merge"
+msgstr "Samenvoegen"
+
+#: ../gitg/gitg-branch-actions.c:1103
+msgid "The branch on which to merge could not be checked out"
+msgstr "De tak waarop gemerged moet worden kon niet worden uitgechecked"
+
+#: ../gitg/gitg-branch-actions.c:1109
+#, c-format
+msgid "Merging %s branch <%s> onto %s branch <%s>"
+msgstr "Samenvoegen van %s tak <%s> op %s tak <%s>"
+
+#: ../gitg/gitg-branch-actions.c:1145
+#, c-format
+msgid "Are you sure you want to rebase %s branch <%s> onto %s branch <%s>?"
+msgstr "Weet je zeker dat je %s tak <%s> opnieuw wilt baseren op %s tak <%s>?"
+
+#: ../gitg/gitg-branch-actions.c:1153 ../gitg/gitg-branch-actions.c:1155
+#: ../gitg/gitg-branch-actions.c:1205 ../gitg/gitg-menus.xml.h:7
+msgid "Rebase"
+msgstr "Opnieuw baseren"
+
+#: ../gitg/gitg-branch-actions.c:1178
+msgid "Unable to rebase"
+msgstr "Kon niet opnieuw baseren"
+
+#: ../gitg/gitg-branch-actions.c:1179
+msgid ""
+"There are still uncommitted changes in your working tree and you are trying "
+"to rebase a branch onto the currently checked out branch. Either remove, "
+"stash or commit your changes first and try again"
+msgstr ""
+"Er zijn nog wijzigingen in je huidige werkkopie die niet gecommit zjin en je "
+"probeert een tak opnieuw te baseren op de huidige werkkopie. Verwijder, "
+"commit of sla de wijzigingen tijdelijk op en probeer opnieuw"
+
+#: ../gitg/gitg-branch-actions.c:1192
+#, c-format
+msgid "Rebasing %s branch <%s> onto %s branch <%s>"
+msgstr "Opnieuw baseren van %s tak <%s> op %s tak <%s>"
+
+#: ../gitg/gitg-branch-actions.c:1231
+#, c-format
+msgid "Failed to push local branch <%s> to remote <%s>"
+msgstr "Kon lokale tak <%s> niet publiceren op afgelegen plek <%s>"
+
+#: ../gitg/gitg-branch-actions.c:1232
+msgid ""
+"This usually means that the remote branch could not be fast-forwarded. Try "
+"fetching the latest changes."
+msgstr ""
+"Dit betekent doorgans dat de afgelegen tak niet snel doorgespoeld kon "
+"worden. Probeer om eerst de laatste wijzigingen op te halen."
+
+#: ../gitg/gitg-branch-actions.c:1256
+#, c-format
+msgid "Are you sure you want to push <%s> to <%s>?"
+msgstr "Weet je zeker dat je <%s> wilt publiceren op <%s>?"
+
+#: ../gitg/gitg-branch-actions.c:1262 ../gitg/gitg-branch-actions.c:1264
+#: ../gitg/gitg-branch-actions.c:1285 ../gitg/gitg-branch-actions.c:1317
+#: ../gitg/gitg-branch-actions.c:1319 ../gitg/gitg-branch-actions.c:1346
+msgid "Push"
+msgstr "Publiceren"
+
+#: ../gitg/gitg-branch-actions.c:1277 ../gitg/gitg-branch-actions.c:1331
+#, c-format
+msgid "Pushing local branch <%s> to remote branch <%s>"
+msgstr "Publiceer lokale tak <%s> naar afgelegen tak <%s>"
+
+#: ../gitg/gitg-branch-actions.c:1311
+#, c-format
+msgid "Are you sure you want to push <%s> to remote <%s>?"
+msgstr "Weet je zeker dat <%s> wilt publiceren op afgelegen plek <%s>?"
+
+#: ../gitg/gitg-branch-actions.c:1370
+#, c-format
+msgid "Are you sure you want to apply the stash item to local branch <%s>?"
+msgstr ""
+"Weet je zeker dat je de tijdelijke opslag wilt toepassen op lokale tak <%s>?"
+
+#: ../gitg/gitg-branch-actions.c:1375 ../gitg/gitg-branch-actions.c:1377
+msgid "Apply stash"
+msgstr "Toepassen"
+
+#: ../gitg/gitg-branch-actions.c:1416
+#, c-format
+msgid "The stash could not be applied to local branch <%s>"
+msgstr "De tijdelijke opslag kon niet worden toegepast op lokale tak <%s>"
+
+#: ../gitg/gitg-branch-actions.c:1420
+msgid "Failed to apply stash"
+msgstr "Toepassen tijdelijke opgeslag gefaald"
+
+#: ../gitg/gitg-branch-actions.c:1466
+msgid ""
+"The tag object could not be successfully created. Please make sure you have "
+"a GPG key and the key is unlocked"
+msgstr ""
+"Het tag object kon niet worden aangemaakt. Zorg ervoor dat je een GPG "
+"sleutel hebt en dat deze vrijgemaakt is"
+
+#: ../gitg/gitg-branch-actions.c:1470
+msgid "The tag object could not be successfully created"
+msgstr "Het tag object kon niet succesvol worden aangemaakt"
+
+#: ../gitg/gitg-branch-actions.c:1475
+msgid "Failed to create tag"
+msgstr "Tag kon niet worden aangemaakt"
+
+#: ../gitg/gitg-repository-dialog.c:173 ../gitg/gitg-repository.ui.h:4
+msgid "Fetch"
+msgstr "Ophalen"
+
+#: ../gitg/gitg-repository-dialog.c:178
+msgid "Cancel"
+msgstr "Annuleren"
+
+#: ../gitg/gitg-repository-dialog.c:441 ../gitg/gitg-repository.ui.h:7
+#: ../gitg/gitg-tag.ui.h:5
+msgid "Properties"
+msgstr "Eigenschappen"
+
+#: ../gitg/gitg-window.ui.h:1
 msgid "Add signed-off-by"
 msgstr "Voeg ondertekening toe"
 
-#: ../gitg/gitg-ui.xml.h:2
-msgid "Author"
-msgstr "Auteur"
+#: ../gitg/gitg-window.ui.h:2
+msgid "Amend"
+msgstr "Aanmetselen"
 
-#: ../gitg/gitg-ui.xml.h:3
+#: ../gitg/gitg-window.ui.h:3
 msgid "Author:"
 msgstr "Auteur:"
 
-#: ../gitg/gitg-ui.xml.h:4
+#: ../gitg/gitg-window.ui.h:4
 msgid "Branch:"
 msgstr "Tak:"
 
-#: ../gitg/gitg-ui.xml.h:5
+#: ../gitg/gitg-window.ui.h:5
 msgid "Co_mmit message"
 msgstr "Co_mmit bericht"
 
-#: ../gitg/gitg-ui.xml.h:6
+#: ../gitg/gitg-window.ui.h:6 ../gitg/gitg-preferences.ui.h:5
 msgid "Commit"
 msgstr "Commit"
 
-#: ../gitg/gitg-ui.xml.h:7
+#: ../gitg/gitg-window.ui.h:7
 msgid "Context:"
 msgstr "Context:"
 
-#: ../gitg/gitg-ui.xml.h:8
-msgid "Date"
-msgstr "Datum"
-
-#: ../gitg/gitg-ui.xml.h:9
+#: ../gitg/gitg-window.ui.h:8
 msgid "Date:"
 msgstr "Datum:"
 
-#: ../gitg/gitg-ui.xml.h:10
+#: ../gitg/gitg-window.ui.h:9
 msgid "Details"
-msgstr "Defails"
-
-#: ../gitg/gitg-ui.xml.h:11
-msgid "Filename"
-msgstr "Bestandsnaam"
+msgstr "Details"
 
-#: ../gitg/gitg-ui.xml.h:12
+#: ../gitg/gitg-window.ui.h:10
 msgid "History"
 msgstr "Geschiedenis"
 
-#: ../gitg/gitg-ui.xml.h:13
-msgid "Ignore"
-msgstr "Negeren"
-
-#: ../gitg/gitg-ui.xml.h:14
+#: ../gitg/gitg-window.ui.h:11
 msgid "Parent:"
 msgstr "Ouder:"
 
-#: ../gitg/gitg-ui.xml.h:15
-msgid "R_ecently Opened"
-msgstr "R_ecentelijk geopend"
-
-#: ../gitg/gitg-ui.xml.h:16
-msgid "Revert"
-msgstr "Terugdraaien"
-
-#: ../gitg/gitg-ui.xml.h:17
+#: ../gitg/gitg-window.ui.h:12
 msgid "SHA:"
 msgstr "SHA:"
 
-#: ../gitg/gitg-ui.xml.h:18
-msgid "Stage"
-msgstr "Plaatsen"
-
-#: ../gitg/gitg-ui.xml.h:19
-msgid "Subject"
-msgstr "Onderwerp"
-
-#: ../gitg/gitg-ui.xml.h:20
+#: ../gitg/gitg-window.ui.h:13
 msgid "Subject:"
 msgstr "Onderwerp:"
 
-#: ../gitg/gitg-ui.xml.h:21
+#: ../gitg/gitg-window.ui.h:14
 msgid "Tree"
 msgstr "Boom"
 
-#: ../gitg/gitg-ui.xml.h:22
-msgid "Unstage"
-msgstr "Ontplaatsen"
-
-#: ../gitg/gitg-ui.xml.h:23
-msgid "Unstaged"
-msgstr "Ontplaatst"
-
-#: ../gitg/gitg-ui.xml.h:24
+#: ../gitg/gitg-window.ui.h:15
 msgid "_Changes"
 msgstr "_Wijzigingen"
 
-#: ../gitg/gitg-ui.xml.h:25
-msgid "_Edit"
-msgstr "Be_werken"
-
-#: ../gitg/gitg-ui.xml.h:26
-msgid "_File"
-msgstr "_Bestand"
-
-#: ../gitg/gitg-ui.xml.h:27
-msgid "_Help"
-msgstr "_Hulp"
-
-#: ../gitg/gitg-ui.xml.h:28
-msgid "_Open..."
-msgstr "_Open..."
-
-#: ../gitg/gitg-ui.xml.h:29
+#: ../gitg/gitg-window.ui.h:16
 msgid "_Staged"
 msgstr "_Geplaatst"
 
-#: ../gitg/gitg-ui.xml.h:30
+#: ../gitg/gitg-window.ui.h:17
 msgid "_Unstaged"
 msgstr "_Ongeplaatst"
 
-#: ../gitg/gitg-ui.xml.h:31
-msgid "_View"
-msgstr "Beel_d"
+#: ../gitg/gitg-commit-menu.ui.h:1 ../gitg/gitg-ui.xml.h:1
+msgid "Ignore"
+msgstr "Negeren"
 
-#: ../gitg/gitg-menus.xml.h:1
-msgid "_Author"
-msgstr "_Auteur"
+#: ../gitg/gitg-commit-menu.ui.h:2 ../gitg/gitg-ui.xml.h:3
+msgid "Revert"
+msgstr "Terugdraaien"
 
-#: ../gitg/gitg-menus.xml.h:2
-msgid "_Date"
-msgstr "_Datum"
+#: ../gitg/gitg-commit-menu.ui.h:3 ../gitg/gitg-ui.xml.h:4
+msgid "Stage"
+msgstr "Plaatsen"
 
-#: ../gitg/gitg-menus.xml.h:3
-msgid "_Hash"
-msgstr "_Hash"
+#: ../gitg/gitg-commit-menu.ui.h:4 ../gitg/gitg-ui.xml.h:5
+msgid "Unstage"
+msgstr "Ontplaatsen"
 
-#: ../gitg/gitg-menus.xml.h:4
-msgid "_Subject"
-msgstr "_Onderwerp"
+#: ../gitg/gitg-preferences.ui.h:1
+msgid "<b>Commit Message</b>"
+msgstr "<b>Commit bericht</b>"
 
-#: ../gitg/gitg-preferences.xml.h:1
+#: ../gitg/gitg-preferences.ui.h:2
 msgid "<b>History</b>"
 msgstr "<b>Geschiedenis</b>"
 
-#: ../gitg/gitg-preferences.xml.h:2
+#: ../gitg/gitg-preferences.ui.h:3 ../gitg/gitg-repository.ui.h:1
+msgid "<b>User</b>"
+msgstr "<b>Gebruiker</b>"
+
+#: ../gitg/gitg-preferences.ui.h:4
 msgid "Collapse inactive lanes"
 msgstr "Vouw inactive banen in"
 
-#: ../gitg/gitg-preferences.xml.h:3
+#: ../gitg/gitg-preferences.ui.h:6 ../gitg/gitg-repository.ui.h:2
+msgid "Configuration"
+msgstr "Configuratie"
+
+#: ../gitg/gitg-preferences.ui.h:7
+msgid ""
+"Configure global git settings. This corresponds to the settings as stored in "
+"~/.gitconfig. Repository specific settings can be configured at the "
+"repository properties."
+msgstr ""
+"Configureer globale git instellingen. Deze instellingen komen overeen met de "
+"instellingen in ~/.gitconfig. Instellingen specifiek voor de repository "
+"kunnen worden ingesteld bij de repository eigenschappen."
+
+#: ../gitg/gitg-preferences.ui.h:8
+msgid "Display right _margin"
+msgstr "Toon rechterkantlijn"
+
+#: ../gitg/gitg-preferences.ui.h:9 ../gitg/gitg-repository.ui.h:3
+msgid "E-mail:"
+msgstr "E-mail:"
+
+#: ../gitg/gitg-preferences.ui.h:10
 msgid "Early"
 msgstr "Vroeg"
 
-#: ../gitg/gitg-preferences.xml.h:4
+#: ../gitg/gitg-preferences.ui.h:11
 msgid "Late"
 msgstr "Laat"
 
-#: ../gitg/gitg-preferences.xml.h:5
+#: ../gitg/gitg-preferences.ui.h:12 ../gitg/gitg-repository.ui.h:6
+#: ../gitg/gitg-tag.ui.h:4
+msgid "Name:"
+msgstr "Naam:"
+
+#: ../gitg/gitg-preferences.ui.h:13
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: ../gitg/gitg-preferences.xml.h:6
+#: ../gitg/gitg-preferences.ui.h:14
+msgid "Preferences that apply to the commit view"
+msgstr "Voorkeuren die gaan over het commit venster"
+
+#: ../gitg/gitg-preferences.ui.h:15
+msgid "Preferences that apply to the revision view"
+msgstr "Voorkeuren die gaan over het revisie venster"
+
+#: ../gitg/gitg-preferences.ui.h:16
 msgid "Search filters revisions in the history view"
 msgstr "Zoeken filtert revisies in de geschiedenis"
 
-#: ../gitg/gitg-preferences.xml.h:7
+#: ../gitg/gitg-preferences.ui.h:17
 msgid "Show staged changes in history"
 msgstr "Geplaatste wijzigingen tonen in geschiedenis"
 
-#: ../gitg/gitg-preferences.xml.h:8
+#: ../gitg/gitg-preferences.ui.h:18
 msgid "Show stash in history"
 msgstr "Opgeslagen wijzigingen tonen in geschiedenis"
 
-#: ../gitg/gitg-preferences.xml.h:9
+#: ../gitg/gitg-preferences.ui.h:19
 msgid "Show unstaged changes in history"
 msgstr "Ongeplaatste wijzigingen tonen in geschiedenis"
 
-#: ../gitg/gitg-preferences.xml.h:10
+#: ../gitg/gitg-preferences.ui.h:20
 msgid "View"
 msgstr "Beeld"
 
+#: ../gitg/gitg-preferences.ui.h:21
+msgid "_Right margin at column:"
+msgstr "Rechterkantlijn in kolom:"
+
+#: ../gitg/gitg-repository.ui.h:5
+msgid "Name"
+msgstr "Naam"
+
+#: ../gitg/gitg-repository.ui.h:8
+msgid "Remotes"
+msgstr "Afgelegen plekken"
+
+#: ../gitg/gitg-repository.ui.h:9
+msgid "URL"
+msgstr "URL"
+
+#: ../gitg/gitg-repository.ui.h:10
+msgid "gtk-add"
+msgstr "gtk-add"
+
+#: ../gitg/gitg-repository.ui.h:11
+msgid "gtk-remove"
+msgstr "gtk-remove"
+
+#: ../gitg/gitg-tag.ui.h:1
+msgid "Create signed tag object"
+msgstr "Maak gesigneerd tag object"
+
+#: ../gitg/gitg-tag.ui.h:2 ../gitg/gitg-menus.xml.h:3
+msgid "Create tag"
+msgstr "Maak tag"
+
+#: ../gitg/gitg-tag.ui.h:3
+msgid "Message:"
+msgstr "Bericht:"
+
+#: ../gitg/gitg-menus.xml.h:1
+msgid "Apply stash to..."
+msgstr "Pas tijdelijke opslag toe op..."
+
+#: ../gitg/gitg-menus.xml.h:2
+msgid "Checkout branch"
+msgstr "Tak uitchecken"
+
+#: ../gitg/gitg-menus.xml.h:5
+msgid "Merge branch with..."
+msgstr "Tak samenvoegen met..."
+
+#: ../gitg/gitg-menus.xml.h:6
+msgid "Push branch to..."
+msgstr "Tak publiceren op..."
+
+#: ../gitg/gitg-menus.xml.h:8
+msgid "Rebase branch onto..."
+msgstr "Tak opnieuw baseren op..."
+
+#: ../gitg/gitg-menus.xml.h:10
+msgid "_Author"
+msgstr "_Auteur"
+
+#: ../gitg/gitg-menus.xml.h:11
+msgid "_Date"
+msgstr "_Datum"
+
+#: ../gitg/gitg-menus.xml.h:12
+msgid "_Hash"
+msgstr "_Hash"
+
+#: ../gitg/gitg-menus.xml.h:13
+msgid "_Subject"
+msgstr "_Onderwerp"
+
+#: ../gitg/gitg-ui.xml.h:2
+msgid "R_ecently Opened"
+msgstr "R_ecentelijk geopend"
+
+#: ../gitg/gitg-ui.xml.h:6
+msgid "_Edit"
+msgstr "Be_werken"
+
+#: ../gitg/gitg-ui.xml.h:7
+msgid "_File"
+msgstr "_Bestand"
+
+#: ../gitg/gitg-ui.xml.h:8
+msgid "_Help"
+msgstr "_Hulp"
+
+#: ../gitg/gitg-ui.xml.h:9
+msgid "_Open..."
+msgstr "_Open..."
+
+#: ../gitg/gitg-ui.xml.h:10
+#, fuzzy
+msgid "_Repository"
+msgstr "Open git repository"
+
+#: ../gitg/gitg-ui.xml.h:11
+msgid "_View"
+msgstr "Beel_d"
+
+#~ msgid "Author"
+#~ msgstr "Auteur"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+#~ msgid "Filename"
+#~ msgstr "Bestandsnaam"
+
+#~ msgid "Subject"
+#~ msgstr "Onderwerp"
+
+#~ msgid "Unstaged"
+#~ msgstr "Ontplaatst"
+
 #~ msgid "Co_mment"
 #~ msgstr "Co_mmentaar"
 
diff --git a/po/pa.po b/po/pa.po
index 65f40b5..3940a9c 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -6,9 +6,8 @@
 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: 2009-06-11 07:26+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-07-05 21:28+0200\n"
 "PO-Revision-Date: 2009-06-20 06:39+0530\n"
 "Last-Translator: A S Alam <aalam users sf net>\n"
 "Language-Team: Punjabi/Panjabi <punjab-l10n list sf net>\n"
@@ -23,26 +22,48 @@ msgid "Git repository browser"
 msgstr ""
 
 #. Translators: this is the application name as in g_set_application_name
-#: ../data/gitg.desktop.in.in.h:2 ../gitg/gitg.c:169 ../gitg/gitg-window.c:788
-#: ../gitg/gitg-window.c:806 ../gitg/gitg-ui.xml.h:32
+#: ../data/gitg.desktop.in.in.h:2 ../gitg/gitg.c:169
+#: ../gitg/gitg-window.c:1005 ../gitg/gitg-window.c:1018
+#: ../gitg/gitg-branch-actions.c:146 ../gitg/gitg-branch-actions.c:199
+#: ../gitg/gitg-window.ui.h:18
 msgid "gitg"
 msgstr "gitg"
 
 #: ../data/gitg.schemas.in.h:1
+msgid "Column at Which Right Margin is Shown"
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:2
 msgid "Filter Revisions When Searching"
 msgstr "à¨?à¨¦à©?à¨? à¨?à©?à¨? à¨¹à©?à¨µà©? à¨¤à¨¾à¨? à¨°à©?à¨µà¨¿à¨?à¨¼à¨¨ à¨«à¨¿à¨²à¨?à¨° à¨?à¨°à©?"
 
-#: ../data/gitg.schemas.in.h:2
+#: ../data/gitg.schemas.in.h:3
 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 ""
 
-#: ../data/gitg.schemas.in.h:3
+#: ../data/gitg.schemas.in.h:4
+msgid "Show Right Margin in Commit Message View"
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:5
+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."
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:6
+msgid ""
+"The column at which the right margin is shown if the right-margin preference "
+"is set to TRUE."
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:7
 msgid "When to Collapse Inactive Lanes"
 msgstr "à¨?à¨¼à©?à¨°-à¨¸à¨°à¨?à¨°à¨® à¨²à©?à¨¨ à¨¸à¨®à©?à¨?à¨£à©?à¨?à¨? à¨?à¨¦à©?à¨? à¨¹à¨¨"
 
-#: ../data/gitg.schemas.in.h:4
+#: ../data/gitg.schemas.in.h:8
 msgid ""
 "Whether searching filters the revisions in the history view instead of "
 "jumping to the first match."
@@ -56,49 +77,49 @@ msgstr "gitg à¨¨à©?à©° à¨?à¨®à¨¿à¨? à¨®à©?à¨¡ à¨¨à¨¾à¨² à¨¸à¨¼à©?à¨°à©? à¨?à¨°
 msgid "- git repository viewer"
 msgstr "- git à¨°à¨¿à¨ªà©?à¨?à¨¼à¨?à¨°à©? à¨¦à¨°à¨¸à¨¼à¨?"
 
-#: ../gitg/gitg-commit-view.c:204 ../gitg/gitg-revision-tree-view.c:181
+#: ../gitg/gitg-commit-view.c:208 ../gitg/gitg-revision-tree-view.c:181
 msgid "Cannot display file content as text"
 msgstr "à¨«à¨¾à¨?à¨² à¨?à©°à¨?à©?à¨?à¨¸à¨? à¨?à©?à¨?à¨¸à¨? à¨µà¨¾à¨?à¨? à¨¨à¨¹à©?à¨? à¨µà©?à¨?à¨¾à¨? à¨?à¨¾ à¨¸à¨?à¨¦à©?"
 
-#: ../gitg/gitg-commit-view.c:1410
+#: ../gitg/gitg-commit-view.c:1431
 msgid "You must first stage some changes before committing"
 msgstr ""
 
-#: ../gitg/gitg-commit-view.c:1418
+#: ../gitg/gitg-commit-view.c:1439
 msgid "Please enter a commit message before committing"
 msgstr "à¨?à¨®à¨¿à¨? à¨?à¨°à¨¨ à¨¤à©?à¨? à¨ªà¨¹à¨¿à¨²à¨¾à¨? à¨?à¨®à¨¿à¨? à¨¸à©?à¨¨à©?à¨¹à¨¾ à¨¦à¨¿à¨? à¨?à©?"
 
-#: ../gitg/gitg-commit-view.c:1429
+#: ../gitg/gitg-commit-view.c:1451
 msgid ""
 "Your user name or email could not be retrieved for use in the sign off "
 "message"
 msgstr ""
 
-#: ../gitg/gitg-commit-view.c:1431
+#: ../gitg/gitg-commit-view.c:1453
 msgid "Something went wrong while trying to commit"
 msgstr "à¨?à¨®à¨¿à¨? à¨?à¨°à¨¨ à¨¦à©? à¨?à©?à¨¸à¨¼à¨¿à¨¸à¨¼ à¨¦à©? à¨¦à©?à¨°à¨¾à¨¨ à¨?à©?à¨? à¨?à¨²à¨¤ à¨¹à©? à¨?à¨¿à¨?"
 
-#: ../gitg/gitg-commit-view.c:1588
+#: ../gitg/gitg-commit-view.c:1612
 msgid "Revert fail"
 msgstr "à¨°à©?à¨µà¨°à¨? à¨«à©?à¨²à©?à¨¹"
 
-#: ../gitg/gitg-commit-view.c:1599
+#: ../gitg/gitg-commit-view.c:1623
 msgid "Are you sure you want to revert these changes?"
 msgstr "à¨?à©? à¨¤à©?à¨¸à©?à¨? à¨?à¨¹ à¨¬à¨¦à¨²à¨¾à¨? à¨µà¨¾à¨ªà¨¸ à¨²à©?à¨£à©? à¨?à¨¾à¨¹à©?à©°à¨¦à©? à¨¹à©??"
 
-#: ../gitg/gitg-commit-view.c:1602
+#: ../gitg/gitg-commit-view.c:1626
 msgid "Reverting changes is permanent and cannot be undone"
 msgstr "à¨¬à¨¦à¨²à¨¾à¨? à¨°à©?à¨µà¨°à¨? à¨?à¨°à¨¨ à¨ªà©±à¨?à©? à¨¹à¨¨ à¨?à¨¤à©? à¨µà¨¾à¨ªà¨¸ à¨¨à¨¹à©?à¨? à¨?à©?à¨¤à©? à¨?à¨¾ à¨¸à¨?à¨¦à©?"
 
-#: ../gitg/gitg-repository.c:472
+#: ../gitg/gitg-repository.c:591
 msgid "Staged changes"
 msgstr "à¨¸à¨?à©?à¨? à¨?à©?à¨¤à©? à¨¬à¨¦à¨²à¨¾à¨?"
 
-#: ../gitg/gitg-repository.c:474
+#: ../gitg/gitg-repository.c:593
 msgid "Unstaged changes"
 msgstr "à¨¬à¨¿à¨¨-à¨¸à¨?à©?à¨? à¨?à©?à¨¤à©? à¨¬à¨¦à¨²à¨¾à¨?"
 
-#: ../gitg/gitg-repository.c:981
+#: ../gitg/gitg-repository.c:1148
 msgid "Not a valid git repository"
 msgstr "à¨?à©?à¨? à¨¢à©?à©±à¨?à¨µà©?à¨? git à¨°à¨¿à¨ªà©?à¨?à¨¼à¨?à¨°à©? à¨¨à¨¹à©?à¨?"
 
@@ -106,41 +127,61 @@ msgstr "à¨?à©?à¨? à¨¢à©?à©±à¨?à¨µà©?à¨? git à¨°à¨¿à¨ªà©?à¨?à¨¼à¨?à¨°à©? à¨¨à¨¹
 msgid "(Empty)"
 msgstr "(à¨?à¨¾à¨²à©?)"
 
-#: ../gitg/gitg-window.c:347
+#: ../gitg/gitg-window.c:420
 msgid "Select branch"
 msgstr "à¨¬à¨°à¨¾à¨?à¨? à¨?à©?à¨£à©?"
 
-#: ../gitg/gitg-window.c:533
+#: ../gitg/gitg-window.c:482
+#, c-format
+msgid "Push local branch <%s> to remote branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-window.c:489
+#, c-format
+msgid "Merge/rebase local branch <%s> with/on local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-window.c:496
+#, c-format
+msgid "Merge/rebase local branch <%s> with/on remote branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-window.c:503
+#, c-format
+msgid "Apply stash to local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-window.c:771
 msgid "Begin loading repository"
 msgstr "à¨°à¨¿à¨ªà©?à¨?à¨¼à¨?à¨°à©? à¨²à©?à¨¡ à¨?à¨°à¨¨à©? à¨¸à¨¼à©?à¨°à©?"
 
-#: ../gitg/gitg-window.c:542
+#: ../gitg/gitg-window.c:780
 #, c-format
 msgid "Loaded %d revisions in %.2fs"
 msgstr ""
 
-#: ../gitg/gitg-window.c:553
+#: ../gitg/gitg-window.c:791
 #, c-format
 msgid "Loading %d revisions..."
 msgstr "%d à¨°à©?à¨µà¨¿à¨?à¨¼à¨¨ à¨²à©?à¨¡ à¨?à©?à¨¤à©? à¨?à¨¾ à¨°à¨¹à©? à¨¹à¨¨..."
 
-#: ../gitg/gitg-window.c:562
+#: ../gitg/gitg-window.c:800
 msgid "Could not find git repository"
 msgstr "git à¨°à¨¿à¨ªà©?à¨?à¨¼à¨?à¨°à©? à¨²à©±à¨à©? à¨¨à¨¹à©?à¨? à¨?à¨¾ à¨¸à¨?à©?"
 
-#: ../gitg/gitg-window.c:698
+#: ../gitg/gitg-window.c:983
 msgid "All branches"
 msgstr "à¨¸à¨ à¨¬à¨°à¨¾à¨?à¨?"
 
-#: ../gitg/gitg-window.c:863
+#: ../gitg/gitg-window.c:1192
 msgid "Open git repository"
 msgstr "git à¨°à¨¿à¨ªà©?à¨?à¨¼à¨?à¨°à©? à¨?à©?à¨²à©?à¨¹à©?"
 
-#: ../gitg/gitg-window.c:988
+#: ../gitg/gitg-window.c:1313
 msgid "gitg is a git repository viewer for gtk+/GNOME"
 msgstr ""
 
-#: ../gitg/gitg-window.c:989
+#: ../gitg/gitg-window.c:1314
 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"
@@ -158,183 +199,600 @@ msgid ""
 "Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:1
+#: ../gitg/gitg-window.c:1775 ../gitg/gitg-window.c:1809
+#, fuzzy, c-format
+msgid "New local branch <%s>"
+msgstr "à¨¸à¨ à¨¬à¨°à¨¾à¨?à¨?"
+
+#: ../gitg/gitg-window.c:1787 ../gitg/gitg-branch-actions.c:316
+#, fuzzy
+msgid "Remove remote branch"
+msgstr "à¨¬à¨°à¨¾à¨?à¨? à¨?à©?à¨£à©?"
+
+#: ../gitg/gitg-window.c:1791
+msgid "Checkout working copy"
+msgstr ""
+
+#: ../gitg/gitg-window.c:1792
+#, fuzzy
+msgid "Remove local branch"
+msgstr "à¨¬à¨°à¨¾à¨?à¨? à¨?à©?à¨£à©?"
+
+#: ../gitg/gitg-window.c:1800 ../gitg/gitg-branch-actions.c:391
+msgid "Remove stash"
+msgstr ""
+
+#: ../gitg/gitg-window.c:1805 ../gitg/gitg-branch-actions.c:456
+#: ../gitg/gitg-branch-actions.c:458
+#, fuzzy
+msgid "Remove tag"
+msgstr "à¨°à©?à¨µà¨°à¨?"
+
+#: ../gitg/gitg-window.c:1984
+msgid "Not all fields are correctly filled in"
+msgstr ""
+
+#: ../gitg/gitg-window.c:1986
+msgid "Please make sure to fill in both the tag name and the commit message"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:249
+#, c-format
+msgid "Branch <%s> could not be removed"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:250
+msgid ""
+"This usually means that the branch is not fully merged in HEAD. Do you want "
+"to forcefully remove the branch?"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:251
+msgid "Force remove"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:260
+#, c-format
+msgid "Branch <%s> could not be forcefully removed"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:293
+#, c-format
+msgid "Failed to remove remote branch <%s>."
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:314
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the remote branch <%s>?"
+msgstr "à¨?à©? à¨¤à©?à¨¸à©?à¨? à¨?à¨¹ à¨¬à¨¦à¨²à¨¾à¨? à¨µà¨¾à¨ªà¨¸ à¨²à©?à¨£à©? à¨?à¨¾à¨¹à©?à©°à¨¦à©? à¨¹à©??"
+
+#: ../gitg/gitg-branch-actions.c:315
+msgid "This permanently removes the remote branch."
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:332 ../gitg/gitg-menus.xml.h:9
+#, fuzzy
+msgid "Remove branch"
+msgstr "à¨¬à¨°à¨¾à¨?à¨? à¨?à©?à¨£à©?"
+
+#: ../gitg/gitg-branch-actions.c:389
+#, fuzzy
+msgid "Are you sure you want to remove this stash item?"
+msgstr "à¨?à©? à¨¤à©?à¨¸à©?à¨? à¨?à¨¹ à¨¬à¨¦à¨²à¨¾à¨? à¨µà¨¾à¨ªà¨¸ à¨²à©?à¨£à©? à¨?à¨¾à¨¹à©?à©°à¨¦à©? à¨¹à©??"
+
+#: ../gitg/gitg-branch-actions.c:390
+msgid "This permanently removes the stash item"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:417
+msgid "Failed to remove stash"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:418
+msgid "The stash item could not be successfully removed"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:452
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the tag <%s>?"
+msgstr "à¨?à©? à¨¤à©?à¨¸à©?à¨? à¨?à¨¹ à¨¬à¨¦à¨²à¨¾à¨? à¨µà¨¾à¨ªà¨¸ à¨²à©?à¨£à©? à¨?à¨¾à¨¹à©?à©°à¨¦à©? à¨¹à©??"
+
+#: ../gitg/gitg-branch-actions.c:475
+#, c-format
+msgid "The tag <%s> could not be successfully removed"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:479
+msgid "Failed to remove tag"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:579
+#, fuzzy
+msgid "Do you want to temporarily stash these changes?"
+msgstr "à¨?à©? à¨¤à©?à¨¸à©?à¨? à¨?à¨¹ à¨¬à¨¦à¨²à¨¾à¨? à¨µà¨¾à¨ªà¨¸ à¨²à©?à¨£à©? à¨?à¨¾à¨¹à©?à©°à¨¦à©? à¨¹à©??"
+
+#: ../gitg/gitg-branch-actions.c:583
+#, fuzzy
+msgid "Do you want to stash and reapply these changes?"
+msgstr "à¨?à©? à¨¤à©?à¨¸à©?à¨? à¨?à¨¹ à¨¬à¨¦à¨²à¨¾à¨? à¨µà¨¾à¨ªà¨¸ à¨²à©?à¨£à©? à¨?à¨¾à¨¹à©?à©°à¨¦à©? à¨¹à©??"
+
+#: ../gitg/gitg-branch-actions.c:588
+msgid "You have uncommited changes in your current working tree"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:590
+#, fuzzy
+msgid "Stash changes"
+msgstr "à¨¸à¨?à©?à¨? à¨?à©?à¨¤à©? à¨¬à¨¦à¨²à¨¾à¨?"
+
+#: ../gitg/gitg-branch-actions.c:766
+msgid "Failed to save current index state"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:820 ../gitg/gitg-branch-actions.c:1102
+#: ../gitg/gitg-branch-actions.c:1397
+#, c-format
+msgid "Failed to checkout local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:858
+#, c-format
+msgid "Failed to checkout remote branch <%s> to local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:898
+#, c-format
+msgid "Failed to checkout tag <%s> to local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:989
+#, c-format
+msgid "Failed to rebase %s branch <%s> onto %s branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:993
+#, c-format
+msgid "Failed to merge %s branch <%s> with %s branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1001 ../gitg/gitg-branch-actions.c:1003
+#: ../gitg/gitg-branch-actions.c:1069 ../gitg/gitg-branch-actions.c:1071
+#: ../gitg/gitg-branch-actions.c:1110 ../gitg/gitg-branch-actions.c:1112
+#: ../gitg/gitg-branch-actions.c:1146 ../gitg/gitg-branch-actions.c:1148
+#: ../gitg/gitg-branch-actions.c:1193 ../gitg/gitg-branch-actions.c:1195
+msgid "local"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1001 ../gitg/gitg-branch-actions.c:1003
+#: ../gitg/gitg-branch-actions.c:1069 ../gitg/gitg-branch-actions.c:1071
+#: ../gitg/gitg-branch-actions.c:1110 ../gitg/gitg-branch-actions.c:1112
+#: ../gitg/gitg-branch-actions.c:1146 ../gitg/gitg-branch-actions.c:1148
+#: ../gitg/gitg-branch-actions.c:1193 ../gitg/gitg-branch-actions.c:1195
+#, fuzzy
+msgid "remote"
+msgstr "à¨?à¨°à©?"
+
+#: ../gitg/gitg-branch-actions.c:1020
+msgid "The stashed changes have been stored to be reapplied manually"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1025
+msgid "Failed to checkout previously checked out branch"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1046
+msgid "Failed to reapply stash correctly"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1047
+msgid ""
+"There might be unresolved conflicts in the working tree or index which you "
+"need to resolve manually"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1068
+#, fuzzy, c-format
+msgid "Are you sure you want to merge %s branch <%s> onto %s branch <%s>?"
+msgstr "à¨?à©? à¨¤à©?à¨¸à©?à¨? à¨?à¨¹ à¨¬à¨¦à¨²à¨¾à¨? à¨µà¨¾à¨ªà¨¸ à¨²à©?à¨£à©? à¨?à¨¾à¨¹à©?à©°à¨¦à©? à¨¹à©??"
+
+#: ../gitg/gitg-branch-actions.c:1076 ../gitg/gitg-branch-actions.c:1078
+#: ../gitg/gitg-branch-actions.c:1122 ../gitg/gitg-menus.xml.h:4
+msgid "Merge"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1103
+msgid "The branch on which to merge could not be checked out"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1109
+#, c-format
+msgid "Merging %s branch <%s> onto %s branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1145
+#, fuzzy, c-format
+msgid "Are you sure you want to rebase %s branch <%s> onto %s branch <%s>?"
+msgstr "à¨?à©? à¨¤à©?à¨¸à©?à¨? à¨?à¨¹ à¨¬à¨¦à¨²à¨¾à¨? à¨µà¨¾à¨ªà¨¸ à¨²à©?à¨£à©? à¨?à¨¾à¨¹à©?à©°à¨¦à©? à¨¹à©??"
+
+#: ../gitg/gitg-branch-actions.c:1153 ../gitg/gitg-branch-actions.c:1155
+#: ../gitg/gitg-branch-actions.c:1205 ../gitg/gitg-menus.xml.h:7
+msgid "Rebase"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1178
+msgid "Unable to rebase"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1179
+msgid ""
+"There are still uncommitted changes in your working tree and you are trying "
+"to rebase a branch onto the currently checked out branch. Either remove, "
+"stash or commit your changes first and try again"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1192
+#, c-format
+msgid "Rebasing %s branch <%s> onto %s branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1231
+#, c-format
+msgid "Failed to push local branch <%s> to remote <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1232
+msgid ""
+"This usually means that the remote branch could not be fast-forwarded. Try "
+"fetching the latest changes."
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1256
+#, fuzzy, c-format
+msgid "Are you sure you want to push <%s> to <%s>?"
+msgstr "à¨?à©? à¨¤à©?à¨¸à©?à¨? à¨?à¨¹ à¨¬à¨¦à¨²à¨¾à¨? à¨µà¨¾à¨ªà¨¸ à¨²à©?à¨£à©? à¨?à¨¾à¨¹à©?à©°à¨¦à©? à¨¹à©??"
+
+#: ../gitg/gitg-branch-actions.c:1262 ../gitg/gitg-branch-actions.c:1264
+#: ../gitg/gitg-branch-actions.c:1285 ../gitg/gitg-branch-actions.c:1317
+#: ../gitg/gitg-branch-actions.c:1319 ../gitg/gitg-branch-actions.c:1346
+msgid "Push"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1277 ../gitg/gitg-branch-actions.c:1331
+#, c-format
+msgid "Pushing local branch <%s> to remote branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1311
+#, fuzzy, c-format
+msgid "Are you sure you want to push <%s> to remote <%s>?"
+msgstr "à¨?à©? à¨¤à©?à¨¸à©?à¨? à¨?à¨¹ à¨¬à¨¦à¨²à¨¾à¨? à¨µà¨¾à¨ªà¨¸ à¨²à©?à¨£à©? à¨?à¨¾à¨¹à©?à©°à¨¦à©? à¨¹à©??"
+
+#: ../gitg/gitg-branch-actions.c:1370
+#, fuzzy, c-format
+msgid "Are you sure you want to apply the stash item to local branch <%s>?"
+msgstr "à¨?à©? à¨¤à©?à¨¸à©?à¨? à¨?à¨¹ à¨¬à¨¦à¨²à¨¾à¨? à¨µà¨¾à¨ªà¨¸ à¨²à©?à¨£à©? à¨?à¨¾à¨¹à©?à©°à¨¦à©? à¨¹à©??"
+
+#: ../gitg/gitg-branch-actions.c:1375 ../gitg/gitg-branch-actions.c:1377
+msgid "Apply stash"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1416
+#, c-format
+msgid "The stash could not be applied to local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1420
+msgid "Failed to apply stash"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1466
+msgid ""
+"The tag object could not be successfully created. Please make sure you have "
+"a GPG key and the key is unlocked"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1470
+msgid "The tag object could not be successfully created"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1475
+msgid "Failed to create tag"
+msgstr ""
+
+#: ../gitg/gitg-repository-dialog.c:173 ../gitg/gitg-repository.ui.h:4
+msgid "Fetch"
+msgstr ""
+
+#: ../gitg/gitg-repository-dialog.c:178
+msgid "Cancel"
+msgstr ""
+
+#: ../gitg/gitg-repository-dialog.c:441 ../gitg/gitg-repository.ui.h:7
+#: ../gitg/gitg-tag.ui.h:5
+msgid "Properties"
+msgstr ""
+
+#: ../gitg/gitg-window.ui.h:1
 msgid "Add signed-off-by"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:2
-msgid "Author"
-msgstr "à¨²à©?à¨?à¨?"
+#: ../gitg/gitg-window.ui.h:2
+msgid "Amend"
+msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:3
+#: ../gitg/gitg-window.ui.h:3
 msgid "Author:"
 msgstr "à¨²à©?à¨?à¨?:"
 
-#: ../gitg/gitg-ui.xml.h:4
+#: ../gitg/gitg-window.ui.h:4
 msgid "Branch:"
 msgstr "à¨¬à¨°à¨¾à¨?à¨?:"
 
-#: ../gitg/gitg-ui.xml.h:5
+#: ../gitg/gitg-window.ui.h:5
 msgid "Co_mmit message"
 msgstr "à¨?à¨®à¨¿à¨? à¨¸à©?à¨¨à©?à¨¹à¨¾(_m)"
 
-#: ../gitg/gitg-ui.xml.h:6
+#: ../gitg/gitg-window.ui.h:6 ../gitg/gitg-preferences.ui.h:5
 msgid "Commit"
 msgstr "à¨?à¨®à¨¿à¨?"
 
-#: ../gitg/gitg-ui.xml.h:7
+#: ../gitg/gitg-window.ui.h:7
 msgid "Context:"
 msgstr "à¨?à©°à¨?à©?à¨?à¨¸à¨?:"
 
-#: ../gitg/gitg-ui.xml.h:8
-msgid "Date"
-msgstr "à¨®à¨¿à¨¤à©?"
-
-#: ../gitg/gitg-ui.xml.h:9
+#: ../gitg/gitg-window.ui.h:8
 msgid "Date:"
 msgstr "à¨®à¨¿à¨¤à©?:"
 
-#: ../gitg/gitg-ui.xml.h:10
+#: ../gitg/gitg-window.ui.h:9
 msgid "Details"
 msgstr "à¨µà©?à¨°à¨µà¨¾"
 
-#: ../gitg/gitg-ui.xml.h:11
-msgid "Filename"
-msgstr "à¨«à¨¾à¨?à¨²-à¨¨à¨¾à¨?"
-
-#: ../gitg/gitg-ui.xml.h:12
+#: ../gitg/gitg-window.ui.h:10
 msgid "History"
 msgstr "à¨?à¨¤à©?à¨¤"
 
-#: ../gitg/gitg-ui.xml.h:13
-msgid "Ignore"
-msgstr "à¨?à¨£à¨¡à¨¿à©±à¨ à¨¾"
-
-#: ../gitg/gitg-ui.xml.h:14
+#: ../gitg/gitg-window.ui.h:11
 msgid "Parent:"
 msgstr "à¨ªà©?à¨°à©?à¨?à¨?:"
 
-#: ../gitg/gitg-ui.xml.h:15
-msgid "R_ecently Opened"
-msgstr "à¨¤à¨¾à¨?à¨¼à¨¾ à¨?à©?à¨²à©?à¨¹à©?(_e)"
-
-#: ../gitg/gitg-ui.xml.h:16
-msgid "Revert"
-msgstr "à¨°à©?à¨µà¨°à¨?"
-
-#: ../gitg/gitg-ui.xml.h:17
+#: ../gitg/gitg-window.ui.h:12
 msgid "SHA:"
 msgstr "SHA:"
 
-#: ../gitg/gitg-ui.xml.h:18
-msgid "Stage"
-msgstr "à¨¸à¨?à©?à¨?"
-
-#: ../gitg/gitg-ui.xml.h:19
-msgid "Subject"
-msgstr "à¨¸à¨¬à¨?à©?à¨?à¨?"
-
-#: ../gitg/gitg-ui.xml.h:20
+#: ../gitg/gitg-window.ui.h:13
 msgid "Subject:"
 msgstr "à¨¸à¨¬à¨?à©?à¨?à¨?:"
 
-#: ../gitg/gitg-ui.xml.h:21
+#: ../gitg/gitg-window.ui.h:14
 msgid "Tree"
 msgstr "à¨?à¨°à©?"
 
-#: ../gitg/gitg-ui.xml.h:22
-msgid "Unstage"
-msgstr "à¨?à¨£-à¨¸à¨?à©?à¨?"
-
-#: ../gitg/gitg-ui.xml.h:23
-msgid "Unstaged"
-msgstr "à¨?à¨£-à¨¸à¨?à©?à¨?à¨¼"
-
-#: ../gitg/gitg-ui.xml.h:24
+#: ../gitg/gitg-window.ui.h:15
 msgid "_Changes"
 msgstr "à¨¬à¨¦à¨²à¨¾à¨?(_C)"
 
-#: ../gitg/gitg-ui.xml.h:25
-msgid "_Edit"
-msgstr "à¨¸à©?à¨§(_E)"
-
-#: ../gitg/gitg-ui.xml.h:26
-msgid "_File"
-msgstr "à¨«à¨¾à¨?à¨²(_F)"
-
-#: ../gitg/gitg-ui.xml.h:27
-msgid "_Help"
-msgstr "à¨®à©±à¨¦à¨¦(_H)"
-
-#: ../gitg/gitg-ui.xml.h:28
-msgid "_Open..."
-msgstr "à¨?à©?à¨²à©?à¨¹à©?(_O)..."
-
-#: ../gitg/gitg-ui.xml.h:29
+#: ../gitg/gitg-window.ui.h:16
 msgid "_Staged"
 msgstr "à¨¸à¨?à©?à¨? à¨?à©?à¨¤à©?(_S)"
 
-#: ../gitg/gitg-ui.xml.h:30
+#: ../gitg/gitg-window.ui.h:17
 msgid "_Unstaged"
 msgstr "à¨¬à¨¿à¨¨-à¨¸à¨?à©?à¨? à¨?à©?à¨¤à©?(_U)"
 
-#: ../gitg/gitg-ui.xml.h:31
-msgid "_View"
-msgstr "à¨µà©?à¨?à©?(_V)"
+#: ../gitg/gitg-commit-menu.ui.h:1 ../gitg/gitg-ui.xml.h:1
+msgid "Ignore"
+msgstr "à¨?à¨£à¨¡à¨¿à©±à¨ à¨¾"
 
-#: ../gitg/gitg-menus.xml.h:1
-msgid "_Author"
-msgstr "à¨²à©?à¨?à¨?(_A)"
+#: ../gitg/gitg-commit-menu.ui.h:2 ../gitg/gitg-ui.xml.h:3
+msgid "Revert"
+msgstr "à¨°à©?à¨µà¨°à¨?"
 
-#: ../gitg/gitg-menus.xml.h:2
-msgid "_Date"
-msgstr "à¨®à¨¿à¨¤à©?(_D)"
+#: ../gitg/gitg-commit-menu.ui.h:3 ../gitg/gitg-ui.xml.h:4
+msgid "Stage"
+msgstr "à¨¸à¨?à©?à¨?"
 
-#: ../gitg/gitg-menus.xml.h:3
-msgid "_Hash"
-msgstr "à¨¹à©?à¨¸à¨¼(_H)"
+#: ../gitg/gitg-commit-menu.ui.h:4 ../gitg/gitg-ui.xml.h:5
+msgid "Unstage"
+msgstr "à¨?à¨£-à¨¸à¨?à©?à¨?"
 
-#: ../gitg/gitg-menus.xml.h:4
-msgid "_Subject"
-msgstr "à¨µà¨¿à¨¸à¨¼à¨¾(_S)"
+#: ../gitg/gitg-preferences.ui.h:1
+#, fuzzy
+msgid "<b>Commit Message</b>"
+msgstr "à¨?à¨®à¨¿à¨? à¨¸à©?à¨¨à©?à¨¹à¨¾(_m)"
 
-#: ../gitg/gitg-preferences.xml.h:1
+#: ../gitg/gitg-preferences.ui.h:2
 msgid "<b>History</b>"
 msgstr "<b>à¨?à¨¤à©?à¨¤</b>"
 
-#: ../gitg/gitg-preferences.xml.h:2
+#: ../gitg/gitg-preferences.ui.h:3 ../gitg/gitg-repository.ui.h:1
+#, fuzzy
+msgid "<b>User</b>"
+msgstr "<b>à¨?à¨¤à©?à¨¤</b>"
+
+#: ../gitg/gitg-preferences.ui.h:4
 msgid "Collapse inactive lanes"
 msgstr "à¨¸à¨ à¨?à¨¼à©?à¨°-à¨¸à¨°à¨?à¨°à¨® à¨²à©?à¨¨ à¨¸à¨®à©?à¨?à©?"
 
-#: ../gitg/gitg-preferences.xml.h:3
+#: ../gitg/gitg-preferences.ui.h:6 ../gitg/gitg-repository.ui.h:2
+msgid "Configuration"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:7
+msgid ""
+"Configure global git settings. This corresponds to the settings as stored in "
+"~/.gitconfig. Repository specific settings can be configured at the "
+"repository properties."
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:8
+msgid "Display right _margin"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:9 ../gitg/gitg-repository.ui.h:3
+msgid "E-mail:"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:10
 msgid "Early"
 msgstr "à¨ªà¨¹à¨¿à¨²à¨¾à¨?"
 
-#: ../gitg/gitg-preferences.xml.h:4
+#: ../gitg/gitg-preferences.ui.h:11
 msgid "Late"
 msgstr "à¨²à©?à¨?"
 
-#: ../gitg/gitg-preferences.xml.h:5
+#: ../gitg/gitg-preferences.ui.h:12 ../gitg/gitg-repository.ui.h:6
+#: ../gitg/gitg-tag.ui.h:4
+#, fuzzy
+msgid "Name:"
+msgstr "à¨®à¨¿à¨¤à©?:"
+
+#: ../gitg/gitg-preferences.ui.h:13
 msgid "Preferences"
 msgstr "à¨®à©?à¨°à©? à¨ªà¨¸à©°à¨¦"
 
-#: ../gitg/gitg-preferences.xml.h:6
+#: ../gitg/gitg-preferences.ui.h:14
+msgid "Preferences that apply to the commit view"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:15
+msgid "Preferences that apply to the revision view"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:16
 msgid "Search filters revisions in the history view"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:7
+#: ../gitg/gitg-preferences.ui.h:17
 msgid "Show staged changes in history"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:8
+#: ../gitg/gitg-preferences.ui.h:18
 msgid "Show stash in history"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:9
+#: ../gitg/gitg-preferences.ui.h:19
 msgid "Show unstaged changes in history"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:10
+#: ../gitg/gitg-preferences.ui.h:20
 msgid "View"
 msgstr "à¨?à¨²à¨?"
 
+#: ../gitg/gitg-preferences.ui.h:21
+msgid "_Right margin at column:"
+msgstr ""
+
+#: ../gitg/gitg-repository.ui.h:5
+#, fuzzy
+msgid "Name"
+msgstr "à¨®à¨¿à¨¤à©?:"
+
+#: ../gitg/gitg-repository.ui.h:8
+msgid "Remotes"
+msgstr ""
+
+#: ../gitg/gitg-repository.ui.h:9
+msgid "URL"
+msgstr ""
+
+#: ../gitg/gitg-repository.ui.h:10
+msgid "gtk-add"
+msgstr ""
+
+#: ../gitg/gitg-repository.ui.h:11
+msgid "gtk-remove"
+msgstr ""
+
+#: ../gitg/gitg-tag.ui.h:1
+msgid "Create signed tag object"
+msgstr ""
+
+#: ../gitg/gitg-tag.ui.h:2 ../gitg/gitg-menus.xml.h:3
+msgid "Create tag"
+msgstr ""
+
+#: ../gitg/gitg-tag.ui.h:3
+msgid "Message:"
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:1
+msgid "Apply stash to..."
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:2
+#, fuzzy
+msgid "Checkout branch"
+msgstr "à¨¬à¨°à¨¾à¨?à¨? à¨?à©?à¨£à©?"
+
+#: ../gitg/gitg-menus.xml.h:5
+msgid "Merge branch with..."
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:6
+msgid "Push branch to..."
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:8
+msgid "Rebase branch onto..."
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:10
+msgid "_Author"
+msgstr "à¨²à©?à¨?à¨?(_A)"
+
+#: ../gitg/gitg-menus.xml.h:11
+msgid "_Date"
+msgstr "à¨®à¨¿à¨¤à©?(_D)"
+
+#: ../gitg/gitg-menus.xml.h:12
+msgid "_Hash"
+msgstr "à¨¹à©?à¨¸à¨¼(_H)"
+
+#: ../gitg/gitg-menus.xml.h:13
+msgid "_Subject"
+msgstr "à¨µà¨¿à¨¸à¨¼à¨¾(_S)"
+
+#: ../gitg/gitg-ui.xml.h:2
+msgid "R_ecently Opened"
+msgstr "à¨¤à¨¾à¨?à¨¼à¨¾ à¨?à©?à¨²à©?à¨¹à©?(_e)"
+
+#: ../gitg/gitg-ui.xml.h:6
+msgid "_Edit"
+msgstr "à¨¸à©?à¨§(_E)"
+
+#: ../gitg/gitg-ui.xml.h:7
+msgid "_File"
+msgstr "à¨«à¨¾à¨?à¨²(_F)"
+
+#: ../gitg/gitg-ui.xml.h:8
+msgid "_Help"
+msgstr "à¨®à©±à¨¦à¨¦(_H)"
+
+#: ../gitg/gitg-ui.xml.h:9
+msgid "_Open..."
+msgstr "à¨?à©?à¨²à©?à¨¹à©?(_O)..."
+
+#: ../gitg/gitg-ui.xml.h:10
+#, fuzzy
+msgid "_Repository"
+msgstr "git à¨°à¨¿à¨ªà©?à¨?à¨¼à¨?à¨°à©? à¨?à©?à¨²à©?à¨¹à©?"
+
+#: ../gitg/gitg-ui.xml.h:11
+msgid "_View"
+msgstr "à¨µà©?à¨?à©?(_V)"
+
+#~ msgid "Author"
+#~ msgstr "à¨²à©?à¨?à¨?"
+
+#~ msgid "Date"
+#~ msgstr "à¨®à¨¿à¨¤à©?"
+
+#~ msgid "Filename"
+#~ msgstr "à¨«à¨¾à¨?à¨²-à¨¨à¨¾à¨?"
+
+#~ msgid "Subject"
+#~ msgstr "à¨¸à¨¬à¨?à©?à¨?à¨?"
+
+#~ msgid "Unstaged"
+#~ msgstr "à¨?à¨£-à¨¸à¨?à©?à¨?à¨¼"
diff --git a/po/sv.po b/po/sv.po
index c2d6248..d8e61e1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-22 09:42+0200\n"
+"POT-Creation-Date: 2009-07-05 21:28+0200\n"
 "PO-Revision-Date: 2009-04-22 09:47+0100\n"
 "Last-Translator: Daniel Nylander <po danielnylander se>\n"
 "Language-Team: Swedish <tp-sv listor tp-sv se>\n"
@@ -20,28 +20,51 @@ msgid "Git repository browser"
 msgstr ""
 
 #. Translators: this is the application name as in g_set_application_name
-#: ../data/gitg.desktop.in.in.h:2
-#: ../gitg/gitg.c:169
-#: ../gitg/gitg-window.c:785
-#: ../gitg/gitg-window.c:803
-#: ../gitg/gitg-ui.xml.h:32
+#: ../data/gitg.desktop.in.in.h:2 ../gitg/gitg.c:169
+#: ../gitg/gitg-window.c:1005 ../gitg/gitg-window.c:1018
+#: ../gitg/gitg-branch-actions.c:146 ../gitg/gitg-branch-actions.c:199
+#: ../gitg/gitg-window.ui.h:18
 msgid "gitg"
 msgstr "gitg"
 
 #: ../data/gitg.schemas.in.h:1
-msgid "Filter Revisions When Searching"
+msgid "Column at Which Right Margin is Shown"
 msgstr ""
 
 #: ../data/gitg.schemas.in.h:2
-msgid "Setting that indicates when an inactive lane should be collapsed. Valid values are 0 - 4, where 0 indicates 'early' and 4 indicates 'late'."
+msgid "Filter Revisions When Searching"
 msgstr ""
 
 #: ../data/gitg.schemas.in.h:3
-msgid "When to Collapse Inactive Lanes"
+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 ""
 
 #: ../data/gitg.schemas.in.h:4
-msgid "Whether searching filters the revisions in the history view instead of jumping to the first match."
+msgid "Show Right Margin in Commit Message View"
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:5
+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."
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:6
+msgid ""
+"The column at which the right margin is shown if the right-margin preference "
+"is set to TRUE."
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:7
+msgid "When to Collapse Inactive Lanes"
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:8
+msgid ""
+"Whether searching filters the revisions in the history view instead of "
+"jumping to the first match."
 msgstr ""
 
 #: ../gitg/gitg.c:43
@@ -52,48 +75,49 @@ msgstr ""
 msgid "- git repository viewer"
 msgstr "- git-fÃ¶rrÃ¥dsvisare"
 
-#: ../gitg/gitg-commit-view.c:204
-#: ../gitg/gitg-revision-tree-view.c:181
+#: ../gitg/gitg-commit-view.c:208 ../gitg/gitg-revision-tree-view.c:181
 msgid "Cannot display file content as text"
 msgstr "Kan inte visa filens innehÃ¥ll som text"
 
-#: ../gitg/gitg-commit-view.c:1166
+#: ../gitg/gitg-commit-view.c:1431
 msgid "You must first stage some changes before committing"
 msgstr ""
 
-#: ../gitg/gitg-commit-view.c:1174
+#: ../gitg/gitg-commit-view.c:1439
 msgid "Please enter a commit message before committing"
 msgstr ""
 
-#: ../gitg/gitg-commit-view.c:1185
-msgid "Your user name or email could not be retrieved for use in the sign off message"
+#: ../gitg/gitg-commit-view.c:1451
+msgid ""
+"Your user name or email could not be retrieved for use in the sign off "
+"message"
 msgstr ""
 
-#: ../gitg/gitg-commit-view.c:1187
+#: ../gitg/gitg-commit-view.c:1453
 msgid "Something went wrong while trying to commit"
 msgstr ""
 
-#: ../gitg/gitg-commit-view.c:1355
+#: ../gitg/gitg-commit-view.c:1612
 msgid "Revert fail"
 msgstr ""
 
-#: ../gitg/gitg-commit-view.c:1366
+#: ../gitg/gitg-commit-view.c:1623
 msgid "Are you sure you want to revert these changes?"
 msgstr "Ã?r du sÃ¤ker pÃ¥ att du vill Ã¥terstÃ¤lla dessa Ã¤ndringar?"
 
-#: ../gitg/gitg-commit-view.c:1369
+#: ../gitg/gitg-commit-view.c:1626
 msgid "Reverting changes is permanent and cannot be undone"
 msgstr "Ã?terstÃ¤llning av Ã¤ndringar Ã¤r permanent och kan inte Ã¥ngras"
 
-#: ../gitg/gitg-repository.c:472
+#: ../gitg/gitg-repository.c:591
 msgid "Staged changes"
 msgstr ""
 
-#: ../gitg/gitg-repository.c:474
+#: ../gitg/gitg-repository.c:593
 msgid "Unstaged changes"
 msgstr ""
 
-#: ../gitg/gitg-repository.c:983
+#: ../gitg/gitg-repository.c:1148
 msgid "Not a valid git repository"
 msgstr "Inte ett giltigt git-fÃ¶rrÃ¥d"
 
@@ -101,41 +125,61 @@ msgstr "Inte ett giltigt git-fÃ¶rrÃ¥d"
 msgid "(Empty)"
 msgstr "(Tom)"
 
-#: ../gitg/gitg-window.c:346
+#: ../gitg/gitg-window.c:420
 msgid "Select branch"
 msgstr "VÃ¤lj gren"
 
-#: ../gitg/gitg-window.c:532
+#: ../gitg/gitg-window.c:482
+#, c-format
+msgid "Push local branch <%s> to remote branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-window.c:489
+#, c-format
+msgid "Merge/rebase local branch <%s> with/on local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-window.c:496
+#, c-format
+msgid "Merge/rebase local branch <%s> with/on remote branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-window.c:503
+#, c-format
+msgid "Apply stash to local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-window.c:771
 msgid "Begin loading repository"
 msgstr ""
 
-#: ../gitg/gitg-window.c:541
+#: ../gitg/gitg-window.c:780
 #, c-format
 msgid "Loaded %d revisions in %.2fs"
 msgstr "LÃ¤ste in %d revisioner pÃ¥ %.2fs"
 
-#: ../gitg/gitg-window.c:552
+#: ../gitg/gitg-window.c:791
 #, c-format
 msgid "Loading %d revisions..."
 msgstr "LÃ¤ser in %d revisioner..."
 
-#: ../gitg/gitg-window.c:561
+#: ../gitg/gitg-window.c:800
 msgid "Could not find git repository"
 msgstr "Kunde inte hitta git-fÃ¶rrÃ¥det"
 
-#: ../gitg/gitg-window.c:697
+#: ../gitg/gitg-window.c:983
 msgid "All branches"
 msgstr "Alla grenar"
 
-#: ../gitg/gitg-window.c:860
+#: ../gitg/gitg-window.c:1192
 msgid "Open git repository"
 msgstr "Ã?ppna git-fÃ¶rrÃ¥d"
 
-#: ../gitg/gitg-window.c:982
+#: ../gitg/gitg-window.c:1313
 msgid "gitg is a git repository viewer for gtk+/GNOME"
 msgstr "gitg Ã¤r en git-fÃ¶rrÃ¥dsvisare fÃ¶r gtk+/GNOME"
 
-#: ../gitg/gitg-window.c:983
+#: ../gitg/gitg-window.c:1314
 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"
@@ -170,183 +214,592 @@ msgstr ""
 "med detta program. Om inte, skriv till Free Software Foundation,\n"
 "Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA."
 
-#: ../gitg/gitg-ui.xml.h:1
+#: ../gitg/gitg-window.c:1775 ../gitg/gitg-window.c:1809
+#, fuzzy, c-format
+msgid "New local branch <%s>"
+msgstr "Alla grenar"
+
+#: ../gitg/gitg-window.c:1787 ../gitg/gitg-branch-actions.c:316
+#, fuzzy
+msgid "Remove remote branch"
+msgstr "VÃ¤lj gren"
+
+#: ../gitg/gitg-window.c:1791
+msgid "Checkout working copy"
+msgstr ""
+
+#: ../gitg/gitg-window.c:1792
+#, fuzzy
+msgid "Remove local branch"
+msgstr "VÃ¤lj gren"
+
+#: ../gitg/gitg-window.c:1800 ../gitg/gitg-branch-actions.c:391
+msgid "Remove stash"
+msgstr ""
+
+#: ../gitg/gitg-window.c:1805 ../gitg/gitg-branch-actions.c:456
+#: ../gitg/gitg-branch-actions.c:458
+#, fuzzy
+msgid "Remove tag"
+msgstr "Ã?terstÃ¤ll"
+
+#: ../gitg/gitg-window.c:1984
+msgid "Not all fields are correctly filled in"
+msgstr ""
+
+#: ../gitg/gitg-window.c:1986
+msgid "Please make sure to fill in both the tag name and the commit message"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:249
+#, c-format
+msgid "Branch <%s> could not be removed"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:250
+msgid ""
+"This usually means that the branch is not fully merged in HEAD. Do you want "
+"to forcefully remove the branch?"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:251
+msgid "Force remove"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:260
+#, c-format
+msgid "Branch <%s> could not be forcefully removed"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:293
+#, c-format
+msgid "Failed to remove remote branch <%s>."
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:314
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the remote branch <%s>?"
+msgstr "Ã?r du sÃ¤ker pÃ¥ att du vill Ã¥terstÃ¤lla dessa Ã¤ndringar?"
+
+#: ../gitg/gitg-branch-actions.c:315
+msgid "This permanently removes the remote branch."
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:332 ../gitg/gitg-menus.xml.h:9
+#, fuzzy
+msgid "Remove branch"
+msgstr "VÃ¤lj gren"
+
+#: ../gitg/gitg-branch-actions.c:389
+#, fuzzy
+msgid "Are you sure you want to remove this stash item?"
+msgstr "Ã?r du sÃ¤ker pÃ¥ att du vill Ã¥terstÃ¤lla dessa Ã¤ndringar?"
+
+#: ../gitg/gitg-branch-actions.c:390
+msgid "This permanently removes the stash item"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:417
+msgid "Failed to remove stash"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:418
+msgid "The stash item could not be successfully removed"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:452
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the tag <%s>?"
+msgstr "Ã?r du sÃ¤ker pÃ¥ att du vill Ã¥terstÃ¤lla dessa Ã¤ndringar?"
+
+#: ../gitg/gitg-branch-actions.c:475
+#, c-format
+msgid "The tag <%s> could not be successfully removed"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:479
+msgid "Failed to remove tag"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:579
+#, fuzzy
+msgid "Do you want to temporarily stash these changes?"
+msgstr "Ã?r du sÃ¤ker pÃ¥ att du vill Ã¥terstÃ¤lla dessa Ã¤ndringar?"
+
+#: ../gitg/gitg-branch-actions.c:583
+#, fuzzy
+msgid "Do you want to stash and reapply these changes?"
+msgstr "Ã?r du sÃ¤ker pÃ¥ att du vill Ã¥terstÃ¤lla dessa Ã¤ndringar?"
+
+#: ../gitg/gitg-branch-actions.c:588
+msgid "You have uncommited changes in your current working tree"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:590
+msgid "Stash changes"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:766
+msgid "Failed to save current index state"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:820 ../gitg/gitg-branch-actions.c:1102
+#: ../gitg/gitg-branch-actions.c:1397
+#, c-format
+msgid "Failed to checkout local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:858
+#, c-format
+msgid "Failed to checkout remote branch <%s> to local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:898
+#, c-format
+msgid "Failed to checkout tag <%s> to local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:989
+#, c-format
+msgid "Failed to rebase %s branch <%s> onto %s branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:993
+#, c-format
+msgid "Failed to merge %s branch <%s> with %s branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1001 ../gitg/gitg-branch-actions.c:1003
+#: ../gitg/gitg-branch-actions.c:1069 ../gitg/gitg-branch-actions.c:1071
+#: ../gitg/gitg-branch-actions.c:1110 ../gitg/gitg-branch-actions.c:1112
+#: ../gitg/gitg-branch-actions.c:1146 ../gitg/gitg-branch-actions.c:1148
+#: ../gitg/gitg-branch-actions.c:1193 ../gitg/gitg-branch-actions.c:1195
+msgid "local"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1001 ../gitg/gitg-branch-actions.c:1003
+#: ../gitg/gitg-branch-actions.c:1069 ../gitg/gitg-branch-actions.c:1071
+#: ../gitg/gitg-branch-actions.c:1110 ../gitg/gitg-branch-actions.c:1112
+#: ../gitg/gitg-branch-actions.c:1146 ../gitg/gitg-branch-actions.c:1148
+#: ../gitg/gitg-branch-actions.c:1193 ../gitg/gitg-branch-actions.c:1195
+#, fuzzy
+msgid "remote"
+msgstr "TrÃ¤d"
+
+#: ../gitg/gitg-branch-actions.c:1020
+msgid "The stashed changes have been stored to be reapplied manually"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1025
+msgid "Failed to checkout previously checked out branch"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1046
+msgid "Failed to reapply stash correctly"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1047
+msgid ""
+"There might be unresolved conflicts in the working tree or index which you "
+"need to resolve manually"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1068
+#, fuzzy, c-format
+msgid "Are you sure you want to merge %s branch <%s> onto %s branch <%s>?"
+msgstr "Ã?r du sÃ¤ker pÃ¥ att du vill Ã¥terstÃ¤lla dessa Ã¤ndringar?"
+
+#: ../gitg/gitg-branch-actions.c:1076 ../gitg/gitg-branch-actions.c:1078
+#: ../gitg/gitg-branch-actions.c:1122 ../gitg/gitg-menus.xml.h:4
+msgid "Merge"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1103
+msgid "The branch on which to merge could not be checked out"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1109
+#, c-format
+msgid "Merging %s branch <%s> onto %s branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1145
+#, fuzzy, c-format
+msgid "Are you sure you want to rebase %s branch <%s> onto %s branch <%s>?"
+msgstr "Ã?r du sÃ¤ker pÃ¥ att du vill Ã¥terstÃ¤lla dessa Ã¤ndringar?"
+
+#: ../gitg/gitg-branch-actions.c:1153 ../gitg/gitg-branch-actions.c:1155
+#: ../gitg/gitg-branch-actions.c:1205 ../gitg/gitg-menus.xml.h:7
+msgid "Rebase"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1178
+msgid "Unable to rebase"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1179
+msgid ""
+"There are still uncommitted changes in your working tree and you are trying "
+"to rebase a branch onto the currently checked out branch. Either remove, "
+"stash or commit your changes first and try again"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1192
+#, c-format
+msgid "Rebasing %s branch <%s> onto %s branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1231
+#, c-format
+msgid "Failed to push local branch <%s> to remote <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1232
+msgid ""
+"This usually means that the remote branch could not be fast-forwarded. Try "
+"fetching the latest changes."
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1256
+#, fuzzy, c-format
+msgid "Are you sure you want to push <%s> to <%s>?"
+msgstr "Ã?r du sÃ¤ker pÃ¥ att du vill Ã¥terstÃ¤lla dessa Ã¤ndringar?"
+
+#: ../gitg/gitg-branch-actions.c:1262 ../gitg/gitg-branch-actions.c:1264
+#: ../gitg/gitg-branch-actions.c:1285 ../gitg/gitg-branch-actions.c:1317
+#: ../gitg/gitg-branch-actions.c:1319 ../gitg/gitg-branch-actions.c:1346
+msgid "Push"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1277 ../gitg/gitg-branch-actions.c:1331
+#, c-format
+msgid "Pushing local branch <%s> to remote branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1311
+#, fuzzy, c-format
+msgid "Are you sure you want to push <%s> to remote <%s>?"
+msgstr "Ã?r du sÃ¤ker pÃ¥ att du vill Ã¥terstÃ¤lla dessa Ã¤ndringar?"
+
+#: ../gitg/gitg-branch-actions.c:1370
+#, fuzzy, c-format
+msgid "Are you sure you want to apply the stash item to local branch <%s>?"
+msgstr "Ã?r du sÃ¤ker pÃ¥ att du vill Ã¥terstÃ¤lla dessa Ã¤ndringar?"
+
+#: ../gitg/gitg-branch-actions.c:1375 ../gitg/gitg-branch-actions.c:1377
+msgid "Apply stash"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1416
+#, c-format
+msgid "The stash could not be applied to local branch <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1420
+msgid "Failed to apply stash"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1466
+msgid ""
+"The tag object could not be successfully created. Please make sure you have "
+"a GPG key and the key is unlocked"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1470
+msgid "The tag object could not be successfully created"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1475
+msgid "Failed to create tag"
+msgstr ""
+
+#: ../gitg/gitg-repository-dialog.c:173 ../gitg/gitg-repository.ui.h:4
+msgid "Fetch"
+msgstr ""
+
+#: ../gitg/gitg-repository-dialog.c:178
+msgid "Cancel"
+msgstr ""
+
+#: ../gitg/gitg-repository-dialog.c:441 ../gitg/gitg-repository.ui.h:7
+#: ../gitg/gitg-tag.ui.h:5
+msgid "Properties"
+msgstr ""
+
+#: ../gitg/gitg-window.ui.h:1
 msgid "Add signed-off-by"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:2
-msgid "Author"
-msgstr "Upphovsman"
+#: ../gitg/gitg-window.ui.h:2
+msgid "Amend"
+msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:3
+#: ../gitg/gitg-window.ui.h:3
 msgid "Author:"
 msgstr "Upphovsman:"
 
-#: ../gitg/gitg-ui.xml.h:4
+#: ../gitg/gitg-window.ui.h:4
 msgid "Branch:"
 msgstr "Gren:"
 
-#: ../gitg/gitg-ui.xml.h:5
+#: ../gitg/gitg-window.ui.h:5
 msgid "Co_mmit message"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:6
+#: ../gitg/gitg-window.ui.h:6 ../gitg/gitg-preferences.ui.h:5
 msgid "Commit"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:7
+#: ../gitg/gitg-window.ui.h:7
 msgid "Context:"
 msgstr "Kontext:"
 
-#: ../gitg/gitg-ui.xml.h:8
-msgid "Date"
-msgstr "Datum"
-
-#: ../gitg/gitg-ui.xml.h:9
+#: ../gitg/gitg-window.ui.h:8
 msgid "Date:"
 msgstr "Datum:"
 
-#: ../gitg/gitg-ui.xml.h:10
+#: ../gitg/gitg-window.ui.h:9
 msgid "Details"
 msgstr "Detaljer"
 
-#: ../gitg/gitg-ui.xml.h:11
-msgid "Filename"
-msgstr "Filnamn"
-
-#: ../gitg/gitg-ui.xml.h:12
+#: ../gitg/gitg-window.ui.h:10
 msgid "History"
 msgstr "Historik"
 
-#: ../gitg/gitg-ui.xml.h:13
-msgid "Ignore"
-msgstr "Ignorera"
-
-#: ../gitg/gitg-ui.xml.h:14
+#: ../gitg/gitg-window.ui.h:11
 msgid "Parent:"
 msgstr "FÃ¶rÃ¤lder:"
 
-#: ../gitg/gitg-ui.xml.h:15
-msgid "R_ecently Opened"
-msgstr ""
-
-#: ../gitg/gitg-ui.xml.h:16
-msgid "Revert"
-msgstr "Ã?terstÃ¤ll"
-
-#: ../gitg/gitg-ui.xml.h:17
+#: ../gitg/gitg-window.ui.h:12
 msgid "SHA:"
 msgstr "SHA:"
 
-#: ../gitg/gitg-ui.xml.h:18
-msgid "Stage"
-msgstr ""
-
-#: ../gitg/gitg-ui.xml.h:19
-msgid "Subject"
-msgstr ""
-
-#: ../gitg/gitg-ui.xml.h:20
+#: ../gitg/gitg-window.ui.h:13
 msgid "Subject:"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:21
+#: ../gitg/gitg-window.ui.h:14
 msgid "Tree"
 msgstr "TrÃ¤d"
 
-#: ../gitg/gitg-ui.xml.h:22
-msgid "Unstage"
-msgstr ""
-
-#: ../gitg/gitg-ui.xml.h:23
-msgid "Unstaged"
-msgstr ""
-
-#: ../gitg/gitg-ui.xml.h:24
+#: ../gitg/gitg-window.ui.h:15
 msgid "_Changes"
 msgstr "Ã?_ndringar"
 
-#: ../gitg/gitg-ui.xml.h:25
-msgid "_Edit"
-msgstr "_Redigera"
-
-#: ../gitg/gitg-ui.xml.h:26
-msgid "_File"
-msgstr "_Arkiv"
-
-#: ../gitg/gitg-ui.xml.h:27
-msgid "_Help"
-msgstr "_HjÃ¤lp"
-
-#: ../gitg/gitg-ui.xml.h:28
-msgid "_Open..."
-msgstr "_Ã?ppna..."
-
-#: ../gitg/gitg-ui.xml.h:29
+#: ../gitg/gitg-window.ui.h:16
 msgid "_Staged"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:30
+#: ../gitg/gitg-window.ui.h:17
 msgid "_Unstaged"
 msgstr ""
 
-#: ../gitg/gitg-ui.xml.h:31
-msgid "_View"
-msgstr "_Visa"
+#: ../gitg/gitg-commit-menu.ui.h:1 ../gitg/gitg-ui.xml.h:1
+msgid "Ignore"
+msgstr "Ignorera"
 
-#: ../gitg/gitg-menus.xml.h:1
-msgid "_Author"
-msgstr "U_pphovsman"
+#: ../gitg/gitg-commit-menu.ui.h:2 ../gitg/gitg-ui.xml.h:3
+msgid "Revert"
+msgstr "Ã?terstÃ¤ll"
 
-#: ../gitg/gitg-menus.xml.h:2
-msgid "_Date"
-msgstr "_Datum"
+#: ../gitg/gitg-commit-menu.ui.h:3 ../gitg/gitg-ui.xml.h:4
+msgid "Stage"
+msgstr ""
 
-#: ../gitg/gitg-menus.xml.h:3
-msgid "_Hash"
-msgstr "_Hash"
+#: ../gitg/gitg-commit-menu.ui.h:4 ../gitg/gitg-ui.xml.h:5
+msgid "Unstage"
+msgstr ""
 
-#: ../gitg/gitg-menus.xml.h:4
-msgid "_Subject"
+#: ../gitg/gitg-preferences.ui.h:1
+msgid "<b>Commit Message</b>"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:1
+#: ../gitg/gitg-preferences.ui.h:2
 msgid "<b>History</b>"
 msgstr "<b>Historik</b>"
 
-#: ../gitg/gitg-preferences.xml.h:2
+#: ../gitg/gitg-preferences.ui.h:3 ../gitg/gitg-repository.ui.h:1
+#, fuzzy
+msgid "<b>User</b>"
+msgstr "<b>Historik</b>"
+
+#: ../gitg/gitg-preferences.ui.h:4
 msgid "Collapse inactive lanes"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:3
+#: ../gitg/gitg-preferences.ui.h:6 ../gitg/gitg-repository.ui.h:2
+msgid "Configuration"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:7
+msgid ""
+"Configure global git settings. This corresponds to the settings as stored in "
+"~/.gitconfig. Repository specific settings can be configured at the "
+"repository properties."
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:8
+msgid "Display right _margin"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:9 ../gitg/gitg-repository.ui.h:3
+msgid "E-mail:"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:10
 msgid "Early"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:4
+#: ../gitg/gitg-preferences.ui.h:11
 msgid "Late"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:5
+#: ../gitg/gitg-preferences.ui.h:12 ../gitg/gitg-repository.ui.h:6
+#: ../gitg/gitg-tag.ui.h:4
+#, fuzzy
+msgid "Name:"
+msgstr "Datum:"
+
+#: ../gitg/gitg-preferences.ui.h:13
 msgid "Preferences"
 msgstr "InstÃ¤llningar"
 
-#: ../gitg/gitg-preferences.xml.h:6
+#: ../gitg/gitg-preferences.ui.h:14
+msgid "Preferences that apply to the commit view"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:15
+msgid "Preferences that apply to the revision view"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:16
 msgid "Search filters revisions in the history view"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:7
+#: ../gitg/gitg-preferences.ui.h:17
 msgid "Show staged changes in history"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:8
+#: ../gitg/gitg-preferences.ui.h:18
 msgid "Show stash in history"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:9
+#: ../gitg/gitg-preferences.ui.h:19
 msgid "Show unstaged changes in history"
 msgstr ""
 
-#: ../gitg/gitg-preferences.xml.h:10
+#: ../gitg/gitg-preferences.ui.h:20
 msgid "View"
 msgstr "Visa"
 
+#: ../gitg/gitg-preferences.ui.h:21
+msgid "_Right margin at column:"
+msgstr ""
+
+#: ../gitg/gitg-repository.ui.h:5
+#, fuzzy
+msgid "Name"
+msgstr "Datum:"
+
+#: ../gitg/gitg-repository.ui.h:8
+msgid "Remotes"
+msgstr ""
+
+#: ../gitg/gitg-repository.ui.h:9
+msgid "URL"
+msgstr ""
+
+#: ../gitg/gitg-repository.ui.h:10
+msgid "gtk-add"
+msgstr ""
+
+#: ../gitg/gitg-repository.ui.h:11
+msgid "gtk-remove"
+msgstr ""
+
+#: ../gitg/gitg-tag.ui.h:1
+msgid "Create signed tag object"
+msgstr ""
+
+#: ../gitg/gitg-tag.ui.h:2 ../gitg/gitg-menus.xml.h:3
+msgid "Create tag"
+msgstr ""
+
+#: ../gitg/gitg-tag.ui.h:3
+msgid "Message:"
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:1
+msgid "Apply stash to..."
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:2
+#, fuzzy
+msgid "Checkout branch"
+msgstr "VÃ¤lj gren"
+
+#: ../gitg/gitg-menus.xml.h:5
+msgid "Merge branch with..."
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:6
+msgid "Push branch to..."
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:8
+msgid "Rebase branch onto..."
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:10
+msgid "_Author"
+msgstr "U_pphovsman"
+
+#: ../gitg/gitg-menus.xml.h:11
+msgid "_Date"
+msgstr "_Datum"
+
+#: ../gitg/gitg-menus.xml.h:12
+msgid "_Hash"
+msgstr "_Hash"
+
+#: ../gitg/gitg-menus.xml.h:13
+msgid "_Subject"
+msgstr ""
+
+#: ../gitg/gitg-ui.xml.h:2
+msgid "R_ecently Opened"
+msgstr ""
+
+#: ../gitg/gitg-ui.xml.h:6
+msgid "_Edit"
+msgstr "_Redigera"
+
+#: ../gitg/gitg-ui.xml.h:7
+msgid "_File"
+msgstr "_Arkiv"
+
+#: ../gitg/gitg-ui.xml.h:8
+msgid "_Help"
+msgstr "_HjÃ¤lp"
+
+#: ../gitg/gitg-ui.xml.h:9
+msgid "_Open..."
+msgstr "_Ã?ppna..."
+
+#: ../gitg/gitg-ui.xml.h:10
+#, fuzzy
+msgid "_Repository"
+msgstr "Ã?ppna git-fÃ¶rrÃ¥d"
+
+#: ../gitg/gitg-ui.xml.h:11
+msgid "_View"
+msgstr "_Visa"
+
+#~ msgid "Author"
+#~ msgstr "Upphovsman"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+#~ msgid "Filename"
+#~ msgstr "Filnamn"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]