From: Kimmo Varis Date: Thu, 30 Jun 2005 15:58:01 +0000 (+0000) Subject: PATCH: [ 1230344 ] MergeSwedish.rc for 2.3.4.0 beta X-Git-Tag: 2.16.5~5851 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e72d863d3e14038a79d6a3e8bdf9871d7a817e26;p=winmerge-jp%2Fwinmerge-jp.git PATCH: [ 1230344 ] MergeSwedish.rc for 2.3.4.0 beta - submitted by Hans Eriksson --- diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc index 413f3d5d0..70ee77f3d 100644 --- a/Src/Languages/Swedish/MergeSwedish.rc +++ b/Src/Languages/Swedish/MergeSwedish.rc @@ -1853,8 +1853,8 @@ END // MORE STATUS PANES STRINGTABLE BEGIN - IDS_DIRVIEW_STATUS_FMT_FOCUS "Item %1 of %2" - IDS_DIRVIEW_STATUS_FMT_NOFOCUS "Items: %1" + IDS_DIRVIEW_STATUS_FMT_FOCUS "Objekt %1 av %2" + IDS_DIRVIEW_STATUS_FMT_NOFOCUS "Objekt: %1" END // OPEN DIALOG @@ -1890,7 +1890,7 @@ BEGIN IDS_ERROR_FILE_WRITEABLE "Kontrollera skrivbarhet på destinationen!" IDS_ERROR_BACKUP "Fel under backup av filen" IDS_BACKUP_FAILED_PROMPT - "Unable to backup original file:\n%1\n\nContinue anyway?" + "Kan inte ta backup på originalfilen:\n%1\n\nVill du fortsätta i alla fall?" IDS_FILESAVE_FAILED "Det gick inte att spara filen.\n%1\n%2\nVill du:\n\t-använda ett annat filnamn (Tryck Ok)\n\t-avbryta sparande av fil (Tryck Avbryt)?" IDS_FILEPACK_FAILED_LEFT "Plugin '%2' kan inte packa dina förändringar av den vänstra filen tillbaka till '%1'.\n\nOriginalfilen blir inte ändrad.\n\nVill du spara den uppackade versionen till en annan fil?" IDS_FILEPACK_FAILED_RIGHT "Plugin '%2' kan inte packa dina förändringar av den högra filen tillbaka till '%1'.\n\nOriginalfilen blir inte ändrad.\n\nVill du spara den uppackade versionen till en annan fil?" diff --git a/Src/readme.txt b/Src/readme.txt index 9084b09c2..c1fd9176c 100644 --- a/Src/readme.txt +++ b/Src/readme.txt @@ -2,6 +2,9 @@ PATCH: [ 1228647 ] MergeCatalan.rc v209 update Submitted by Jordi Vilar Src/Languages/Catalan: MergeCatalan.rc + PATCH: [ 1230344 ] MergeSwedish.rc for 2.3.4.0 beta + Submitted by Hans Eriksson + Src/Languages/Swedish: MergeSwedish.rc 2005-06-29 Perry PATCH: [ 1220421 ] warning in cvs trunk (probably a bool/BOOL mismatch)